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:     netdev@vger.kernel.org, Andrew Lunn <andrew@lunn.ch>,
        Heiner Kallweit <hkallweit1@gmail.com>,
        Russell King <linux@armlinux.org.uk>
Cc:     Alexandru Marginean <alexandru.marginean@nxp.com>,
        Paolo Abeni <pabeni@redhat.com>,
        "David S . Miller" <davem@davemloft.net>,
        linux-kernel@vger.kernel.org, Vladimir Oltean <olteanv@gmail.com>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Sean Anderson <sean.anderson@seco.com>
Subject: [PATCH v2 08/11] net: phylink: Adjust advertisement based on rate adaptation
Date:   Tue, 19 Jul 2022 19:49:58 -0400
Message-Id: <20220719235002.1944800-9-sean.anderson@seco.com>
In-Reply-To: <20220719235002.1944800-1-sean.anderson@seco.com>
References: <20220719235002.1944800-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?2Rex5lVY9kaHMTQ35E1KN8c8OSzKUZZOmu5xsQqAet8qLeHkpGCHk0K2Qw3Z?=
 =?us-ascii?Q?9VXAN/4e2n2ofxoJbqQRvNLDi0ROWXBj9ULrWb5peI/fws972Qfoyj6/UxrF?=
 =?us-ascii?Q?Axuay6c0xclcvCJKNXfLgk7WPoFdqAY6hSZPDnLPfwx2KyRGLatUpmRI6TV2?=
 =?us-ascii?Q?HYoz4gi02/Swj1gOSD8MXvCKiOBFpL5g4MdyvYbd9kMz9GV4HSpIis9IwsKw?=
 =?us-ascii?Q?poE8byDfvS85IDPOYHbOR0WlaaefNM+bMnQL+BmBlIvLhFMn7gpA2qzxnYs/?=
 =?us-ascii?Q?SqZbEXDS6/fM7SrtI0nZpPDvgtAJXKAn2M7YmvMauPKt3IySfWp7JSvYep+1?=
 =?us-ascii?Q?s41ZPKNFEDfBrVhaKhEussv0p8OFTX2AG1Rn7aIK2NEI44HnikIsLkY7XgHm?=
 =?us-ascii?Q?6bwbg74RUjCc5pVSWyUplUFmudEmL9DKCAqKaG4liYbZHwqNj4r6S+sJ4Ddo?=
 =?us-ascii?Q?yUzjjE8zryIoXvLI6J2pwfFMQ3dkqARzUVIDa68JQMP4sLEM9fKPfjn2UAa/?=
 =?us-ascii?Q?8bXCyYavONZl+e7Us++rlzQo6FhjgqKTHW2gHIji8M71lQReisUH2BayEjuu?=
 =?us-ascii?Q?NIfAQA6BQ8yfzebA+lsSgEadSUOj8FcJyBHe4y7gltz8n85eGEybpDbx8HpW?=
 =?us-ascii?Q?48SY3CI7ZcFLR6QgEkN2AyDIgfKTcNCW8nOdAegAtLhcyc4o1aaDHYp32XBi?=
 =?us-ascii?Q?AvNBa/xL2O/3PamTHPYhJTG8ajHfJ84Rd6x48kw+HvrXpvn5g9p+gBM/X5IV?=
 =?us-ascii?Q?ODcKXrdcve91FRmT9RQXvH2Tn+1lGm5qY1Rp82FEpvEn8XKWUriMCDfCBnsO?=
 =?us-ascii?Q?ObUJANYiGlgDhJWLqHgxeb3HhJ8x/OpcaXsj+FjYf/HYIKL0euY5xpGA2Rc9?=
 =?us-ascii?Q?kN0JhAAyyVsk/D9ERZHAsBiEnv/t0klzth4X0xUZpHAElrS6v1BgVmby0f4B?=
 =?us-ascii?Q?SdmYhFcZOPjo1lkdSLHVbFK6X9BmPqnKB2loA2wYEcNShtTrqOVaV/1NTDOi?=
 =?us-ascii?Q?K7MRWg6it+GoUKeZztN6YmDVHFUBsCgvNKXzdDiCJPEZfHR737d1zk1AfPX2?=
 =?us-ascii?Q?AqRgwGDe6PJea9pkpgVySpV+3oBxIRilZ5US22Ozx/CtCILCPYBJBEee2RPB?=
 =?us-ascii?Q?SjyE3qh0ttoKT0TJHV4hgxTkq70SARYRGJRy24iIyPv3QtDEiK1DgYtI/Rek?=
 =?us-ascii?Q?tqo7nisiaoiRGxLzgt/RSgBV6LfLD8Y7FGQapzh000bpX83yIjhdyWv+x0Ag?=
 =?us-ascii?Q?ZC4ye+3Sb8CJTLY1pFS/m4Vpdb2DZTQsJ6WC/X/LvuRuyG8Larfamcoe+13L?=
 =?us-ascii?Q?jBNCvhOOCd7T0y17DaCxlnut0/Jn/17vMwG0lxzIKvcmDCf2Y1QZZPUf62he?=
 =?us-ascii?Q?I23fX3p/dPHZN4QgWYpzuGPXcFofNYwHrE/bl2hyvBlEMiUjJTKprthxPnu+?=
 =?us-ascii?Q?Z9FfkPzCI/HoEaywu2d5sJgJoLiEEd8mpwDfNTTqci2/Gne3aXSumwecWSRL?=
 =?us-ascii?Q?6bmpoFAoLIRxbhSQO1zn32n1z9OspNa8dzxu0Dnssis55WSUC6zuq842r2h1?=
 =?us-ascii?Q?LJr58MDZHcivDfScRgJv8pq2aqnRj6b+BfosCHzG00n2BiBMcxCfPGABRrxz?=
 =?us-ascii?Q?dQ=3D=3D?=
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2d4c710b-20c3-49c2-8aa3-08da69e1798b
X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2022 23:50:35.5811
 (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: JAJrOJaz4HGF7OpARQQ01SlTYdi5+iKB2brqu1uIcJq8JUXu+reRSNVMy6V4PEZK81iuYR8Vp67BZZoUbS3wDQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR03MB4811
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,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS 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

This adds support for adjusting the advertisement for pause-based rate
adaptation. This may result in a lossy link, since the final link settings
are not adjusted. Asymmetric pause support is necessary. It would be
possible for a MAC supporting only symmetric pause to use pause-based rate
adaptation, but only if pause reception was enabled as well.

Signed-off-by: Sean Anderson <sean.anderson@seco.com>
---

Changes in v2:
- Determine the interface speed and max mac speed directly instead of
  guessing based on the caps.

 drivers/net/phy/phylink.c | 87 +++++++++++++++++++++++++++++++++++++--
 include/linux/phylink.h   |  5 ++-
 2 files changed, 88 insertions(+), 4 deletions(-)

diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 619ef553476f..f61040c93f3c 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -398,18 +398,65 @@ void phylink_caps_to_linkmodes(unsigned long *linkmodes, unsigned long caps)
 }
 EXPORT_SYMBOL_GPL(phylink_caps_to_linkmodes);
 
+static int phylink_caps_to_speed(unsigned long caps)
+{
+	unsigned int max_cap = __fls(caps);
+
+	if (max_cap == __fls(MAC_10HD) || max_cap == __fls(MAC_10FD))
+		return SPEED_10;
+	if (max_cap == __fls(MAC_100HD) || max_cap == __fls(MAC_100FD))
+		return SPEED_100;
+	if (max_cap == __fls(MAC_1000HD) || max_cap == __fls(MAC_1000FD))
+		return SPEED_1000;
+	if (max_cap == __fls(MAC_2500FD))
+		return SPEED_2500;
+	if (max_cap == __fls(MAC_5000FD))
+		return SPEED_5000;
+	if (max_cap == __fls(MAC_10000FD))
+		return SPEED_10000;
+	if (max_cap == __fls(MAC_20000FD))
+		return SPEED_20000;
+	if (max_cap == __fls(MAC_25000FD))
+		return SPEED_25000;
+	if (max_cap == __fls(MAC_40000FD))
+		return SPEED_40000;
+	if (max_cap == __fls(MAC_50000FD))
+		return SPEED_50000;
+	if (max_cap == __fls(MAC_56000FD))
+		return SPEED_56000;
+	if (max_cap == __fls(MAC_100000FD))
+		return SPEED_100000;
+	if (max_cap == __fls(MAC_200000FD))
+		return SPEED_200000;
+	if (max_cap == __fls(MAC_400000FD))
+		return SPEED_400000;
+	return SPEED_UNKNOWN;
+}
+
 /**
  * phylink_get_capabilities() - get capabilities for a given MAC
  * @interface: phy interface mode defined by &typedef phy_interface_t
  * @mac_capabilities: bitmask of MAC capabilities
+ * @rate_adaptation: type of rate adaptation being performed
  *
  * Get the MAC capabilities that are supported by the @interface mode and
  * @mac_capabilities.
  */
 unsigned long phylink_get_capabilities(phy_interface_t interface,
-				       unsigned long mac_capabilities)
+				       unsigned long mac_capabilities,
+				       int rate_adaptation)
 {
 	unsigned long caps = MAC_SYM_PAUSE | MAC_ASYM_PAUSE;
+	unsigned long adapted_caps = 0;
+	struct phylink_link_state state = {
+		.interface = interface,
+		.rate_adaptation = rate_adaptation,
+		.link_speed = SPEED_UNKNOWN,
+		.link_duplex = DUPLEX_UNKNOWN,
+	};
+
+	/* Look up the interface speed */
+	phylink_state_fill_speed_duplex(&state);
 
 	switch (interface) {
 	case PHY_INTERFACE_MODE_USXGMII:
@@ -482,7 +529,39 @@ unsigned long phylink_get_capabilities(phy_interface_t interface,
 		break;
 	}
 
-	return caps & mac_capabilities;
+	switch (rate_adaptation) {
+	case RATE_ADAPT_NONE:
+		break;
+	case RATE_ADAPT_PAUSE: {
+		/* The MAC must support asymmetric pause towards the local
+		 * device for this. We could allow just symmetric pause, but
+		 * then we might have to renegotiate if the link partner
+		 * doesn't support pause.
+		 */
+		if (!(mac_capabilities & MAC_SYM_PAUSE) ||
+		    !(mac_capabilities & MAC_ASYM_PAUSE))
+			break;
+
+		/* Can't adapt if the MAC doesn't support the interface's max
+		 * speed
+		 */
+		if (state.speed != phylink_caps_to_speed(mac_capabilities))
+			break;
+
+		adapted_caps = GENMASK(__fls(caps), __fls(MAC_10HD));
+		/* We can't use pause frames in half-duplex mode */
+		adapted_caps &= ~(MAC_1000HD | MAC_100HD | MAC_10HD);
+		break;
+	}
+	case RATE_ADAPT_CRS:
+		/* TODO */
+		break;
+	case RATE_ADAPT_OPEN_LOOP:
+		/* TODO */
+		break;
+	}
+
+	return (caps & mac_capabilities) | adapted_caps;
 }
 EXPORT_SYMBOL_GPL(phylink_get_capabilities);
 
@@ -506,7 +585,8 @@ void phylink_generic_validate(struct phylink_config *config,
 	phylink_set_port_modes(mask);
 	phylink_set(mask, Autoneg);
 	caps = phylink_get_capabilities(state->interface,
-					config->mac_capabilities);
+					config->mac_capabilities,
+					state->rate_adaptation);
 	phylink_caps_to_linkmodes(mask, caps);
 
 	linkmode_and(supported, supported, mask);
@@ -1529,6 +1609,7 @@ static int phylink_bringup_phy(struct phylink *pl, struct phy_device *phy,
 		config.interface = PHY_INTERFACE_MODE_NA;
 	else
 		config.interface = interface;
+	config.rate_adaptation = phy_get_rate_adaptation(phy, config.interface);
 
 	ret = phylink_validate(pl, supported, &config);
 	if (ret) {
diff --git a/include/linux/phylink.h b/include/linux/phylink.h
index f32b97f27ddc..73e1aa73e30f 100644
--- a/include/linux/phylink.h
+++ b/include/linux/phylink.h
@@ -70,6 +70,8 @@ static inline bool phylink_autoneg_inband(unsigned int mode)
  * @link: true if the link is up.
  * @an_enabled: true if autonegotiation is enabled/desired.
  * @an_complete: true if autonegotiation has completed.
+ * @rate_adaptation: method of throttling @interface_speed to @speed, one of
+ *   RATE_ADAPT_* constants.
  */
 struct phylink_link_state {
 	__ETHTOOL_DECLARE_LINK_MODE_MASK(advertising);
@@ -531,7 +533,8 @@ void pcs_link_up(struct phylink_pcs *pcs, unsigned int mode,
 
 void phylink_caps_to_linkmodes(unsigned long *linkmodes, unsigned long caps);
 unsigned long phylink_get_capabilities(phy_interface_t interface,
-				       unsigned long mac_capabilities);
+				       unsigned long mac_capabilities,
+				       int rate_adaptation);
 void phylink_generic_validate(struct phylink_config *config,
 			      unsigned long *supported,
 			      struct phylink_link_state *state);
-- 
2.35.1.1320.gc452695387.dirty