* [PATCH V2] hwrng: OMAP: Fix assumption that runtime_get_sync will always succeed
@ 2016-06-24 16:50 Nishanth Menon
2016-06-24 16:50 ` [PATCH] " Nishanth Menon
2016-06-27 9:05 ` [PATCH V2] " Herbert Xu
0 siblings, 2 replies; 4+ messages in thread
From: Nishanth Menon @ 2016-06-24 16:50 UTC (permalink / raw)
To: Herbert Xu, Matt Mackall, Deepak Saxena
Cc: linux-kernel, linux-crypto, linux-omap, linux-arm-kernel, s-anna,
Nishanth Menon, Paul Walmsley
pm_runtime_get_sync does return a error value that must be checked for
error conditions, else, due to various reasons, the device maynot be
enabled and the system will crash due to lack of clock to the hardware
module.
Before:
12.562784] [00000000] *pgd=fe193835
12.562792] Internal error: : 1406 [#1] SMP ARM
[...]
12.562864] CPU: 1 PID: 241 Comm: modprobe Not tainted 4.7.0-rc4-next-20160624 #2
12.562867] Hardware name: Generic DRA74X (Flattened Device Tree)
12.562872] task: ed51f140 ti: ed44c000 task.ti: ed44c000
12.562886] PC is at omap4_rng_init+0x20/0x84 [omap_rng]
12.562899] LR is at set_current_rng+0xc0/0x154 [rng_core]
[...]
After the proper checks:
[ 94.366705] omap_rng 48090000.rng: _od_fail_runtime_resume: FIXME:
missing hwmod/omap_dev info
[ 94.375767] omap_rng 48090000.rng: Failed to runtime_get device -19
[ 94.382351] omap_rng 48090000.rng: initialization failed.
Fixes: 665d92fa85b5 ("hwrng: OMAP: convert to use runtime PM")
Cc: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
---
Changes in V2:
- Added runtime_put_noidle when get_sync fails to ensure proper refcounting
V1: https://patchwork.kernel.org/patch/9197855/
Patch based on: next-20160624
Issue seen with next-20160624
Full crash log: http://pastebin.ubuntu.com/17801376/
drivers/char/hw_random/omap-rng.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c
index 8a1432e8bb80..01d4be2c354b 100644
--- a/drivers/char/hw_random/omap-rng.c
+++ b/drivers/char/hw_random/omap-rng.c
@@ -384,7 +384,12 @@ static int omap_rng_probe(struct platform_device *pdev)
}
pm_runtime_enable(&pdev->dev);
- pm_runtime_get_sync(&pdev->dev);
+ ret = pm_runtime_get_sync(&pdev->dev);
+ if (ret) {
+ dev_err(&pdev->dev, "Failed to runtime_get device: %d\n", ret);
+ pm_runtime_put_noidle(&pdev->dev);
+ goto err_ioremap;
+ }
ret = (dev->of_node) ? of_get_omap_rng_device_details(priv, pdev) :
get_omap_rng_device_details(priv);
@@ -435,8 +440,15 @@ static int __maybe_unused omap_rng_suspend(struct device *dev)
static int __maybe_unused omap_rng_resume(struct device *dev)
{
struct omap_rng_dev *priv = dev_get_drvdata(dev);
+ int ret;
+
+ ret = pm_runtime_get_sync(dev);
+ if (ret) {
+ dev_err(dev, "Failed to runtime_get device: %d\n", ret);
+ pm_runtime_put_noidle(dev);
+ return ret;
+ }
- pm_runtime_get_sync(dev);
priv->pdata->init(priv);
return 0;
--
2.9.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH] hwrng: OMAP: Fix assumption that runtime_get_sync will always succeed
2016-06-24 16:50 [PATCH V2] hwrng: OMAP: Fix assumption that runtime_get_sync will always succeed Nishanth Menon
@ 2016-06-24 16:50 ` Nishanth Menon
2016-06-24 16:54 ` Nishanth Menon
2016-06-27 9:05 ` [PATCH V2] " Herbert Xu
1 sibling, 1 reply; 4+ messages in thread
From: Nishanth Menon @ 2016-06-24 16:50 UTC (permalink / raw)
To: Herbert Xu, Matt Mackall, Deepak Saxena
Cc: linux-kernel, linux-crypto, linux-omap, linux-arm-kernel, s-anna,
Nishanth Menon, Paul Walmsley
pm_runtime_get_sync does return a error value that must be checked for
error conditions, else, due to various reasons, the device maynot be
enabled and the system will crash due to lack of clock to the hardware
module.
Before:
12.562784] [00000000] *pgd=fe193835
12.562792] Internal error: : 1406 [#1] SMP ARM
[...]
12.562864] CPU: 1 PID: 241 Comm: modprobe Not tainted 4.7.0-rc4-next-20160624 #2
12.562867] Hardware name: Generic DRA74X (Flattened Device Tree)
12.562872] task: ed51f140 ti: ed44c000 task.ti: ed44c000
12.562886] PC is at omap4_rng_init+0x20/0x84 [omap_rng]
12.562899] LR is at set_current_rng+0xc0/0x154 [rng_core]
[...]
After the proper checks:
[ 94.366705] omap_rng 48090000.rng: _od_fail_runtime_resume: FIXME:
missing hwmod/omap_dev info
[ 94.375767] omap_rng 48090000.rng: Failed to runtime_get device -19
[ 94.382351] omap_rng 48090000.rng: initialization failed.
Fixes: 665d92fa85b5 ("hwrng: OMAP: convert to use runtime PM")
Cc: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
---
Issue seen with next-20160624
Full crash log: http://pastebin.ubuntu.com/17801376/
drivers/char/hw_random/omap-rng.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c
index 8a1432e8bb80..f30a1870cb64 100644
--- a/drivers/char/hw_random/omap-rng.c
+++ b/drivers/char/hw_random/omap-rng.c
@@ -384,7 +384,11 @@ static int omap_rng_probe(struct platform_device *pdev)
}
pm_runtime_enable(&pdev->dev);
- pm_runtime_get_sync(&pdev->dev);
+ ret = pm_runtime_get_sync(&pdev->dev);
+ if (ret) {
+ dev_err(&pdev->dev, "Failed to runtime_get device: %d\n", ret);
+ goto err_ioremap;
+ }
ret = (dev->of_node) ? of_get_omap_rng_device_details(priv, pdev) :
get_omap_rng_device_details(priv);
@@ -435,8 +439,14 @@ static int __maybe_unused omap_rng_suspend(struct device *dev)
static int __maybe_unused omap_rng_resume(struct device *dev)
{
struct omap_rng_dev *priv = dev_get_drvdata(dev);
+ int ret;
+
+ ret = pm_runtime_get_sync(dev);
+ if (ret) {
+ dev_err(dev, "Failed to runtime_get device: %d\n", ret);
+ return ret;
+ }
- pm_runtime_get_sync(dev);
priv->pdata->init(priv);
return 0;
--
2.9.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] hwrng: OMAP: Fix assumption that runtime_get_sync will always succeed
2016-06-24 16:50 ` [PATCH] " Nishanth Menon
@ 2016-06-24 16:54 ` Nishanth Menon
0 siblings, 0 replies; 4+ messages in thread
From: Nishanth Menon @ 2016-06-24 16:54 UTC (permalink / raw)
To: Herbert Xu, Matt Mackall, Deepak Saxena
Cc: linux-kernel, linux-crypto, linux-omap, linux-arm-kernel, s-anna,
Paul Walmsley
On 06/24/2016 11:50 AM, Nishanth Menon wrote:
> pm_runtime_get_sync does return a error value that must be checked for
> error conditions, else, due to various reasons, the device maynot be
> enabled and the system will crash due to lack of clock to the hardware
> module.
>
Oh crap! Apologies, please ignore the v1 patch which was unfortunately
reposted. Sorry for the spam - i was pretty sure I cleared out the old
patch, but looks I was wrong.
V2 of the patch is here: https://patchwork.kernel.org/patch/9197919/
--
Regards,
Nishanth Menon
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH V2] hwrng: OMAP: Fix assumption that runtime_get_sync will always succeed
2016-06-24 16:50 [PATCH V2] hwrng: OMAP: Fix assumption that runtime_get_sync will always succeed Nishanth Menon
2016-06-24 16:50 ` [PATCH] " Nishanth Menon
@ 2016-06-27 9:05 ` Herbert Xu
1 sibling, 0 replies; 4+ messages in thread
From: Herbert Xu @ 2016-06-27 9:05 UTC (permalink / raw)
To: Nishanth Menon
Cc: Matt Mackall, Deepak Saxena, linux-kernel, linux-crypto,
linux-omap, linux-arm-kernel, s-anna, Paul Walmsley
On Fri, Jun 24, 2016 at 11:50:39AM -0500, Nishanth Menon wrote:
> pm_runtime_get_sync does return a error value that must be checked for
> error conditions, else, due to various reasons, the device maynot be
> enabled and the system will crash due to lack of clock to the hardware
> module.
>
> Before:
> 12.562784] [00000000] *pgd=fe193835
> 12.562792] Internal error: : 1406 [#1] SMP ARM
> [...]
> 12.562864] CPU: 1 PID: 241 Comm: modprobe Not tainted 4.7.0-rc4-next-20160624 #2
> 12.562867] Hardware name: Generic DRA74X (Flattened Device Tree)
> 12.562872] task: ed51f140 ti: ed44c000 task.ti: ed44c000
> 12.562886] PC is at omap4_rng_init+0x20/0x84 [omap_rng]
> 12.562899] LR is at set_current_rng+0xc0/0x154 [rng_core]
> [...]
>
> After the proper checks:
> [ 94.366705] omap_rng 48090000.rng: _od_fail_runtime_resume: FIXME:
> missing hwmod/omap_dev info
> [ 94.375767] omap_rng 48090000.rng: Failed to runtime_get device -19
> [ 94.382351] omap_rng 48090000.rng: initialization failed.
>
> Fixes: 665d92fa85b5 ("hwrng: OMAP: convert to use runtime PM")
> Cc: Paul Walmsley <paul@pwsan.com>
> Signed-off-by: Nishanth Menon <nm@ti.com>
> ---
> Changes in V2:
> - Added runtime_put_noidle when get_sync fails to ensure proper refcounting
Patch applied. Thanks.
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-06-27 9:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-24 16:50 [PATCH V2] hwrng: OMAP: Fix assumption that runtime_get_sync will always succeed Nishanth Menon
2016-06-24 16:50 ` [PATCH] " Nishanth Menon
2016-06-24 16:54 ` Nishanth Menon
2016-06-27 9:05 ` [PATCH V2] " Herbert Xu
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).