From nobody Sun Apr 19 09:09:47 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8486FC43334 for ; Mon, 4 Jul 2022 07:31:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233366AbiGDHbJ (ORCPT ); Mon, 4 Jul 2022 03:31:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230200AbiGDHbG (ORCPT ); Mon, 4 Jul 2022 03:31:06 -0400 Received: from fllv0016.ext.ti.com (fllv0016.ext.ti.com [198.47.19.142]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 75F1963D3; Mon, 4 Jul 2022 00:31:01 -0700 (PDT) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 2647Ujfx017888; Mon, 4 Jul 2022 02:30:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1656919845; bh=+dqs1AWPs7TNM8tyq5UTW4slhow/MyTsel0hdgWuYss=; h=From:To:CC:Subject:Date; b=vYxu2Jd6jf/CYAmrrO+i8YoBieUQWEOMXe6ceNheLar56JzXNwYRTRJF2ePN3loqv /zrzFsE45p/xPaCG3J20VBrRH8/FerE1VdNgeocasxxVlF8D2FiSMvkPngoiU1FdL+ AHs19XAfAGIu4gXFNgDeTLKFEGesrNleAgf+QLHA= Received: from DLEE100.ent.ti.com (dlee100.ent.ti.com [157.170.170.30]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 2647UjYD079764 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 4 Jul 2022 02:30:45 -0500 Received: from DLEE108.ent.ti.com (157.170.170.38) by DLEE100.ent.ti.com (157.170.170.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14; Mon, 4 Jul 2022 02:30:45 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DLEE108.ent.ti.com (157.170.170.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14 via Frontend Transport; Mon, 4 Jul 2022 02:30:45 -0500 Received: from ula0492258.dal.design.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 2647UfTW005566; Mon, 4 Jul 2022 02:30:42 -0500 From: Siddharth Vadapalli To: , , CC: , , , , , Subject: [PATCH net v2] net: ethernet: ti: am65-cpsw: Fix devlink port register sequence Date: Mon, 4 Jul 2022 13:00:40 +0530 Message-ID: <20220704073040.7542-1-s-vadapalli@ti.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Renaming interfaces using udevd depends on the interface being registered before its netdev is registered. Otherwise, udevd reads an empty phys_port_name value, resulting in the interface not being renamed. Fix this by registering the interface before registering its netdev by invoking am65_cpsw_nuss_register_devlink() before invoking register_netdev() for the interface. Move the function call to devlink_port_type_eth_set(), invoking it after register_netdev() is invoked, to ensure that netlink notification for the port state change is generated after the netdev is completely initialized. Fixes: 58356eb31d60 ("net: ti: am65-cpsw-nuss: Add devlink support") Signed-off-by: Siddharth Vadapalli --- Changelog: v1 -> v2: 1. Add Fixes tag in commit message. 2. Update patch subject to include "net". 3. Invoke devlink_port_type_eth_set() after register_netdev() is called. 4. Update commit message describing the cause for moving the call to devlink_port_type_eth_set(). v1: https://lore.kernel.org/r/20220623044337.6179-1-s-vadapalli@ti.com/ drivers/net/ethernet/ti/am65-cpsw-nuss.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/etherne= t/ti/am65-cpsw-nuss.c index fb92d4c1547d..f6ced040701f 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c @@ -2467,7 +2467,6 @@ static int am65_cpsw_nuss_register_devlink(struct am6= 5_cpsw_common *common) port->port_id, ret); goto dl_port_unreg; } - devlink_port_type_eth_set(dl_port, port->ndev); } devlink_register(common->devlink); return ret; @@ -2511,6 +2510,7 @@ static void am65_cpsw_unregister_devlink(struct am65_= cpsw_common *common) static int am65_cpsw_nuss_register_ndevs(struct am65_cpsw_common *common) { struct device *dev =3D common->dev; + struct devlink_port *dl_port; struct am65_cpsw_port *port; int ret =3D 0, i; =20 @@ -2527,6 +2527,10 @@ static int am65_cpsw_nuss_register_ndevs(struct am65= _cpsw_common *common) return ret; } =20 + ret =3D am65_cpsw_nuss_register_devlink(common); + if (ret) + goto err_cleanup_ndev; + for (i =3D 0; i < common->port_num; i++) { port =3D &common->ports[i]; =20 @@ -2539,23 +2543,21 @@ static int am65_cpsw_nuss_register_ndevs(struct am6= 5_cpsw_common *common) i, ret); goto err_cleanup_ndev; } + + dl_port =3D &port->devlink_port; + devlink_port_type_eth_set(dl_port, port->ndev); } =20 ret =3D am65_cpsw_register_notifiers(common); if (ret) goto err_cleanup_ndev; =20 - ret =3D am65_cpsw_nuss_register_devlink(common); - if (ret) - goto clean_unregister_notifiers; - /* can't auto unregister ndev using devm_add_action() due to * devres release sequence in DD core for DMA */ =20 return 0; -clean_unregister_notifiers: - am65_cpsw_unregister_notifiers(common); + err_cleanup_ndev: am65_cpsw_nuss_cleanup_ndev(common); =20 --=20 2.36.1