PM / Domains: Fix hibernation restore of devices, v2

During resume from hibernation pm_genpd_restore_noirq() should only
power off domains whose suspend_power_off flags are set once and
not every time it is called for a device in the given domain.
Moreover, it shouldn't decrement genpd->suspended_count, because
that field is not touched during device freezing and therefore it is
always equal to 0 when pm_genpd_restore_noirq() runs for the first
device in the given domain.

This means pm_genpd_restore_noirq() may use genpd->suspended_count
to determine whether or not it it has been called for the domain in
question already in this cycle (it only needs to increment that
field every time it runs for this purpose) and whether or not it
should check if the domain needs to be powered off.  For that to
work, though, pm_genpd_prepare() has to clear genpd->suspended_count
when it runs for the first device in the given domain (in which case
that flag need not be cleared during domain initialization).

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Cc: stable@vger.kernel.org

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index e79228c597f149b0fd83aafa9dba750348ed67b5..84f4beefa4f88f94698b16859425c558462120c7 100644 (file)
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -764,8 +764,10 @@ static int pm_genpd_prepare(struct device *dev)
 
        genpd_acquire_lock(genpd);
 
-       if (genpd->prepared_count++ == 0)
+       if (genpd->prepared_count++ == 0) {
+               genpd->suspended_count = 0;
                genpd->suspend_power_off = genpd->status == GPD_STATE_POWER_OFF;
+       }
 
        genpd_release_lock(genpd);
 
@@ -1097,20 +1099,30 @@ static int pm_genpd_restore_noirq(struct device *dev)
         * Since all of the "noirq" callbacks are executed sequentially, it is
         * guaranteed that this function will never run twice in parallel for
         * the same PM domain, so it is not necessary to use locking here.
+        *
+        * At this point suspended_count == 0 means we are being run for the
+        * first time for the given domain in the present cycle.
         */
-       genpd->status = GPD_STATE_POWER_OFF;
-       if (genpd->suspend_power_off) {
+       if (genpd->suspended_count++ == 0) {
                /*
-                * The boot kernel might put the domain into the power on state,
-                * so make sure it really is powered off.
+                * The boot kernel might put the domain into arbitrary state,
+                * so make it appear as powered off to pm_genpd_poweron(), so
+                * that it tries to power it on in case it was really off.
                 */
-               if (genpd->power_off)
-                       genpd->power_off(genpd);
-               return 0;
+               genpd->status = GPD_STATE_POWER_OFF;
+               if (genpd->suspend_power_off) {
+                       /*
+                        * If the domain was off before the hibernation, make
+                        * sure it will be off going forward.
+                        */
+                       if (genpd->power_off)
+                               genpd->power_off(genpd);
+
+                       return 0;
+               }
        }
 
        pm_genpd_poweron(genpd);
-       genpd->suspended_count--;
 
        return genpd_start_dev(genpd, dev);
 }
@@ -1649,7 +1661,6 @@ void pm_genpd_init(struct generic_pm_domain *genpd,
        genpd->poweroff_task = NULL;
        genpd->resume_count = 0;
        genpd->device_count = 0;
-       genpd->suspended_count = 0;
        genpd->max_off_time_ns = -1;
        genpd->domain.ops.runtime_suspend = pm_genpd_runtime_suspend;
        genpd->domain.ops.runtime_resume = pm_genpd_runtime_resume;