From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> To: netdev@vger.kernel.org Cc: linux-sh@vger.kernel.org, Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>, Ben Dooks <ben.dooks@codethink.co.uk> Subject: [PATCH 4/5] sh_eth: Register MDIO bus before registering the network device Date: Thu, 20 Mar 2014 13:59:06 +0000 [thread overview] Message-ID: <1395324035-22918-5-git-send-email-laurent.pinchart+renesas@ideasonboard.com> (raw) In-Reply-To: <1395324035-22918-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com> Network API functions that rely on the MDIO bus can be called as soon as the driver calls register_netdev(). Register the MDIO bus before the network device to avoid race conditions. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> --- drivers/net/ethernet/renesas/sh_eth.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index e9224f2..ace6da2 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -2891,6 +2891,13 @@ static int sh_eth_drv_probe(struct platform_device *pdev) } } + /* MDIO bus init */ + ret = sh_mdio_init(mdp, pd); + if (ret) { + dev_err(&ndev->dev, "failed to initialise MDIO\n"); + goto out_release; + } + netif_napi_add(ndev, &mdp->napi, sh_eth_poll, 64); /* network device register */ @@ -2898,13 +2905,6 @@ static int sh_eth_drv_probe(struct platform_device *pdev) if (ret) goto out_napi_del; - /* mdio bus init */ - ret = sh_mdio_init(mdp, pd); - if (ret) { - dev_err(&ndev->dev, "failed to initialise MDIO\n"); - goto out_unregister; - } - /* print device information */ netdev_info(ndev, "Base address at 0x%x, %pM, IRQ %d.\n", (u32)ndev->base_addr, ndev->dev_addr, ndev->irq); @@ -2913,11 +2913,9 @@ static int sh_eth_drv_probe(struct platform_device *pdev) return ret; -out_unregister: - unregister_netdev(ndev); - out_napi_del: netif_napi_del(&mdp->napi); + sh_mdio_release(mdp); out_release: /* net_dev free */ @@ -2933,9 +2931,9 @@ static int sh_eth_drv_remove(struct platform_device *pdev) struct net_device *ndev = platform_get_drvdata(pdev); struct sh_eth_private *mdp = netdev_priv(ndev); - sh_mdio_release(mdp); unregister_netdev(ndev); netif_napi_del(&mdp->napi); + sh_mdio_release(mdp); pm_runtime_disable(&pdev->dev); free_netdev(ndev); -- 1.8.3.2
WARNING: multiple messages have this Message-ID (diff)
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> To: netdev@vger.kernel.org Cc: linux-sh@vger.kernel.org, Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>, Ben Dooks <ben.dooks@codethink.co.uk> Subject: [PATCH 4/5] sh_eth: Register MDIO bus before registering the network device Date: Thu, 20 Mar 2014 15:00:34 +0100 [thread overview] Message-ID: <1395324035-22918-5-git-send-email-laurent.pinchart+renesas@ideasonboard.com> (raw) In-Reply-To: <1395324035-22918-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com> Network API functions that rely on the MDIO bus can be called as soon as the driver calls register_netdev(). Register the MDIO bus before the network device to avoid race conditions. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> --- drivers/net/ethernet/renesas/sh_eth.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index e9224f2..ace6da2 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -2891,6 +2891,13 @@ static int sh_eth_drv_probe(struct platform_device *pdev) } } + /* MDIO bus init */ + ret = sh_mdio_init(mdp, pd); + if (ret) { + dev_err(&ndev->dev, "failed to initialise MDIO\n"); + goto out_release; + } + netif_napi_add(ndev, &mdp->napi, sh_eth_poll, 64); /* network device register */ @@ -2898,13 +2905,6 @@ static int sh_eth_drv_probe(struct platform_device *pdev) if (ret) goto out_napi_del; - /* mdio bus init */ - ret = sh_mdio_init(mdp, pd); - if (ret) { - dev_err(&ndev->dev, "failed to initialise MDIO\n"); - goto out_unregister; - } - /* print device information */ netdev_info(ndev, "Base address at 0x%x, %pM, IRQ %d.\n", (u32)ndev->base_addr, ndev->dev_addr, ndev->irq); @@ -2913,11 +2913,9 @@ static int sh_eth_drv_probe(struct platform_device *pdev) return ret; -out_unregister: - unregister_netdev(ndev); - out_napi_del: netif_napi_del(&mdp->napi); + sh_mdio_release(mdp); out_release: /* net_dev free */ @@ -2933,9 +2931,9 @@ static int sh_eth_drv_remove(struct platform_device *pdev) struct net_device *ndev = platform_get_drvdata(pdev); struct sh_eth_private *mdp = netdev_priv(ndev); - sh_mdio_release(mdp); unregister_netdev(ndev); netif_napi_del(&mdp->napi); + sh_mdio_release(mdp); pm_runtime_disable(&pdev->dev); free_netdev(ndev); -- 1.8.3.2
next prev parent reply other threads:[~2014-03-20 13:59 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-03-20 13:58 [PATCH 0/5] sh_eth: Fix the race between open and MDIO bus registration Laurent Pinchart 2014-03-20 14:00 ` Laurent Pinchart 2014-03-20 13:59 ` [PATCH 5/5] sh_eth: Remove goto statements that jump straight to a return Laurent Pinchart 2014-03-20 14:00 ` Laurent Pinchart 2014-03-20 13:59 ` Laurent Pinchart [this message] 2014-03-20 14:00 ` [PATCH 4/5] sh_eth: Register MDIO bus before registering the network device Laurent Pinchart 2014-03-20 13:59 ` [PATCH 1/5] sh_eth: Use the platform device for memory allocation Laurent Pinchart 2014-03-20 14:00 ` Laurent Pinchart 2014-03-20 13:59 ` [PATCH 2/5] sh_eth: Use the platform device as the MDIO bus parent Laurent Pinchart 2014-03-20 14:00 ` Laurent Pinchart 2014-03-20 13:59 ` [PATCH 3/5] sh_eth: Simplify MDIO bus initialization and release Laurent Pinchart 2014-03-20 14:00 ` Laurent Pinchart 2014-03-20 15:31 ` Sergei Shtylyov 2014-03-20 15:31 ` Sergei Shtylyov 2014-03-20 21:22 ` [PATCH 0/5] sh_eth: Fix the race between open and MDIO bus registration David Miller 2014-03-20 21:22 ` David Miller
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1395324035-22918-5-git-send-email-laurent.pinchart+renesas@ideasonboard.com \ --to=laurent.pinchart+renesas@ideasonboard.com \ --cc=ben.dooks@codethink.co.uk \ --cc=linux-sh@vger.kernel.org \ --cc=netdev@vger.kernel.org \ --cc=sergei.shtylyov@cogentembedded.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.