* [PATCH] PM / Domains: Don't skip driver's ->suspend|resume_noirq() callbacks
@ 2018-01-10 20:31 Ulf Hansson
2018-01-11 0:54 ` Rafael J. Wysocki
0 siblings, 1 reply; 2+ messages in thread
From: Ulf Hansson @ 2018-01-10 20:31 UTC (permalink / raw)
To: Rafael J . Wysocki, Ulf Hansson, linux-pm
Cc: khilman, Geert Uytterhoeven, Mikko Perttunen
The commit 10da65423fdb ("PM / Domains: Call driver's noirq callbacks")
started to respect driver's noirq callbacks, but while doing that it also
introduced a few potential problems.
More precisely, in genpd_finish_suspend() and genpd_resume_noirq() the
noirq callbacks at the driver level should be invoked, no matter of whether
dev->power.wakeup_path is set or not.
Additionally, the commit in question also made genpd_resume_noirq() to
ignore the return value from pm_runtime_force_resume().
Let's fix both these issues!
Fixes: 10da65423fdb ("PM / Domains: Call driver's noirq callbacks")
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---
drivers/base/power/domain.c | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index f9dcc98..48255ce 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -1032,15 +1032,12 @@ static int genpd_prepare(struct device *dev)
static int genpd_finish_suspend(struct device *dev, bool poweroff)
{
struct generic_pm_domain *genpd;
- int ret;
+ int ret = 0;
genpd = dev_to_genpd(dev);
if (IS_ERR(genpd))
return -EINVAL;
- if (dev->power.wakeup_path && genpd_is_active_wakeup(genpd))
- return 0;
-
if (poweroff)
ret = pm_generic_poweroff_noirq(dev);
else
@@ -1048,10 +1045,18 @@ static int genpd_finish_suspend(struct device *dev, bool poweroff)
if (ret)
return ret;
+ if (dev->power.wakeup_path && genpd_is_active_wakeup(genpd))
+ return 0;
+
if (genpd->dev_ops.stop && genpd->dev_ops.start) {
ret = pm_runtime_force_suspend(dev);
- if (ret)
+ if (ret) {
+ if (poweroff)
+ pm_generic_restore_noirq(dev);
+ else
+ pm_generic_resume_noirq(dev);
return ret;
+ }
}
genpd_lock(genpd);
@@ -1085,7 +1090,7 @@ static int genpd_suspend_noirq(struct device *dev)
static int genpd_resume_noirq(struct device *dev)
{
struct generic_pm_domain *genpd;
- int ret = 0;
+ int ret;
dev_dbg(dev, "%s()\n", __func__);
@@ -1094,21 +1099,20 @@ static int genpd_resume_noirq(struct device *dev)
return -EINVAL;
if (dev->power.wakeup_path && genpd_is_active_wakeup(genpd))
- return 0;
+ return pm_generic_resume_noirq(dev);
genpd_lock(genpd);
genpd_sync_power_on(genpd, true, 0);
genpd->suspended_count--;
genpd_unlock(genpd);
- if (genpd->dev_ops.stop && genpd->dev_ops.start)
+ if (genpd->dev_ops.stop && genpd->dev_ops.start) {
ret = pm_runtime_force_resume(dev);
+ if (ret)
+ return ret;
+ }
- ret = pm_generic_resume_noirq(dev);
- if (ret)
- return ret;
-
- return ret;
+ return pm_generic_resume_noirq(dev);
}
/**
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] PM / Domains: Don't skip driver's ->suspend|resume_noirq() callbacks
2018-01-10 20:31 [PATCH] PM / Domains: Don't skip driver's ->suspend|resume_noirq() callbacks Ulf Hansson
@ 2018-01-11 0:54 ` Rafael J. Wysocki
0 siblings, 0 replies; 2+ messages in thread
From: Rafael J. Wysocki @ 2018-01-11 0:54 UTC (permalink / raw)
To: Ulf Hansson
Cc: Rafael J . Wysocki, Linux PM, Kevin Hilman, Geert Uytterhoeven,
Mikko Perttunen
On Wed, Jan 10, 2018 at 9:31 PM, Ulf Hansson <ulf.hansson@linaro.org> wrote:
> The commit 10da65423fdb ("PM / Domains: Call driver's noirq callbacks")
> started to respect driver's noirq callbacks, but while doing that it also
> introduced a few potential problems.
>
> More precisely, in genpd_finish_suspend() and genpd_resume_noirq() the
> noirq callbacks at the driver level should be invoked, no matter of whether
> dev->power.wakeup_path is set or not.
>
> Additionally, the commit in question also made genpd_resume_noirq() to
> ignore the return value from pm_runtime_force_resume().
>
> Let's fix both these issues!
>
> Fixes: 10da65423fdb ("PM / Domains: Call driver's noirq callbacks")
> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
> ---
> drivers/base/power/domain.c | 30 +++++++++++++++++-------------
> 1 file changed, 17 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
> index f9dcc98..48255ce 100644
> --- a/drivers/base/power/domain.c
> +++ b/drivers/base/power/domain.c
> @@ -1032,15 +1032,12 @@ static int genpd_prepare(struct device *dev)
> static int genpd_finish_suspend(struct device *dev, bool poweroff)
> {
> struct generic_pm_domain *genpd;
> - int ret;
> + int ret = 0;
>
> genpd = dev_to_genpd(dev);
> if (IS_ERR(genpd))
> return -EINVAL;
>
> - if (dev->power.wakeup_path && genpd_is_active_wakeup(genpd))
> - return 0;
> -
> if (poweroff)
> ret = pm_generic_poweroff_noirq(dev);
> else
> @@ -1048,10 +1045,18 @@ static int genpd_finish_suspend(struct device *dev, bool poweroff)
> if (ret)
> return ret;
>
> + if (dev->power.wakeup_path && genpd_is_active_wakeup(genpd))
> + return 0;
> +
> if (genpd->dev_ops.stop && genpd->dev_ops.start) {
> ret = pm_runtime_force_suspend(dev);
Good catch!
> - if (ret)
> + if (ret) {
> + if (poweroff)
> + pm_generic_restore_noirq(dev);
> + else
> + pm_generic_resume_noirq(dev);
> return ret;
> + }
> }
>
> genpd_lock(genpd);
> @@ -1085,7 +1090,7 @@ static int genpd_suspend_noirq(struct device *dev)
> static int genpd_resume_noirq(struct device *dev)
> {
> struct generic_pm_domain *genpd;
> - int ret = 0;
> + int ret;
>
> dev_dbg(dev, "%s()\n", __func__);
>
> @@ -1094,21 +1099,20 @@ static int genpd_resume_noirq(struct device *dev)
> return -EINVAL;
>
> if (dev->power.wakeup_path && genpd_is_active_wakeup(genpd))
> - return 0;
> + return pm_generic_resume_noirq(dev);
>
> genpd_lock(genpd);
> genpd_sync_power_on(genpd, true, 0);
> genpd->suspended_count--;
> genpd_unlock(genpd);
>
> - if (genpd->dev_ops.stop && genpd->dev_ops.start)
> + if (genpd->dev_ops.stop && genpd->dev_ops.start) {
> ret = pm_runtime_force_resume(dev);
> + if (ret)
> + return ret;
> + }
>
> - ret = pm_generic_resume_noirq(dev);
> - if (ret)
> - return ret;
> -
> - return ret;
> + return pm_generic_resume_noirq(dev);
> }
>
> /**
> --
Looks OK to me overall.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-01-11 0:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-10 20:31 [PATCH] PM / Domains: Don't skip driver's ->suspend|resume_noirq() callbacks Ulf Hansson
2018-01-11 0:54 ` Rafael J. Wysocki
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.