Re: [PATCH net 1/2] net: cpsw_new: Fix unnecessary netdev unregistration in cpsw_probe() error path

[Alexander Sverdlin <alexander.sverdlin@gmail.com>]

On Thu, 2026-02-05 at 10:47 +0800, Kevin Hao wrote:
> The current error handling in cpsw_probe() has two issues:
> - cpsw_unregister_ports() may be called before cpsw_register_ports() has
>   been executed.
> 
> - cpsw_unregister_ports() is already invoked within cpsw_register_ports()
>   in case of a register_netdev() failure, but the error path would call
>   it again.
> 
> Fixes: ed3525eda4c4 ("net: ethernet: ti: introduce cpsw switchdev based driver part 1 - dual-emac")
> Signed-off-by: Kevin Hao <haokexin@gmail.com>

Reviewed-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>

> Cc: stable@vger.kernel.org
> ---
>  drivers/net/ethernet/ti/cpsw_new.c | 12 +++++-------
>  1 file changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/net/ethernet/ti/cpsw_new.c b/drivers/net/ethernet/ti/cpsw_new.c
> index 21af0a10626aaf0ce6ecb04837899801743f3894..b9fc31eb06134dae33427eaba06341c39eb4b41c 100644
> --- a/drivers/net/ethernet/ti/cpsw_new.c
> +++ b/drivers/net/ethernet/ti/cpsw_new.c
> @@ -2003,7 +2003,7 @@ static int cpsw_probe(struct platform_device *pdev)
>  	/* setup netdevs */
>  	ret = cpsw_create_ports(cpsw);
>  	if (ret)
> -		goto clean_unregister_netdev;
> +		goto clean_cpts;
>  
>  	/* Grab RX and TX IRQs. Note that we also have RX_THRESHOLD and
>  	 * MISC IRQs which are always kept disabled with this driver so
> @@ -2017,14 +2017,14 @@ static int cpsw_probe(struct platform_device *pdev)
>  			       0, dev_name(dev), cpsw);
>  	if (ret < 0) {
>  		dev_err(dev, "error attaching irq (%d)\n", ret);
> -		goto clean_unregister_netdev;
> +		goto clean_cpts;
>  	}
>  
>  	ret = devm_request_irq(dev, cpsw->irqs_table[1], cpsw_tx_interrupt,
>  			       0, dev_name(dev), cpsw);
>  	if (ret < 0) {
>  		dev_err(dev, "error attaching irq (%d)\n", ret);
> -		goto clean_unregister_netdev;
> +		goto clean_cpts;
>  	}
>  
>  	if (!cpsw->cpts)
> @@ -2034,7 +2034,7 @@ static int cpsw_probe(struct platform_device *pdev)
>  			       0, dev_name(&pdev->dev), cpsw);
>  	if (ret < 0) {
>  		dev_err(dev, "error attaching misc irq (%d)\n", ret);
> -		goto clean_unregister_netdev;
> +		goto clean_cpts;
>  	}
>  
>  	/* Enable misc CPTS evnt_pend IRQ */
> @@ -2043,7 +2043,7 @@ static int cpsw_probe(struct platform_device *pdev)
>  skip_cpts:
>  	ret = cpsw_register_notifiers(cpsw);
>  	if (ret)
> -		goto clean_unregister_netdev;
> +		goto clean_cpts;
>  
>  	ret = cpsw_register_devlink(cpsw);
>  	if (ret)
> @@ -2065,8 +2065,6 @@ static int cpsw_probe(struct platform_device *pdev)
>  
>  clean_unregister_notifiers:
>  	cpsw_unregister_notifiers(cpsw);
> -clean_unregister_netdev:
> -	cpsw_unregister_ports(cpsw);
>  clean_cpts:
>  	cpts_release(cpsw->cpts);
>  	cpdma_ctlr_destroy(cpsw->dma);

-- 
Alexander Sverdlin.