PM / Domains: Fix genpd to deal with drivers returning 1 from ->prepare()

During system-wide PM, genpd relies on its PM callbacks to be invoked for
all its attached devices, as to deal with powering off/on the PM domain. In
other words, genpd is not compatible with the direct_complete path, if
executed by the PM core for any of its attached devices.

However, when genpd's ->prepare() callback invokes pm_generic_prepare(), it
does not take into account that it may return 1. Instead it treats that as
an error internally and expects the PM core to abort the prepare phase and
roll back. This leads to genpd not properly powering on/off the PM domain,
because its internal counters gets wrongly balanced.

To fix the behaviour, allow drivers to return 1 from their ->prepare()
callbacks, but let's return 0 from genpd's ->prepare() callback in such
case, as that prevents the PM core from running the direct_complete path
for the device.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index b914e373a47886a8085499818d28a7ade36d4860..47fb71a8066ab1ed7cc719e5ca3e932454b00519 100644 (file)
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -1010,7 +1010,7 @@ static int genpd_prepare(struct device *dev)
        genpd_unlock(genpd);
 
        ret = pm_generic_prepare(dev);
-       if (ret) {
+       if (ret < 0) {
                genpd_lock(genpd);
 
                genpd->prepared_count--;
@@ -1018,7 +1018,8 @@ static int genpd_prepare(struct device *dev)
                genpd_unlock(genpd);
        }
 
-       return ret;
+       /* Never return 1, as genpd don't cope with the direct_complete path. */
+       return ret >= 0 ? 0 : ret;
 }
 
 /**