Patch "PM / domains: Don't skip driver's ->suspend|resume_noirq() callbacks" has been added to the 4.15-stable tree
Subsystems (5)
This is a note to let you know that I've just added the patch titled
PM / domains: Don't skip driver's ->suspend|resume_noirq() callbacks
to the 4.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
pm-domains-don-t-skip-driver-s-suspend-resume_noirq-callbacks.patch
and it can be found in the queue-4.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Mon Apr 9 10:16:32 CEST 2018
From: Ulf Hansson <[email protected]>
Date: Wed, 10 Jan 2018 21:31:56 +0100
Subject: PM / domains: Don't skip driver's ->suspend|resume_noirq() callbacks
From: Ulf Hansson <[email protected]>
[ Upstream commit a935424bb658f9ca37eb5e94119b857998341356 ]
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!
--- drivers/base/power/domain.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-)
drivers/base/power/domain.c +17 -13
@@ -1032,15 +1032,12 @@ static int genpd_prepare(struct device *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 dif (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 destatic 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 devreturn -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); }/**
Patches currently in stable-queue which might be from [email protected] are
queue-4.15/pm-domains-don-t-skip-driver-s-suspend-resume_noirq-callbacks.patch queue-4.15/sdhci-advertise-2.0v-supply-on-sdio-host-controller.patch