Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Sean Anderson <sean.anderson@seco.com>
To:     Andrew Lunn <andrew@lunn.ch>,
        Heiner Kallweit <hkallweit1@gmail.com>,
        Russell King <linux@armlinux.org.uk>, netdev@vger.kernel.org
Cc:     Jakub Kicinski <kuba@kernel.org>, Jonathan Corbet <corbet@lwn.net>,
        Paolo Abeni <pabeni@redhat.com>,
        Vladimir Oltean <olteanv@gmail.com>, linux-doc@vger.kernel.org,
        linux-kernel@vger.kernel.org, Eric Dumazet <edumazet@google.com>,
        "David S . Miller" <davem@davemloft.net>,
        linux-phy@lists.infradead.org,
        Sean Anderson <sean.anderson@seco.com>
Subject: [net-next PATCH v3] net: phy: Add 1000BASE-KX interface mode
Date:   Fri,  2 Sep 2022 18:02:39 -0400
Message-Id: <20220902220240.996257-1-sean.anderson@seco.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?+7iesahF9wcadaOeWbHtlL/xpU4XA7q4JRglPoukQJPt+Spk0WmL9cytz0EJ?=
 =?us-ascii?Q?IWoXH3DrS34HMwbRG4ulq0NK9rkpnm5JHLcZM14GNu4+k6ZJgfF7BU2PHKCw?=
 =?us-ascii?Q?fCwv9lyn1tSZEyRymKQQ5XwPyiYzZAU4N4mnI/iFa4h+h7PhEeA5L3tk12fK?=
 =?us-ascii?Q?hUfrukA7I7AXJsC6Ib+E4v5dBGPmYoPJP017SWaUcnPX3Nc3woR8CCDRHs/C?=
 =?us-ascii?Q?mgcl4LdnWTaydYNs6YqlnMcCJEQiX09T+UlyS0UxdcLt6acIdQZgFSMb8KZG?=
 =?us-ascii?Q?nZKjl1kxP6o4x4hkpMmxFZPHb3l+y/D7ekidTIORqy7i/OmyY5oe5DNJIf8e?=
 =?us-ascii?Q?WqvVEn4k9zwbCQ/wBYB8w43Hw3snt3RXYhDNAFiorHiEk0cg011L6+3YVmSO?=
 =?us-ascii?Q?bMqnEi7PcJawbc86Si2WclBDW2+GQSSR36vbrpW60oPPVOgUaZCcSSJ6mOQr?=
 =?us-ascii?Q?ygOD8PtoJQop4pEUvSj7UKCfcpiiB6vKmJGQB1dP/ep/euAf1B/c5/2fw9qJ?=
 =?us-ascii?Q?kU3Ol2tD6N5ln6EuWENZ4bDbYqq1ZJLc31FbpXv+obyxTTIVyO55Hta/t9wt?=
 =?us-ascii?Q?Ylq7tMrQKiTRk3OaAmrAtdu49MdjurH+yI9OXlFwTwlr85P+gg34umZWW9Qq?=
 =?us-ascii?Q?NjSQ9ssJrDBTiSWSl4+TKjNzecxnZhKe08C9JcJ+lj3IHYz7ovmyHElSb82j?=
 =?us-ascii?Q?tl7MnqAdiEaFvMDX+3uMwOe+oslWcLYTHBuNwnN77M+Li9bONAJqdZfb63xh?=
 =?us-ascii?Q?KPHMOmnMsU7zYKuCjyZi8HjBaQD6lCC9a5+EfpQD64dzPzSG3G3UjklM7OWh?=
 =?us-ascii?Q?Fg+kq1JetyBq+b/ESsoZ0Y6efCm9Q1dPav0/rbx7XIXDjqbSPoAAd1COPXzQ?=
 =?us-ascii?Q?YwUIRExJ3GnQGdzx9iixUo3c6vUok3Kzn0xHepNkLAAZ+iywYlBQGmRhfOIY?=
 =?us-ascii?Q?lDXGqA1u85JtJH9gkcTAJZYcyvzdUK1nzZdHkBZCiGtDk8DdZ+O+FAyqFxFx?=
 =?us-ascii?Q?Er5o5yDiYWMxIoMaqdj8TXt/QSOpK2OE1RS65AKTeZ5pvjfhh2PltOqQi1M3?=
 =?us-ascii?Q?bcKsBJ8032/MBSqfweUpEcBXcXPnYswD2m9rJ5SE6BEgltuX3E8it4oIHVBY?=
 =?us-ascii?Q?VF0FHC/QkiCJF4fFpZ2fc9Npn8hzPUZsg3u8qhrssKlPmB72Q5GaI8q1t1gL?=
 =?us-ascii?Q?7SaF0nGMLQKlfo6nqv1v82Hn88G4WI8qglfi2H2lpJQUWAiJyjca93bfDoa0?=
 =?us-ascii?Q?D6JDzrKyO7ZpjOm7Phpc24E/P47Z7I5oilZcebmaFAl2U58rszx2BODjJFZ+?=
 =?us-ascii?Q?ex2/oYybd3IWvG95cmP46A6QmFyNgNZbxb1J0hZUd2nkESZySinneDftuxAV?=
 =?us-ascii?Q?2iMiY7pNQWn8G8Gxar9/jo9O5+9Un25TvjweZJ30+2SRFGPZdHlqC8xKaoJ2?=
 =?us-ascii?Q?clGBBhQFv/GVeujtQufV5EwauQWRLk0CQy5lA81qQ25jRJGbl2MoONzb2N2M?=
 =?us-ascii?Q?KfLVWgRLaRmQf3DUnuJeFV4N6HC7gOqBuLDfwH+GVvc3m2j5aM6Ip2wm1/Pt?=
 =?us-ascii?Q?xNJqJcpdzE/TebIhUScIHiWZYdKwlvkStgpwnHX84ziSLRTNmhLerPdqyDPW?=
 =?us-ascii?Q?Bw=3D=3D?=
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ca2a82b4-7bff-4422-230e-08da8d2ee037
X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Sep 2022 22:02:49.7943
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: XZMcTsRbARgD41+PQt5BwJnylU6WZbVGoe9Cr4WN6WIW4dBOSbYofHghxNOHk7toS4GDliMSIdpo1JsN5iph4A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR03MB4085
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Add 1000BASE-KX interface mode. This 1G backplane ethernet as described in
clause 70. Clause 73 autonegotiation is mandatory, and only full duplex
operation is supported.

Although at the PMA level this interface mode is identical to
1000BASE-X, it uses a different form of in-band autonegation. This
justifies a separate interface mode, since the interface mode (along
with the MLO_AN_* autonegotiation mode) sets the type of autonegotiation
which will be used on a link. This results in more than just electrical
differences between the link modes.

With regard to 1000BASE-X, 1000BASE-KX holds a similar position to
SGMII: same signaling, but different autonegotiation. PCS drivers
(which typically handle in-band autonegotiation) may only support
1000BASE-X, and not 1000BASE-KX. Similarly, the phy mode is used to
configure serdes phys with phy_set_mode_ext. Due to the different
electrical standards (SFI or XFI vs Clause 70), they will likely want to
use different configuration. Adding a phy interface mode for
1000BASE-KX helps simplify configuration in these areas.

Signed-off-by: Sean Anderson <sean.anderson@seco.com>
---
This was previously submitted as [1], but has been broken off per
request. As it was not modified before this, I have started at v2.

[1] https://lore.kernel.org/netdev/20220725153730.2604096-3-sean.anderson@seco.com/

Changes in v3:
- Add mode to phy_interface_num_ports

Changes in v2:
- Document interface mode in phy.rst

 Documentation/networking/phy.rst | 6 ++++++
 drivers/net/phy/phy-core.c       | 1 +
 drivers/net/phy/phylink.c        | 1 +
 include/linux/phy.h              | 4 ++++
 4 files changed, 12 insertions(+)

diff --git a/Documentation/networking/phy.rst b/Documentation/networking/phy.rst
index 712e44caebd0..06f4fcdb58b6 100644
--- a/Documentation/networking/phy.rst
+++ b/Documentation/networking/phy.rst
@@ -317,6 +317,12 @@ Some of the interface modes are described below:
     PTP-enabled PHYs. This mode isn't compatible with QSGMII, but offers the
     same capabilities in terms of link speed and negociation.
 
+``PHY_INTERFACE_MODE_1000BASEKX``
+    This is 1000BASE-X as defined by IEEE 802.3 Clause 36 with Clause 73
+    autonegotiation. Generally, it will be used with a Clause 70 PMD. To
+    contrast with the 1000BASE-X phy mode used for Clause 38 and 39 PMDs, this
+    interface mode has different autonegotiation and only supports full duplex.
+
 Pause frames / flow control
 ===========================
 
diff --git a/drivers/net/phy/phy-core.c b/drivers/net/phy/phy-core.c
index f8ec12d3d6ae..2a2924bc8f76 100644
--- a/drivers/net/phy/phy-core.c
+++ b/drivers/net/phy/phy-core.c
@@ -114,6 +114,7 @@ int phy_interface_num_ports(phy_interface_t interface)
 	case PHY_INTERFACE_MODE_100BASEX:
 	case PHY_INTERFACE_MODE_RXAUI:
 	case PHY_INTERFACE_MODE_XAUI:
+	case PHY_INTERFACE_MODE_1000BASEKX:
 		return 1;
 	case PHY_INTERFACE_MODE_QSGMII:
 	case PHY_INTERFACE_MODE_QUSGMII:
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index e487bdea9b47..e9d62f9598f9 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -345,6 +345,7 @@ void phylink_get_linkmodes(unsigned long *linkmodes, phy_interface_t interface,
 	case PHY_INTERFACE_MODE_1000BASEX:
 		caps |= MAC_1000HD;
 		fallthrough;
+	case PHY_INTERFACE_MODE_1000BASEKX:
 	case PHY_INTERFACE_MODE_TRGMII:
 		caps |= MAC_1000FD;
 		break;
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 7c49ab95441b..337230c135f7 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -116,6 +116,7 @@ extern const int phy_10gbit_features_array[1];
  * @PHY_INTERFACE_MODE_USXGMII:  Universal Serial 10GE MII
  * @PHY_INTERFACE_MODE_10GKR: 10GBASE-KR - with Clause 73 AN
  * @PHY_INTERFACE_MODE_QUSGMII: Quad Universal SGMII
+ * @PHY_INTERFACE_MODE_1000BASEKX: 1000Base-KX - with Clause 73 AN
  * @PHY_INTERFACE_MODE_MAX: Book keeping
  *
  * Describes the interface between the MAC and PHY.
@@ -154,6 +155,7 @@ typedef enum {
 	/* 10GBASE-KR - with Clause 73 AN */
 	PHY_INTERFACE_MODE_10GKR,
 	PHY_INTERFACE_MODE_QUSGMII,
+	PHY_INTERFACE_MODE_1000BASEKX,
 	PHY_INTERFACE_MODE_MAX,
 } phy_interface_t;
 
@@ -251,6 +253,8 @@ static inline const char *phy_modes(phy_interface_t interface)
 		return "trgmii";
 	case PHY_INTERFACE_MODE_1000BASEX:
 		return "1000base-x";
+	case PHY_INTERFACE_MODE_1000BASEKX:
+		return "1000base-kx";
 	case PHY_INTERFACE_MODE_2500BASEX:
 		return "2500base-x";
 	case PHY_INTERFACE_MODE_5GBASER:
-- 
2.35.1.1320.gc452695387.dirty