From: Ben Dooks <ben.dooks@codethink.co.uk>
To: linux-kernel@lists.codethink.co.uk, netdev@vger.kernel.org
Cc: linux-sh@vger.kernel.org, davem@davemloft.net,
Ben Dooks <ben.dooks@codethink.co.uk>,
sergei.shtylyov@cogentembedded.com,
laurent.pinchart+renesas@ideasonboard.com
Subject: [PATCH v3] sh_eth: ensure pm_runtime cannot suspend the device during init
Date: Thu, 20 Mar 2014 18:34:37 +0100 [thread overview]
Message-ID: <1395336877-12402-1-git-send-email-ben.dooks@codethink.co.uk> (raw)
The pm_rumtime work queue is causing the device to be suspended during
initialisation, thus the initialisation may not be able to access registers
properly. As the code is called from a work queue, it is possible that this
is not seen from certain configurations/builds due to the asynchronos
nature of the code.
Another issue has also been found where the network device registration
calls back into the driver thus causing further pm_runtime calls that
also caused issues with the MDIO bus code.
Use pm_runtime_get_sync() and pm_runtime_put() to ensure that the
pm system does not suspend it during the probe() call and remove the
now unnecessary pm_runtime_resume() call.
This fixes the external abort that can cause /sbin/init or other such
init processed to die.
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
Cc: sergei.shtylyov@cogentembedded.com
Cc: laurent.pinchart+renesas@ideasonboard.com
cc: netdev@vger.kernel.org
Note, Laurent this should probably be applied before your
current series as it may require changes to the exit sequence.
Fixes from v1:
- use pm_runtime_put() over pm_runtime_put_sync() as
we do not need to guaranteed the device has powered
off after probe.
Fixed from v2:
- call pm_runtime_put() in error path
---
drivers/net/ethernet/renesas/sh_eth.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 4f76b5e..610da51 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -2841,6 +2841,9 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
goto out;
}
+ pm_runtime_enable(&pdev->dev);
+ pm_runtime_get_sync(&pdev->dev);
+
/* The sh Ether-specific entries in the device structure. */
ndev->base_addr = res->start;
devno = pdev->id;
@@ -2868,8 +2871,6 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
spin_lock_init(&mdp->lock);
mdp->pdev = pdev;
- pm_runtime_enable(&pdev->dev);
- pm_runtime_resume(&pdev->dev);
if (pdev->dev.of_node)
pd = sh_eth_parse_dt(&pdev->dev);
@@ -2961,6 +2962,7 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
pr_info("Base address at 0x%x, %pM, IRQ %d.\n",
(u32)ndev->base_addr, ndev->dev_addr, ndev->irq);
+ pm_runtime_put(&pdev->dev);
platform_set_drvdata(pdev, ndev);
return ret;
@@ -2976,6 +2978,7 @@ out_release:
if (ndev)
free_netdev(ndev);
+ pm_runtime_put(&pdev->dev);
out:
return ret;
}
--
1.9.0
next reply other threads:[~2014-03-20 17:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-20 17:34 Ben Dooks [this message]
2014-03-20 18:01 ` [PATCH v3] sh_eth: ensure pm_runtime cannot suspend the device during init Laurent Pinchart
2014-03-20 19:09 ` Sergei Shtylyov
2014-03-20 21:02 ` Ben Dooks
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=1395336877-12402-1-git-send-email-ben.dooks@codethink.co.uk \
--to=ben.dooks@codethink.co.uk \
--cc=davem@davemloft.net \
--cc=laurent.pinchart+renesas@ideasonboard.com \
--cc=linux-kernel@lists.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).