1 files changed, 57 insertions, 10 deletions

diff --git a/include/linux/pm.h b/include/linux/pm.h
index 3b7e04b95bd2..8e258c727971 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -26,6 +26,7 @@
 #include <linux/spinlock.h>
 #include <linux/wait.h>
 #include <linux/timer.h>
+#include <linux/completion.h>
 
 /*
  * Callbacks for platform drivers to implement.
@@ -178,9 +179,10 @@ typedef struct pm_message {
  *      This need not mean that the device should be put into a low power state.
  *      For example, if the device is behind a link which is about to be turned
  *      off, the device may remain at full power.  If the device does go to low
- *      power and if device_may_wakeup(dev) is true, remote wake-up (i.e., a
- *      hardware mechanism allowing the device to request a change of its power
- *      state, such as PCI PME) should be enabled for it.
+ *      power and is capable of generating run-time wake-up events, remote
+ *      wake-up (i.e., a hardware mechanism allowing the device to request a
+ *      change of its power state via a wake-up event, such as PCI PME) should
+ *      be enabled for it.
  *
  * @runtime_resume: Put the device into the fully active state in response to a
  *      wake-up event generated by hardware or at the request of software.  If
@@ -213,20 +215,59 @@ struct dev_pm_ops {
         int (*runtime_idle)(struct device *dev);
 };
 
-/*
- * Use this if you want to use the same suspend and resume callbacks for suspend
- * to RAM and hibernation.
- */
-#define SIMPLE_DEV_PM_OPS(name, suspend_fn, resume_fn) \
-struct dev_pm_ops name = { \
+#ifdef CONFIG_PM_SLEEP
+#define SET_SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn) \
         .suspend = suspend_fn, \
         .resume = resume_fn, \
         .freeze = suspend_fn, \
         .thaw = resume_fn, \
         .poweroff = suspend_fn, \
-        .restore = resume_fn, \
+        .restore = resume_fn,
+#else
+#define SET_SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn)
+#endif
+
+#ifdef CONFIG_PM_RUNTIME
+#define SET_RUNTIME_PM_OPS(suspend_fn, resume_fn, idle_fn) \
+        .runtime_suspend = suspend_fn, \
+        .runtime_resume = resume_fn, \
+        .runtime_idle = idle_fn,
+#else
+#define SET_RUNTIME_PM_OPS(suspend_fn, resume_fn, idle_fn)
+#endif
+
+/*
+ * Use this if you want to use the same suspend and resume callbacks for suspend
+ * to RAM and hibernation.
+ */
+#define SIMPLE_DEV_PM_OPS(name, suspend_fn, resume_fn) \
+const struct dev_pm_ops name = { \
+        SET_SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn) \
+}
+
+/*
+ * Use this for defining a set of PM operations to be used in all situations
+ * (sustem suspend, hibernation or runtime PM).
+ */
+#define UNIVERSAL_DEV_PM_OPS(name, suspend_fn, resume_fn, idle_fn) \
+const struct dev_pm_ops name = { \
+        SET_SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn) \
+        SET_RUNTIME_PM_OPS(suspend_fn, resume_fn, idle_fn) \
 }
 
+/*
+ * Use this for subsystems (bus types, device types, device classes) that don't
+ * need any special suspend/resume handling in addition to invoking the PM
+ * callbacks provided by device drivers supporting both the system sleep PM and
+ * runtime PM, make the pm member point to generic_subsys_pm_ops.
+ */
+#ifdef CONFIG_PM_OPS
+extern struct dev_pm_ops generic_subsys_pm_ops;
+#define GENERIC_SUBSYS_PM_OPS   (&generic_subsys_pm_ops)
+#else
+#define GENERIC_SUBSYS_PM_OPS   NULL
+#endif
+
 /**
  * PM_EVENT_ messages
  *
@@ -411,9 +452,11 @@ struct dev_pm_info {
         pm_message_t            power_state;
         unsigned int            can_wakeup:1;
         unsigned int            should_wakeup:1;
+        unsigned                async_suspend:1;
         enum dpm_state          status;         /* Owned by the PM core */
 #ifdef CONFIG_PM_SLEEP
         struct list_head        entry;
+        struct completion       completion;
 #endif
 #ifdef CONFIG_PM_RUNTIME
         struct timer_list       suspend_timer;
@@ -428,6 +471,8 @@ struct dev_pm_info {
         unsigned int            idle_notification:1;
         unsigned int            request_pending:1;
         unsigned int            deferred_resume:1;
+        unsigned int            run_wake:1;
+        unsigned int            runtime_auto:1;
         enum rpm_request        request;
         enum rpm_status         runtime_status;
         int                     runtime_error;
@@ -506,6 +551,7 @@ extern void __suspend_report_result(const char *function, void *fn, int ret);
                 __suspend_report_result(__func__, fn, ret);             \
         } while (0)
 
+extern void device_pm_wait_for_dev(struct device *sub, struct device *dev);
 #else /* !CONFIG_PM_SLEEP */
 
 #define device_pm_lock() do {} while (0)
@@ -518,6 +564,7 @@ static inline int dpm_suspend_start(pm_message_t state)
 
 #define suspend_report_result(fn, ret)          do {} while (0)
 
+static inline void device_pm_wait_for_dev(struct device *a, struct device *b) {}
 #endif /* !CONFIG_PM_SLEEP */
 
 /* How to reorder dpm_list after device_move() */