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:     "David S . Miller" <davem@davemloft.net>,
        Paolo Abeni <pabeni@redhat.com>,
        Vladimir Oltean <olteanv@gmail.com>,
        linux-kernel@vger.kernel.org, Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Alexandru Marginean <alexandru.marginean@nxp.com>,
        Sean Anderson <sean.anderson@seco.com>
Subject: [PATCH net-next v4 08/10] net: phylink: Adjust advertisement based on rate adaptation
Date:   Thu, 18 Aug 2022 12:46:14 -0400
Message-Id: <20220818164616.2064242-9-sean.anderson@seco.com>
In-Reply-To: <20220818164616.2064242-1-sean.anderson@seco.com>
References: <20220818164616.2064242-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?KZIU2MBSNl8ayUPJPCHH9PpiusoGmxAnO8lgXST4bbSjqIk8R2W50wGL0Eg8?=
 =?us-ascii?Q?X+7FY7gqlm0YIaL7p/qz5fvTqUOqF0jTUbZFr2SJ6SHKCOCh+a3elMnVbFhL?=
 =?us-ascii?Q?pT4dHAZFQ1equZDjP6iyj8sSuG9FjmWernnMSApl5xZS6JAIIGuis9yp3kvz?=
 =?us-ascii?Q?XsJWsdLgu2o8oxJwa/WyjhOIlaUq4IkjRHvMbCAJ44NI/s52CNckZdq7N0xl?=
 =?us-ascii?Q?4caBSOpiDh/QFFcEdFv+agHJgQj/lydjZfE7JZSMovzUtlyl9BltprzIQgeg?=
 =?us-ascii?Q?zReFBmqr2TPlS+/kSqJZC1G/LG71UoJ8S++N+baJqEHYJOnw68E1wOAE0eVB?=
 =?us-ascii?Q?2AgATkS2gMOU82a7tqVMOrmxuLhtPXIOWkkhQCXMzbKzRqN0M30cFUu7R2HY?=
 =?us-ascii?Q?AkuIgNFhnBwEi1QN7a/mTD2xsyUN0n/WOUEL3f3/oitVcGGa4gEJl6fQUw7i?=
 =?us-ascii?Q?ueWkIAo9VGHnVHfeFd32Lu5Gq5f1wPCrQFsg+QaVWWFJttwyy2yJgQcOj2Bn?=
 =?us-ascii?Q?CrKXoZ4Aj1a3ZEl4s9yo3CHYXcJxkfwdfTCJKJVtc91ryUr1QLbW3HrFdTJd?=
 =?us-ascii?Q?R49yopr7rsQJ5MzyHmJ9xUGzOUJqhuyucw4aJs6sXi++4s2P4Q3pWD8BzaXb?=
 =?us-ascii?Q?6nfs7lQXpTesHgX+yb/AGsSMfBpIoFKPTkqQa+kG3eg/8jV9CBb67Nka94S2?=
 =?us-ascii?Q?H0RwSnk0xzXzbGQ90/D3iMubAoPQUjErWJCrZc46biG0PVx/MjcQxl8iG+Oj?=
 =?us-ascii?Q?kDhiUL8SjoUtmWs/dUmAmmzROCeiXrHasZn/kVtXOdfwDnYMP9hdCpZzoYCU?=
 =?us-ascii?Q?cjXjyby+tqQx7OyoeWXaokP6D5lJ2myxdKPORDl2qZvc0PFlCKhmkN8iXOkE?=
 =?us-ascii?Q?04mvhPa1HOppV4V1rTzuTUqBXDE2bRLUVCzGknqmuem2Aj4MvX+4QNtnl9Ic?=
 =?us-ascii?Q?9lNWqULQC9FPydrvK/QxEWr/Iyq7/X4JIWbIjdo48Qc6bibi8yDsTkavoGO8?=
 =?us-ascii?Q?ekLJ0nLA3be6T6QkJBl6m29dctBA3tpf1RwMt/4k9HikNUCvRX08N1Hme4rH?=
 =?us-ascii?Q?dmz6iRdWkxPosOwhtLFPy1v6quobRzr2waQ6h9r5UU9znYU1kZWKSDeOJFNL?=
 =?us-ascii?Q?dTCZTRi4MF+qsmF9tkg1AlNGYo2pAvJ6Ypii0tDVbwey0znGmUvZyAeuV61S?=
 =?us-ascii?Q?0hEhwOd2GD/fwizfB9Na340ZekQXVS+i1qqRO2GUHToNDomkadpvCt+PmAYI?=
 =?us-ascii?Q?aG2d8NEb0thntd48z40drkZvmTt/kGwruvhkqxCJe+woGPJUCGc/HmSMK94m?=
 =?us-ascii?Q?9ssyOURKn6WJXfGqAR+53s4HMMlShz6UqruNwaCM2xWq0IHANyuuyo2Xzlb8?=
 =?us-ascii?Q?V+9ZI/boePM6tz1MDIIiPj8SgYsg+LJLnNAohQqBXrTdSwK5VobWQL577IID?=
 =?us-ascii?Q?MiCMhAeaE3kBzW0NOxcVyn6OYNMmwSY/DHgYTd+gncRp5aXaW903vawZ7/rY?=
 =?us-ascii?Q?JZJxOfaP1tCiIMR+Gw+Xfx8GDugzhzUvyfua2Px1QdebdDwtkC0GxHU4N7cM?=
 =?us-ascii?Q?QnUz0vsn7o0PanhEsokyh6dF80/AlgC9aScCE/DaD1QVFUvAekeRwXti6Y3A?=
 =?us-ascii?Q?dw=3D=3D?=
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8fb08306-f0b5-401c-5dac-08da8139397b
X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Aug 2022 16:46:40.5101
 (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: Ra9MSjkgOdWzBefDvwVD/wkOb/MU1qCw9wUu9vt2PRuFJ4SyBmynfJ+WzzFQAADNGuCpNd7JLdAdQg5EkXWFpw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR03MB7649
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,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED 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>
---

(no changes since v3)

Changes in v3:
- Add phylink_cap_from_speed_duplex to look up the mac capability
  corresponding to the interface's speed.
- Include RATE_ADAPT_CRS; it's a few lines and it doesn't hurt.

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

 drivers/net/phy/phylink.c | 58 +++++++++++++++++++++++++++++++++++++--
 include/linux/phylink.h   |  3 +-
 2 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 3e4bbeb1fab2..6cc033148ebf 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -433,14 +433,18 @@ EXPORT_SYMBOL_GPL(phylink_caps_find_max_speed);
  * 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)
 {
+	int max_speed = phylink_interface_max_speed(interface);
 	unsigned long caps = MAC_SYM_PAUSE | MAC_ASYM_PAUSE;
+	unsigned long adapted_caps = 0;
 
 	switch (interface) {
 	case PHY_INTERFACE_MODE_USXGMII:
@@ -513,7 +517,53 @@ unsigned long phylink_get_capabilities(phy_interface_t interface,
 		break;
 	}
 
-	return caps & mac_capabilities;
+	switch (rate_adaptation) {
+	case RATE_ADAPT_OPEN_LOOP:
+		/* TODO */
+		fallthrough;
+	case RATE_ADAPT_NONE:
+		adapted_caps = 0;
+		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. This is because there's no way to
+		 * accept pause frames without transmitting them if we only
+		 * support symmetric pause.
+		 */
+		if (!(mac_capabilities & MAC_SYM_PAUSE) ||
+		    !(mac_capabilities & MAC_ASYM_PAUSE))
+			break;
+
+		/* We can't adapt if the MAC doesn't support the interface's
+		 * max speed at full duplex.
+		 */
+		if (mac_capabilities &
+		    phylink_cap_from_speed_duplex(max_speed, DUPLEX_FULL)) {
+			/* Although a duplex-adapting phy might exist, we
+			 * conservatively remove these modes because the MAC
+			 * will not be aware of the half-duplex nature of the
+			 * link.
+			 */
+			adapted_caps = GENMASK(__fls(caps), __fls(MAC_10HD));
+			adapted_caps &= ~(MAC_1000HD | MAC_100HD | MAC_10HD);
+		}
+		break;
+	}
+	case RATE_ADAPT_CRS:
+		/* The MAC must support half duplex at the interface's max
+		 * speed.
+		 */
+		if (mac_capabilities &
+		    phylink_cap_from_speed_duplex(max_speed, DUPLEX_HALF)) {
+			adapted_caps = GENMASK(__fls(caps), __fls(MAC_10HD));
+			adapted_caps &= mac_capabilities;
+		}
+		break;
+	}
+
+	return (caps & mac_capabilities) | adapted_caps;
 }
 EXPORT_SYMBOL_GPL(phylink_get_capabilities);
 
@@ -537,7 +587,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);
@@ -1563,6 +1614,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 192a18a8674a..265a344e1039 100644
--- a/include/linux/phylink.h
+++ b/include/linux/phylink.h
@@ -543,7 +543,8 @@ void phylink_caps_to_linkmodes(unsigned long *linkmodes, unsigned long caps);
 int phylink_caps_find_max_speed(unsigned long caps, int *speed,
 				unsigned int *duplex);
 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