3 files changed, 68 insertions, 28 deletions

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 45937f88e77c..2327613d4539 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -68,7 +68,36 @@ static struct generic_pm_domain *pm_genpd_lookup_name(const char *domain_name)
         return genpd;
 }
 
-struct generic_pm_domain *dev_to_genpd(struct device *dev)
+/*
+ * Get the generic PM domain for a particular struct device.
+ * This validates the struct device pointer, the PM domain pointer,
+ * and checks that the PM domain pointer is a real generic PM domain.
+ * Any failure results in NULL being returned.
+ */
+struct generic_pm_domain *pm_genpd_lookup_dev(struct device *dev)
+{
+        struct generic_pm_domain *genpd = NULL, *gpd;
+
+        if (IS_ERR_OR_NULL(dev) || IS_ERR_OR_NULL(dev->pm_domain))
+                return NULL;
+
+        mutex_lock(&gpd_list_lock);
+        list_for_each_entry(gpd, &gpd_list, gpd_list_node) {
+                if (&gpd->domain == dev->pm_domain) {
+                        genpd = gpd;
+                        break;
+                }
+        }
+        mutex_unlock(&gpd_list_lock);
+
+        return genpd;
+}
+
+/*
+ * This should only be used where we are certain that the pm_domain
+ * attached to the device is a genpd domain.
+ */
+static struct generic_pm_domain *dev_to_genpd(struct device *dev)
 {
         if (IS_ERR_OR_NULL(dev->pm_domain))
                 return ERR_PTR(-EINVAL);
@@ -173,8 +202,8 @@ static int genpd_power_on(struct generic_pm_domain *genpd)
         genpd->power_on_latency_ns = elapsed_ns;
         genpd->max_off_time_changed = true;
         genpd_recalc_cpu_exit_latency(genpd);
-        pr_warn("%s: Power-%s latency exceeded, new value %lld ns\n",
-                genpd->name, "on", elapsed_ns);
+        pr_debug("%s: Power-%s latency exceeded, new value %lld ns\n",
+                 genpd->name, "on", elapsed_ns);
 
         return ret;
 }
@@ -199,8 +228,8 @@ static int genpd_power_off(struct generic_pm_domain *genpd)
 
         genpd->power_off_latency_ns = elapsed_ns;
         genpd->max_off_time_changed = true;
-        pr_warn("%s: Power-%s latency exceeded, new value %lld ns\n",
-                genpd->name, "off", elapsed_ns);
+        pr_debug("%s: Power-%s latency exceeded, new value %lld ns\n",
+                 genpd->name, "off", elapsed_ns);
 
         return ret;
 }
@@ -1513,9 +1542,7 @@ int pm_genpd_remove_device(struct generic_pm_domain *genpd,
 
         dev_dbg(dev, "%s()\n", __func__);
 
-        if (IS_ERR_OR_NULL(genpd) || IS_ERR_OR_NULL(dev)
-            ||  IS_ERR_OR_NULL(dev->pm_domain)
-            ||  pd_to_genpd(dev->pm_domain) != genpd)
+        if (!genpd || genpd != pm_genpd_lookup_dev(dev))
                 return -EINVAL;
 
         /* The above validation also means we have existing domain_data. */
@@ -2093,21 +2120,10 @@ EXPORT_SYMBOL_GPL(of_genpd_get_from_provider);
  */
 static void genpd_dev_pm_detach(struct device *dev, bool power_off)
 {
-        struct generic_pm_domain *pd = NULL, *gpd;
+        struct generic_pm_domain *pd;
         int ret = 0;
 
-        if (!dev->pm_domain)
-                return;
-
-        mutex_lock(&gpd_list_lock);
-        list_for_each_entry(gpd, &gpd_list, gpd_list_node) {
-                if (&gpd->domain == dev->pm_domain) {
-                        pd = gpd;
-                        break;
-                }
-        }
-        mutex_unlock(&gpd_list_lock);
-
+        pd = pm_genpd_lookup_dev(dev);
         if (!pd)
                 return;
 
@@ -2130,6 +2146,17 @@ static void genpd_dev_pm_detach(struct device *dev, bool power_off)
         genpd_queue_power_off_work(pd);
 }
 
+static void genpd_dev_pm_sync(struct device *dev)
+{
+        struct generic_pm_domain *pd;
+
+        pd = dev_to_genpd(dev);
+        if (IS_ERR(pd))
+                return;
+
+        genpd_queue_power_off_work(pd);
+}
+
 /**
  * genpd_dev_pm_attach - Attach a device to its PM domain using DT.
  * @dev: Device to attach.
@@ -2196,6 +2223,7 @@ int genpd_dev_pm_attach(struct device *dev)
         }
 
         dev->pm_domain->detach = genpd_dev_pm_detach;
+        dev->pm_domain->sync = genpd_dev_pm_sync;
         pm_genpd_poweron(pd);
 
         return 0;
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 9717d5f20139..3d874eca7104 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -23,7 +23,7 @@
 #include <linux/mutex.h>
 #include <linux/pm.h>
 #include <linux/pm_runtime.h>
-#include <linux/resume-trace.h>
+#include <linux/pm-trace.h>
 #include <linux/interrupt.h>
 #include <linux/sched.h>
 #include <linux/async.h>
@@ -1017,6 +1017,9 @@ static int __device_suspend_noirq(struct device *dev, pm_message_t state, bool a
         char *info = NULL;
         int error = 0;
 
+        TRACE_DEVICE(dev);
+        TRACE_SUSPEND(0);
+
         if (async_error)
                 goto Complete;
 
@@ -1057,6 +1060,7 @@ static int __device_suspend_noirq(struct device *dev, pm_message_t state, bool a
 
 Complete:
         complete_all(&dev->power.completion);
+        TRACE_SUSPEND(error);
         return error;
 }
 
@@ -1078,7 +1082,7 @@ static int device_suspend_noirq(struct device *dev)
 {
         reinit_completion(&dev->power.completion);
 
-        if (pm_async_enabled && dev->power.async_suspend) {
+        if (is_async(dev)) {
                 get_device(dev);
                 async_schedule(async_suspend_noirq, dev);
                 return 0;
@@ -1157,6 +1161,9 @@ static int __device_suspend_late(struct device *dev, pm_message_t state, bool as
         char *info = NULL;
         int error = 0;
 
+        TRACE_DEVICE(dev);
+        TRACE_SUSPEND(0);
+
         __pm_runtime_disable(dev, false);
 
         if (async_error)
@@ -1198,6 +1205,7 @@ static int __device_suspend_late(struct device *dev, pm_message_t state, bool as
                 async_error = error;
 
 Complete:
+        TRACE_SUSPEND(error);
         complete_all(&dev->power.completion);
         return error;
 }
@@ -1219,7 +1227,7 @@ static int device_suspend_late(struct device *dev)
 {
         reinit_completion(&dev->power.completion);
 
-        if (pm_async_enabled && dev->power.async_suspend) {
+        if (is_async(dev)) {
                 get_device(dev);
                 async_schedule(async_suspend_late, dev);
                 return 0;
@@ -1338,6 +1346,9 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
         int error = 0;
         DECLARE_DPM_WATCHDOG_ON_STACK(wd);
 
+        TRACE_DEVICE(dev);
+        TRACE_SUSPEND(0);
+
         dpm_wait_for_children(dev, async);
 
         if (async_error)
@@ -1444,6 +1455,7 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
         if (error)
                 async_error = error;
 
+        TRACE_SUSPEND(error);
         return error;
 }
 
@@ -1465,7 +1477,7 @@ static int device_suspend(struct device *dev)
 {
         reinit_completion(&dev->power.completion);
 
-        if (pm_async_enabled && dev->power.async_suspend) {
+        if (is_async(dev)) {
                 get_device(dev);
                 async_schedule(async_suspend, dev);
                 return 0;
diff --git a/drivers/base/power/trace.c b/drivers/base/power/trace.c
index d94a1f5121cf..a311cfa4c5bd 100644
--- a/drivers/base/power/trace.c
+++ b/drivers/base/power/trace.c
@@ -7,7 +7,7 @@
  * devices may be working.
  */
 
-#include <linux/resume-trace.h>
+#include <linux/pm-trace.h>
 #include <linux/export.h>
 #include <linux/rtc.h>
 
@@ -154,7 +154,7 @@ EXPORT_SYMBOL(set_trace_device);
  * it's not any guarantee, but it's a high _likelihood_ that
  * the match is valid).
  */
-void generate_resume_trace(const void *tracedata, unsigned int user)
+void generate_pm_trace(const void *tracedata, unsigned int user)
 {
         unsigned short lineno = *(unsigned short *)tracedata;
         const char *file = *(const char **)(tracedata + 2);
@@ -164,7 +164,7 @@ void generate_resume_trace(const void *tracedata, unsigned int user)
         file_hash_value = hash_string(lineno, file, FILEHASH);
         set_magic_time(user_hash_value, file_hash_value, dev_hash_value);
 }
-EXPORT_SYMBOL(generate_resume_trace);
+EXPORT_SYMBOL(generate_pm_trace);
 
 extern char __tracedata_start, __tracedata_end;
 static int show_file_hash(unsigned int value)