1 files changed, 49 insertions, 17 deletions

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index b0b072a88f5f..a3c1404c7933 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -57,20 +57,17 @@ static pm_message_t pm_transition;
 static int async_error;
 
 /**
- * device_pm_init - Initialize the PM-related part of a device object.
+ * device_pm_sleep_init - Initialize system suspend-related device fields.
  * @dev: Device object being initialized.
  */
-void device_pm_init(struct device *dev)
+void device_pm_sleep_init(struct device *dev)
 {
         dev->power.is_prepared = false;
         dev->power.is_suspended = false;
         init_completion(&dev->power.completion);
         complete_all(&dev->power.completion);
         dev->power.wakeup = NULL;
-        spin_lock_init(&dev->power.lock);
-        pm_runtime_init(dev);
         INIT_LIST_HEAD(&dev->power.entry);
-        dev->power.power_state = PMSG_INVALID;
 }
 
 /**
@@ -408,6 +405,9 @@ static int device_resume_noirq(struct device *dev, pm_message_t state)
         TRACE_DEVICE(dev);
         TRACE_RESUME(0);
 
+        if (dev->power.syscore)
+                goto Out;
+
         if (dev->pm_domain) {
                 info = "noirq power domain ";
                 callback = pm_noirq_op(&dev->pm_domain->ops, state);
@@ -429,6 +429,7 @@ static int device_resume_noirq(struct device *dev, pm_message_t state)
 
         error = dpm_run_callback(callback, dev, state, info);
 
+ Out:
         TRACE_RESUME(error);
         return error;
 }
@@ -486,6 +487,9 @@ static int device_resume_early(struct device *dev, pm_message_t state)
         TRACE_DEVICE(dev);
         TRACE_RESUME(0);
 
+        if (dev->power.syscore)
+                goto Out;
+
         if (dev->pm_domain) {
                 info = "early power domain ";
                 callback = pm_late_early_op(&dev->pm_domain->ops, state);
@@ -507,6 +511,7 @@ static int device_resume_early(struct device *dev, pm_message_t state)
 
         error = dpm_run_callback(callback, dev, state, info);
 
+ Out:
         TRACE_RESUME(error);
         return error;
 }
@@ -565,11 +570,13 @@ static int device_resume(struct device *dev, pm_message_t state, bool async)
         pm_callback_t callback = NULL;
         char *info = NULL;
         int error = 0;
-        bool put = false;
 
         TRACE_DEVICE(dev);
         TRACE_RESUME(0);
 
+        if (dev->power.syscore)
+                goto Complete;
+
         dpm_wait(dev->parent, async);
         device_lock(dev);
 
@@ -583,7 +590,6 @@ static int device_resume(struct device *dev, pm_message_t state, bool async)
                 goto Unlock;
 
         pm_runtime_enable(dev);
-        put = true;
 
         if (dev->pm_domain) {
                 info = "power domain ";
@@ -632,13 +638,12 @@ static int device_resume(struct device *dev, pm_message_t state, bool async)
 
  Unlock:
         device_unlock(dev);
+
+ Complete:
         complete_all(&dev->power.completion);
 
         TRACE_RESUME(error);
 
-        if (put)
-                pm_runtime_put_sync(dev);
-
         return error;
 }
 
@@ -722,6 +727,9 @@ static void device_complete(struct device *dev, pm_message_t state)
         void (*callback)(struct device *) = NULL;
         char *info = NULL;
 
+        if (dev->power.syscore)
+                return;
+
         device_lock(dev);
 
         if (dev->pm_domain) {
@@ -749,6 +757,8 @@ static void device_complete(struct device *dev, pm_message_t state)
         }
 
         device_unlock(dev);
+
+        pm_runtime_put_sync(dev);
 }
 
 /**
@@ -834,6 +844,9 @@ static int device_suspend_noirq(struct device *dev, pm_message_t state)
         pm_callback_t callback = NULL;
         char *info = NULL;
 
+        if (dev->power.syscore)
+                return 0;
+
         if (dev->pm_domain) {
                 info = "noirq power domain ";
                 callback = pm_noirq_op(&dev->pm_domain->ops, state);
@@ -917,6 +930,9 @@ static int device_suspend_late(struct device *dev, pm_message_t state)
         pm_callback_t callback = NULL;
         char *info = NULL;
 
+        if (dev->power.syscore)
+                return 0;
+
         if (dev->pm_domain) {
                 info = "late power domain ";
                 callback = pm_late_early_op(&dev->pm_domain->ops, state);
@@ -996,7 +1012,7 @@ int dpm_suspend_end(pm_message_t state)
 
         error = dpm_suspend_noirq(state);
         if (error) {
-                dpm_resume_early(state);
+                dpm_resume_early(resume_event(state));
                 return error;
         }
 
@@ -1043,16 +1059,23 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
         if (async_error)
                 goto Complete;
 
-        pm_runtime_get_noresume(dev);
+        /*
+         * If a device configured to wake up the system from sleep states
+         * has been suspended at run time and there's a resume request pending
+         * for it, this is equivalent to the device signaling wakeup, so the
+         * system suspend operation should be aborted.
+         */
         if (pm_runtime_barrier(dev) && device_may_wakeup(dev))
                 pm_wakeup_event(dev, 0);
 
         if (pm_wakeup_pending()) {
-                pm_runtime_put_sync(dev);
                 async_error = -EBUSY;
                 goto Complete;
         }
 
+        if (dev->power.syscore)
+                goto Complete;
+
         device_lock(dev);
 
         if (dev->pm_domain) {
@@ -1111,12 +1134,10 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
  Complete:
         complete_all(&dev->power.completion);
 
-        if (error) {
-                pm_runtime_put_sync(dev);
+        if (error)
                 async_error = error;
-        } else if (dev->power.is_suspended) {
+        else if (dev->power.is_suspended)
                 __pm_runtime_disable(dev, false);
-        }
 
         return error;
 }
@@ -1209,6 +1230,17 @@ static int device_prepare(struct device *dev, pm_message_t state)
         char *info = NULL;
         int error = 0;
 
+        if (dev->power.syscore)
+                return 0;
+
+        /*
+         * If a device's parent goes into runtime suspend at the wrong time,
+         * it won't be possible to resume the device.  To prevent this we
+         * block runtime suspend here, during the prepare phase, and allow
+         * it again during the complete phase.
+         */
+        pm_runtime_get_noresume(dev);
+
         device_lock(dev);
 
         dev->power.wakeup_path = device_may_wakeup(dev);