* [PATCH] net: ethernet: ti: am65-cpsw: Fix devlink port register sequence
@ 2022-06-23 4:43 Siddharth Vadapalli
2022-06-24 23:42 ` Jakub Kicinski
0 siblings, 1 reply; 3+ messages in thread
From: Siddharth Vadapalli @ 2022-06-23 4:43 UTC (permalink / raw)
To: davem, kuba, linux
Cc: netdev, linux-kernel, kishon, vigneshr, grygorii.strashko, s-vadapalli
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.
Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com>
---
drivers/net/ethernet/ti/am65-cpsw-nuss.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
index fb92d4c1547d..47a6c4e5360b 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
@@ -2527,6 +2527,10 @@ static int am65_cpsw_nuss_register_ndevs(struct am65_cpsw_common *common)
return ret;
}
+ ret = am65_cpsw_nuss_register_devlink(common);
+ if (ret)
+ goto err_cleanup_ndev;
+
for (i = 0; i < common->port_num; i++) {
port = &common->ports[i];
@@ -2545,17 +2549,12 @@ static int am65_cpsw_nuss_register_ndevs(struct am65_cpsw_common *common)
if (ret)
goto err_cleanup_ndev;
- ret = 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
*/
return 0;
-clean_unregister_notifiers:
- am65_cpsw_unregister_notifiers(common);
+
err_cleanup_ndev:
am65_cpsw_nuss_cleanup_ndev(common);
--
2.36.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] net: ethernet: ti: am65-cpsw: Fix devlink port register sequence
2022-06-23 4:43 [PATCH] net: ethernet: ti: am65-cpsw: Fix devlink port register sequence Siddharth Vadapalli
@ 2022-06-24 23:42 ` Jakub Kicinski
2022-07-04 4:43 ` Siddharth Vadapalli
0 siblings, 1 reply; 3+ messages in thread
From: Jakub Kicinski @ 2022-06-24 23:42 UTC (permalink / raw)
To: Siddharth Vadapalli
Cc: davem, linux, netdev, linux-kernel, kishon, vigneshr, grygorii.strashko
On Thu, 23 Jun 2022 10:13:37 +0530 Siddharth Vadapalli wrote:
> 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.
>
> Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com>
Please add a Fixes tag and [PATCH net] in the subject.
> diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
> index fb92d4c1547d..47a6c4e5360b 100644
> --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
> +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
> @@ -2527,6 +2527,10 @@ static int am65_cpsw_nuss_register_ndevs(struct am65_cpsw_common *common)
> return ret;
> }
>
> + ret = am65_cpsw_nuss_register_devlink(common);
> + if (ret)
> + goto err_cleanup_ndev;
You need to take the devlink_port_type_eth_set() out of this function
if it's now called before netdev registration and call it after netdev
registration. Otherwise devlink will generate a netlink notification
about the port state change with a half-initialized netdev.
> for (i = 0; i < common->port_num; i++) {
> port = &common->ports[i];
>
> @@ -2545,17 +2549,12 @@ static int am65_cpsw_nuss_register_ndevs(struct am65_cpsw_common *common)
> if (ret)
> goto err_cleanup_ndev;
>
> - ret = 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
> */
>
> return 0;
> -clean_unregister_notifiers:
> - am65_cpsw_unregister_notifiers(common);
> +
> err_cleanup_ndev:
> am65_cpsw_nuss_cleanup_ndev(common);
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] net: ethernet: ti: am65-cpsw: Fix devlink port register sequence
2022-06-24 23:42 ` Jakub Kicinski
@ 2022-07-04 4:43 ` Siddharth Vadapalli
0 siblings, 0 replies; 3+ messages in thread
From: Siddharth Vadapalli @ 2022-07-04 4:43 UTC (permalink / raw)
To: Jakub Kicinski
Cc: davem, linux, netdev, linux-kernel, kishon, vigneshr,
grygorii.strashko, s-vadapalli
Hello Jakub,
On 25/06/22 05:12, Jakub Kicinski wrote:
> On Thu, 23 Jun 2022 10:13:37 +0530 Siddharth Vadapalli wrote:
>> 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.
>>
>> Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com>
>
> Please add a Fixes tag and [PATCH net] in the subject.
Thank you for reviewing the patch. I will add the Fixes tag and include net in
the subject of the v2 patch.
>
>> diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
>> index fb92d4c1547d..47a6c4e5360b 100644
>> --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
>> +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
>> @@ -2527,6 +2527,10 @@ static int am65_cpsw_nuss_register_ndevs(struct am65_cpsw_common *common)
>> return ret;
>> }
>>
>> + ret = am65_cpsw_nuss_register_devlink(common);
>> + if (ret)
>> + goto err_cleanup_ndev;
>
> You need to take the devlink_port_type_eth_set() out of this function
> if it's now called before netdev registration and call it after netdev
> registration. Otherwise devlink will generate a netlink notification
> about the port state change with a half-initialized netdev.
I will fix this and post the v2 patch.
Regards,
Siddharth.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-07-04 4:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-23 4:43 [PATCH] net: ethernet: ti: am65-cpsw: Fix devlink port register sequence Siddharth Vadapalli
2022-06-24 23:42 ` Jakub Kicinski
2022-07-04 4:43 ` Siddharth Vadapalli
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.