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:   Vladimir Oltean <vladimir.oltean@nxp.com>
To:     netdev@vger.kernel.org
Cc:     Jose Abreu <Jose.Abreu@synopsys.com>, Andrew Lunn <andrew@lunn.ch>,
        Heiner Kallweit <hkallweit1@gmail.com>,
        Russell King <linux@armlinux.org.uk>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>, linux-kernel@vger.kernel.org
Subject: [PATCH net] net: pcs: xpcs: fix C73 AN not getting enabled
Date:   Tue, 16 May 2023 18:44:10 +0300
Message-Id: <20230516154410.4012337-1-vladimir.oltean@nxp.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?FFyd9+RcXWYi5hDU43BTRVBXDgaCiHI4RmdqH3QNHmVg6IbgKcrToiSF/mg5?=
 =?us-ascii?Q?D1VzHvup+ggOX03KDjM35e0ysdduW3PVjoxWw5YSNjCOMHI5uCRJI17AMVhs?=
 =?us-ascii?Q?zrwT8RmUYwRU0d8FDhH7wMlNyqk0bHPEpEsBeoqLZaJ9hPRiKUu8fLV1AWEk?=
 =?us-ascii?Q?3g2AHES3LZFjMsDOH+wiHmkWJeM2/XJ0UBsbrk8IRVbopH98G9I6qhNgfYgn?=
 =?us-ascii?Q?pFl/QdUAQbaaE79aQN3Nl+ATeizq9bTuvWWT8MBCW0SOpqJQaxjrDNZBsWwP?=
 =?us-ascii?Q?zphvsFBbtCey5+ArsxyitW1BjhH8NN3ecRYDWhqTfaF9he3strPHR5WJE1fF?=
 =?us-ascii?Q?BqnjmrmHyxdqzfXIIS7CXMVRRPLdQWBjP6/1Xl1aeBnoGPrZ/K0t5aQTmiyT?=
 =?us-ascii?Q?VgdwrtmBUAVmp/HmWH4WGixuryRfn1+Z8PwPAjBwB46m4fhCQAnNcNZaSxAY?=
 =?us-ascii?Q?4KaaTBtsNTGO2jP5K8SmYJBjTx0lBG+JiJ4tSryx56Lz7Y8HnutuwPaA8+SP?=
 =?us-ascii?Q?L4kM/MUHozlmuJC7tMA5QudaYxvSgjMe0MBLqgDXgHvd2oefdu2ZOwlbEQxb?=
 =?us-ascii?Q?UUVxP7esyD6PlN5jCRsAtfkWf6kUoGG+dPdNSkPJg6zdTko8FSKjHOqWAwN2?=
 =?us-ascii?Q?sT++b5wxboLl7zEdSUm/rWXqJZOA3UaRiUbLe+Fm4vcKoAgEavSLHyDneZfe?=
 =?us-ascii?Q?JOGs5QEnELhqbpwRlUdl/ChxPCVavPjRuK8k02OhLZ1wtNBWeVZvCPhz5zvt?=
 =?us-ascii?Q?I6wp4bJgx64ct8MAf97N5WrwQFNZWVlPaIbkNqSZp/Lus9Do2II/F8CltD6I?=
 =?us-ascii?Q?BHmi2krywb30QbAK4iDEy04AW+0WkzzFuDQEapdiLYP0lo9zRT3NsLI/oVb/?=
 =?us-ascii?Q?/tfsTiqUSxLir8dZPIPfo8MZNa+xQfYa/72dgITx8aoHASIiSET1NOlevD4n?=
 =?us-ascii?Q?AhA/An4PE5F/Yv9D+6HHBJtnue3w8968PX9nPHrH0Jiquc7i6gzVGCPtPe8j?=
 =?us-ascii?Q?9UEimDW8n1H54GVArvr3KWy8418dzqYYZ2hGmc1gxa7RlEjUGO7PTm108Z92?=
 =?us-ascii?Q?WEGk+UFTTw3eijeZKe/CXJ/WGmsBLj7//uE2neLb6nYqcAWZk4bjbTSSqjiO?=
 =?us-ascii?Q?ZhihVBY0Lxbifnwq51LIqmniEOaoT5eVm5W2D+P5rOBwnK0SeHEnwc2evem+?=
 =?us-ascii?Q?o5LDGJfZy2XuAlurFtAsprp3MO6/7IeLhaZ8PM6Zn+bbCpgVQDiFjofx4FmI?=
 =?us-ascii?Q?KAqbd3/4l2gWpt0dMZqaV3uoaXZb65SERI/9bJp0jSu+b9/0dFU21T0rGkGs?=
 =?us-ascii?Q?nhyVfYLLlGu0uYS13yAP0iCZBn765aWkxgOyp63xw6MOwsr5zu61y36+frtU?=
 =?us-ascii?Q?0FixeSrb5EcgDoK+TUREdCZgbIBmwCBPTk0m7XYkMtD/VEYlOTS+VS12Pe5p?=
 =?us-ascii?Q?DxQvAu70dGptv2WP6pXpjxnf3GF74YCcfVVERHtCQtIcl5aZtBzNkN5OCLC1?=
 =?us-ascii?Q?GNRPnx0gNT9spzJshBPQOgCZfw1FG9l0aocmyDmnRuu1Z2/WAZIlyNWpkBp7?=
 =?us-ascii?Q?vEM8J5jR4V95eOcIQncZheAtq3Ej3HPAsyt837VzoZfcGVY+XYFjUrOipp0L?=
 =?us-ascii?Q?3A=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 82b9b869-79d2-4d3e-b78e-08db56247002
X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6452.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2023 15:44:30.2736
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 32zkwaswPEIJB80nJcFWEuhqbrzAN9ijVQt1ZfJRUqWH0XSXUhfRrGJ5peLXFaFgc1orlTCHogJ9DzLymWmUIg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7668
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

The XPCS expects clause 73 (copper backplane) autoneg to follow the
ethtool autoneg bit. It actually did that until the blamed
commit inaptly replaced state->an_enabled (coming from ethtool) with
phylink_autoneg_inband() (coming from the device tree or struct
phylink_config), as part of an unrelated phylink_pcs API conversion.

Russell King suggests that state->an_enabled from the original code was
just a proxy for the ethtool Autoneg bit, and that the correct way of
restoring the functionality is to check for this bit in the advertising
mask.

Fixes: 11059740e616 ("net: pcs: xpcs: convert to phylink_pcs_ops")
Link: https://lore.kernel.org/netdev/ZGNt2MFeRolKGFck@shell.armlinux.org.uk/
Suggested-by: Russell King (Oracle) <linux@armlinux.org.uk>
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
The only (paranoid) test I've done is that the sja1105 driver (which
also calls xpcs_do_config() outside of phylink, and provides a NULL
pointer for "advertising") does not crash. Which was completely to be
expected, since none of the nxp_sja1105 XPCS compatible modes uses
DW_AN_C73.

 drivers/net/pcs/pcs-xpcs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/pcs/pcs-xpcs.c b/drivers/net/pcs/pcs-xpcs.c
index 539cd43eae8d..f680d03863ff 100644
--- a/drivers/net/pcs/pcs-xpcs.c
+++ b/drivers/net/pcs/pcs-xpcs.c
@@ -873,7 +873,7 @@ int xpcs_do_config(struct dw_xpcs *xpcs, phy_interface_t interface,
 
 	switch (compat->an_mode) {
 	case DW_AN_C73:
-		if (phylink_autoneg_inband(mode)) {
+		if (test_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, advertising)) {
 			ret = xpcs_config_aneg_c73(xpcs, compat);
 			if (ret)
 				return ret;
-- 
2.34.1