UPSTREAM: PM / Domains: Allow runtime PM during system PM phases

[firefly-linux-kernel-4.4.55.git] / drivers / base / power / domain.c

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 1238d24dda6dbb42b38fc20c1358786b0ec8a62d..e6c2a128401914a56ccd67a16b26f3c638f84890 100644 (file)
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -697,21 +697,6 @@ static int pm_genpd_prepare(struct device *dev)
 
        mutex_unlock(&genpd->lock);
 
-       /*
-        * Even if the PM domain is powered off at this point, we can't expect
-        * it to remain in that state during the entire system PM suspend
-        * phase. Any subsystem/driver for a device in the PM domain, may still
-        * need to serve a request which may require the device to be runtime
-        * resumed and its PM domain to be powered.
-        *
-        * As we are disabling runtime PM at this point, we are preventing the
-        * subsystem/driver to decide themselves. For that reason, we need to
-        * make sure the device is operational as it may be required in some
-        * cases.
-        */
-       pm_runtime_resume(dev);
-       __pm_runtime_disable(dev, false);
-
        ret = pm_generic_prepare(dev);
        if (ret) {
                mutex_lock(&genpd->lock);
@@ -719,7 +704,6 @@ static int pm_genpd_prepare(struct device *dev)
                genpd->prepared_count--;
 
                mutex_unlock(&genpd->lock);
-               pm_runtime_enable(dev);
        }
 
        return ret;
@@ -745,8 +729,6 @@ static int pm_genpd_suspend_noirq(struct device *dev)
        if (dev->power.wakeup_path && genpd_dev_active_wakeup(genpd, dev))
                return 0;
 
-       genpd_stop_dev(genpd, dev);
-
        /*
         * Since all of the "noirq" callbacks are executed sequentially, it is
         * guaranteed that this function will never run twice in parallel for
@@ -785,7 +767,7 @@ static int pm_genpd_resume_noirq(struct device *dev)
        pm_genpd_sync_poweron(genpd, true);
        genpd->suspended_count--;
 
-       return genpd_start_dev(genpd, dev);
+       return 0;
 }
 
 /**
@@ -807,7 +789,7 @@ static int pm_genpd_freeze_noirq(struct device *dev)
        if (IS_ERR(genpd))
                return -EINVAL;
 
-       return genpd_stop_dev(genpd, dev);
+       return 0;
 }
 
 /**
@@ -827,7 +809,7 @@ static int pm_genpd_thaw_noirq(struct device *dev)
        if (IS_ERR(genpd))
                return -EINVAL;
 
-       return genpd_start_dev(genpd, dev);
+       return 0;
 }
 
 /**
@@ -865,7 +847,7 @@ static int pm_genpd_restore_noirq(struct device *dev)
 
        pm_genpd_sync_poweron(genpd, true);
 
-       return genpd_start_dev(genpd, dev);
+       return 0;
 }
 
 /**
@@ -887,15 +869,15 @@ static void pm_genpd_complete(struct device *dev)
        if (IS_ERR(genpd))
                return;
 
+       pm_generic_complete(dev);
+
        mutex_lock(&genpd->lock);
 
        genpd->prepared_count--;
+       if (!genpd->prepared_count)
+               genpd_queue_power_off_work(genpd);
 
        mutex_unlock(&genpd->lock);
-
-       pm_generic_complete(dev);
-       pm_runtime_set_active(dev);
-       pm_runtime_enable(dev);
 }
 
 /**