Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-26 22:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

PM / domains: Don't skip driver's ->suspend|resume_noirq() callbacks

Browse Source 
Commit 10da65423f (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: 10da65423f (PM / Domains: Call driver's noirq callbacks)
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Ulf Hansson 2018-01-10 21:31:56 +01:00 committed by Rafael J. Wysocki
parent 001d50c9a1
commit a935424bb6
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/base/power/domain.c
View File

@ -1032,15 +1032,12 @@ static int genpd_prepare(struct device *dev)
static int genpd_finish_suspend(struct device *dev, bool poweroff) static int genpd_finish_suspend(struct device *dev, bool poweroff)
{ {
struct generic_pm_domain *genpd; struct generic_pm_domain *genpd;
int ret; int ret = 0;
genpd = dev_to_genpd(dev); genpd = dev_to_genpd(dev);
if (IS_ERR(genpd)) if (IS_ERR(genpd))
return -EINVAL; return -EINVAL;
if (dev->power.wakeup_path && genpd_is_active_wakeup(genpd))
return 0;
if (poweroff) if (poweroff)
ret = pm_generic_poweroff_noirq(dev); ret = pm_generic_poweroff_noirq(dev);
else else
@ -1048,10 +1045,18 @@ static int genpd_finish_suspend(struct device *dev, bool poweroff)
if (ret) if (ret)
return ret; return ret;
if (dev->power.wakeup_path && genpd_is_active_wakeup(genpd))
return 0;
if (genpd->dev_ops.stop && genpd->dev_ops.start) { if (genpd->dev_ops.stop && genpd->dev_ops.start) {
ret = pm_runtime_force_suspend(dev); 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; return ret;
}
} }
genpd_lock(genpd); genpd_lock(genpd);
@ -1085,7 +1090,7 @@ static int genpd_suspend_noirq(struct device *dev)
static int genpd_resume_noirq(struct device *dev) static int genpd_resume_noirq(struct device *dev)
{ {
struct generic_pm_domain *genpd; struct generic_pm_domain *genpd;
int ret = 0; int ret;
dev_dbg(dev, "%s()\n", __func__); dev_dbg(dev, "%s()\n", __func__);
@ -1094,21 +1099,20 @@ static int genpd_resume_noirq(struct device *dev)
return -EINVAL; return -EINVAL;
if (dev->power.wakeup_path && genpd_is_active_wakeup(genpd)) if (dev->power.wakeup_path && genpd_is_active_wakeup(genpd))
return 0; return pm_generic_resume_noirq(dev);
genpd_lock(genpd); genpd_lock(genpd);
genpd_sync_power_on(genpd, true, 0); genpd_sync_power_on(genpd, true, 0);
genpd->suspended_count--; genpd->suspended_count--;
genpd_unlock(genpd); 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); ret = pm_runtime_force_resume(dev);
if (ret)
return ret;
}
ret = pm_generic_resume_noirq(dev); return pm_generic_resume_noirq(dev);
if (ret)
return ret;
return ret;
} }
/** /**