Merge tag 'pm-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull power management updates from Rafael Wysocki:

 - Implementation of opportunistic suspend (autosleep) and user space
   interface for manipulating wakeup sources.

 - Hibernate updates from Bojan Smojver and Minho Ban.

 - Updates of the runtime PM core and generic PM domains framework
   related to PM QoS.

 - Assorted fixes.

* tag 'pm-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (25 commits)
  epoll: Fix user space breakage related to EPOLLWAKEUP
  PM / Domains: Make it possible to add devices to inactive domains
  PM / Hibernate: Use get_gendisk to verify partition if resume_file is integer format
  PM / Domains: Fix computation of maximum domain off time
  PM / Domains: Fix link checking when add subdomain
  PM / Sleep: User space wakeup sources garbage collector Kconfig option
  PM / Sleep: Make the limit of user space wakeup sources configurable
  PM / Documentation: suspend-and-cpuhotplug.txt: Fix typo
  PM / Domains: Cache device stop and domain power off governor results, v3
  PM / Domains: Make device removal more straightforward
  PM / Sleep: Fix a mistake in a conditional in autosleep_store()
  epoll: Add a flag, EPOLLWAKEUP, to prevent suspend while epoll events are ready
  PM / QoS: Create device constraints objects on notifier registration
  PM / Runtime: Remove device fields related to suspend time, v2
  PM / Domains: Rework default domain power off governor function, v2
  PM / Domains: Rework default device stop governor function, v2
  PM / Sleep: Add user space interface for manipulating wakeup sources, v3
  PM / Sleep: Add "prevent autosleep time" statistics to wakeup sources
  PM / Sleep: Implement opportunistic sleep, v2
  PM / Sleep: Add wakeup_source_activate and wakeup_source_deactivate tracepoints
  ...

9 files changed, 463 insertions, 253 deletions

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 73ce9fbe9839..83aa694a8efe 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -11,6 +11,7 @@
 #include <linux/io.h>
 #include <linux/pm_runtime.h>
 #include <linux/pm_domain.h>
+#include <linux/pm_qos.h>
 #include <linux/slab.h>
 #include <linux/err.h>
 #include <linux/sched.h>
@@ -38,11 +39,13 @@
         ktime_t __start = ktime_get();                                          \
         type __retval = GENPD_DEV_CALLBACK(genpd, type, callback, dev);         \
         s64 __elapsed = ktime_to_ns(ktime_sub(ktime_get(), __start));           \
-        struct generic_pm_domain_data *__gpd_data = dev_gpd_data(dev);          \
-        if (__elapsed > __gpd_data->td.field) {                                 \
-                __gpd_data->td.field = __elapsed;                               \
+        struct gpd_timing_data *__td = &dev_gpd_data(dev)->td;                  \
+        if (!__retval && __elapsed > __td->field) {                             \
+                __td->field = __elapsed;                                        \
                 dev_warn(dev, name " latency exceeded, new value %lld ns\n",    \
                         __elapsed);                                             \
+                genpd->max_off_time_changed = true;                             \
+                __td->constraint_changed = true;                                \
         }                                                                       \
         __retval;                                                               \
 })
@@ -211,6 +214,7 @@ int __pm_genpd_poweron(struct generic_pm_domain *genpd)
                 elapsed_ns = ktime_to_ns(ktime_sub(ktime_get(), time_start));
                 if (elapsed_ns > genpd->power_on_latency_ns) {
                         genpd->power_on_latency_ns = elapsed_ns;
+                        genpd->max_off_time_changed = true;
                         if (genpd->name)
                                 pr_warning("%s: Power-on latency exceeded, "
                                         "new value %lld ns\n", genpd->name,
@@ -247,6 +251,53 @@ int pm_genpd_poweron(struct generic_pm_domain *genpd)
 
 #ifdef CONFIG_PM_RUNTIME
 
+static int genpd_dev_pm_qos_notifier(struct notifier_block *nb,
+                                     unsigned long val, void *ptr)
+{
+        struct generic_pm_domain_data *gpd_data;
+        struct device *dev;
+
+        gpd_data = container_of(nb, struct generic_pm_domain_data, nb);
+
+        mutex_lock(&gpd_data->lock);
+        dev = gpd_data->base.dev;
+        if (!dev) {
+                mutex_unlock(&gpd_data->lock);
+                return NOTIFY_DONE;
+        }
+        mutex_unlock(&gpd_data->lock);
+
+        for (;;) {
+                struct generic_pm_domain *genpd;
+                struct pm_domain_data *pdd;
+
+                spin_lock_irq(&dev->power.lock);
+
+                pdd = dev->power.subsys_data ?
+                                dev->power.subsys_data->domain_data : NULL;
+                if (pdd) {
+                        to_gpd_data(pdd)->td.constraint_changed = true;
+                        genpd = dev_to_genpd(dev);
+                } else {
+                        genpd = ERR_PTR(-ENODATA);
+                }
+
+                spin_unlock_irq(&dev->power.lock);
+
+                if (!IS_ERR(genpd)) {
+                        mutex_lock(&genpd->lock);
+                        genpd->max_off_time_changed = true;
+                        mutex_unlock(&genpd->lock);
+                }
+
+                dev = dev->parent;
+                if (!dev || dev->power.ignore_children)
+                        break;
+        }
+
+        return NOTIFY_DONE;
+}
+
 /**
  * __pm_genpd_save_device - Save the pre-suspend state of a device.
  * @pdd: Domain data of the device to save the state of.
@@ -435,6 +486,7 @@ static int pm_genpd_poweroff(struct generic_pm_domain *genpd)
                 elapsed_ns = ktime_to_ns(ktime_sub(ktime_get(), time_start));
                 if (elapsed_ns > genpd->power_off_latency_ns) {
                         genpd->power_off_latency_ns = elapsed_ns;
+                        genpd->max_off_time_changed = true;
                         if (genpd->name)
                                 pr_warning("%s: Power-off latency exceeded, "
                                         "new value %lld ns\n", genpd->name,
@@ -443,17 +495,6 @@ static int pm_genpd_poweroff(struct generic_pm_domain *genpd)
         }
 
         genpd->status = GPD_STATE_POWER_OFF;
-        genpd->power_off_time = ktime_get();
-
-        /* Update PM QoS information for devices in the domain. */
-        list_for_each_entry_reverse(pdd, &genpd->dev_list, list_node) {
-                struct gpd_timing_data *td = &to_gpd_data(pdd)->td;
-
-                pm_runtime_update_max_time_suspended(pdd->dev,
-                                        td->start_latency_ns +
-                                        td->restore_state_latency_ns +
-                                        genpd->power_on_latency_ns);
-        }
 
         list_for_each_entry(link, &genpd->slave_links, slave_node) {
                 genpd_sd_counter_dec(link->master);
@@ -514,9 +555,6 @@ static int pm_genpd_runtime_suspend(struct device *dev)
         if (ret)
                 return ret;
 
-        pm_runtime_update_max_time_suspended(dev,
-                                dev_gpd_data(dev)->td.start_latency_ns);
-
         /*
          * If power.irq_safe is set, this routine will be run with interrupts
          * off, so it can't use mutexes.
@@ -613,6 +651,12 @@ void pm_genpd_poweroff_unused(void)
 
 #else
 
+static inline int genpd_dev_pm_qos_notifier(struct notifier_block *nb,
+                                            unsigned long val, void *ptr)
+{
+        return NOTIFY_DONE;
+}
+
 static inline void genpd_power_off_work_fn(struct work_struct *work) {}
 
 #define pm_genpd_runtime_suspend        NULL
@@ -1209,12 +1253,15 @@ int __pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev,
         if (IS_ERR_OR_NULL(genpd) || IS_ERR_OR_NULL(dev))
                 return -EINVAL;
 
-        genpd_acquire_lock(genpd);
+