3 files changed, 174 insertions, 2 deletions

diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
index 7d7e09efff9b..6fa7cea25da9 100644
--- a/include/linux/pm_runtime.h
+++ b/include/linux/pm_runtime.h
@@ -37,7 +37,6 @@ extern void pm_runtime_enable(struct device *dev);
 extern void __pm_runtime_disable(struct device *dev, bool check_resume);
 extern void pm_runtime_allow(struct device *dev);
 extern void pm_runtime_forbid(struct device *dev);
-extern int pm_generic_runtime_idle(struct device *dev);
 extern int pm_generic_runtime_suspend(struct device *dev);
 extern int pm_generic_runtime_resume(struct device *dev);
 extern void pm_runtime_no_callbacks(struct device *dev);
@@ -143,7 +142,6 @@ static inline bool pm_runtime_active(struct device *dev) { return true; }
 static inline bool pm_runtime_status_suspended(struct device *dev) { return false; }
 static inline bool pm_runtime_enabled(struct device *dev) { return false; }
 
-static inline int pm_generic_runtime_idle(struct device *dev) { return 0; }
 static inline int pm_generic_runtime_suspend(struct device *dev) { return 0; }
 static inline int pm_generic_runtime_resume(struct device *dev) { return 0; }
 static inline void pm_runtime_no_callbacks(struct device *dev) {}
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index d4e3f16d5e89..f73cabf59012 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -363,6 +363,7 @@ extern bool pm_wakeup_pending(void);
 extern bool pm_get_wakeup_count(unsigned int *count, bool block);
 extern bool pm_save_wakeup_count(unsigned int count);
 extern void pm_wakep_autosleep_enabled(bool set);
+extern void pm_print_active_wakeup_sources(void);
 
 static inline void lock_system_sleep(void)
 {
diff --git a/include/trace/events/power.h b/include/trace/events/power.h
index 427acab5d69a..8e42410bd159 100644
--- a/include/trace/events/power.h
+++ b/include/trace/events/power.h
@@ -5,6 +5,7 @@
 #define _TRACE_POWER_H
 
 #include <linux/ktime.h>
+#include <linux/pm_qos.h>
 #include <linux/tracepoint.h>
 
 DECLARE_EVENT_CLASS(cpu,
@@ -177,6 +178,178 @@ DEFINE_EVENT(power_domain, power_domain_target,
 
         TP_ARGS(name, state, cpu_id)
 );
+
+/*
+ * The pm qos events are used for pm qos update
+ */
+DECLARE_EVENT_CLASS(pm_qos_request,
+
+        TP_PROTO(int pm_qos_class, s32 value),
+
+        TP_ARGS(pm_qos_class, value),
+
+        TP_STRUCT__entry(
+                __field( int,                    pm_qos_class   )
+                __field( s32,                    value          )
+        ),
+
+        TP_fast_assign(
+                __entry->pm_qos_class = pm_qos_class;
+                __entry->value = value;
+        ),
+
+        TP_printk("pm_qos_class=%s value=%d",
+                  __print_symbolic(__entry->pm_qos_class,
+                        { PM_QOS_CPU_DMA_LATENCY,       "CPU_DMA_LATENCY" },
+                        { PM_QOS_NETWORK_LATENCY,       "NETWORK_LATENCY" },
+                        { PM_QOS_NETWORK_THROUGHPUT,    "NETWORK_THROUGHPUT" }),
+                  __entry->value)
+);
+
+DEFINE_EVENT(pm_qos_request, pm_qos_add_request,
+
+        TP_PROTO(int pm_qos_class, s32 value),
+
+        TP_ARGS(pm_qos_class, value)
+);
+
+DEFINE_EVENT(pm_qos_request, pm_qos_update_request,
+
+        TP_PROTO(int pm_qos_class, s32 value),
+
+        TP_ARGS(pm_qos_class, value)
+);
+
+DEFINE_EVENT(pm_qos_request, pm_qos_remove_request,
+
+        TP_PROTO(int pm_qos_class, s32 value),
+
+        TP_ARGS(pm_qos_class, value)
+);
+
+TRACE_EVENT(pm_qos_update_request_timeout,
+
+        TP_PROTO(int pm_qos_class, s32 value, unsigned long timeout_us),
+
+        TP_ARGS(pm_qos_class, value, timeout_us),
+
+        TP_STRUCT__entry(
+                __field( int,                    pm_qos_class   )
+                __field( s32,                    value          )
+                __field( unsigned long,          timeout_us     )
+        ),
+
+        TP_fast_assign(
+                __entry->pm_qos_class = pm_qos_class;
+                __entry->value = value;
+                __entry->timeout_us = timeout_us;
+        ),
+
+        TP_printk("pm_qos_class=%s value=%d, timeout_us=%ld",
+                  __print_symbolic(__entry->pm_qos_class,
+                        { PM_QOS_CPU_DMA_LATENCY,       "CPU_DMA_LATENCY" },
+                        { PM_QOS_NETWORK_LATENCY,       "NETWORK_LATENCY" },
+                        { PM_QOS_NETWORK_THROUGHPUT,    "NETWORK_THROUGHPUT" }),
+                  __entry->value, __entry->timeout_us)
+);
+
+DECLARE_EVENT_CLASS(pm_qos_update,
+
+        TP_PROTO(enum pm_qos_req_action action, int prev_value, int curr_value),
+
+        TP_ARGS(action, prev_value, curr_value),
+
+        TP_STRUCT__entry(
+                __field( enum pm_qos_req_action, action         )
+                __field( int,                    prev_value     )
+                __field( int,                    curr_value     )
+        ),
+
+        TP_fast_assign(
+                __entry->action = action;
+                __entry->prev_value = prev_value;
+                __entry->curr_value = curr_value;
+        ),
+
+        TP_printk("action=%s prev_value=%d curr_value=%d",
+                  __print_symbolic(__entry->action,
+                        { PM_QOS_ADD_REQ,       "ADD_REQ" },
+                        { PM_QOS_UPDATE_REQ,    "UPDATE_REQ" },
+                        { PM_QOS_REMOVE_REQ,    "REMOVE_REQ" }),
+                  __entry->prev_value, __entry->curr_value)
+);
+
+DEFINE_EVENT(pm_qos_update, pm_qos_update_target,
+
+        TP_PROTO(enum pm_qos_req_action action, int prev_value, int curr_value),
+
+        TP_ARGS(action, prev_value, curr_value)
+);
+
+DEFINE_EVENT_PRINT(pm_qos_update, pm_qos_update_flags,
+
+        TP_PROTO(enum pm_qos_req_action action, int prev_value, int curr_value),
+
+        TP_ARGS(action, prev_value, curr_value),
+
+        TP_printk("action=%s prev_value=0x%x curr_value=0x%x",
+                  __print_symbolic(__entry->action,
+                        { PM_QOS_ADD_REQ,       "ADD_REQ" },
+                        { PM_QOS_UPDATE_REQ,    "UPDATE_REQ" },
+                        { PM_QOS_REMOVE_REQ,    "REMOVE_REQ" }),
+                  __entry->prev_value, __entry->curr_value)
+);
+
+DECLARE_EVENT_CLASS(dev_pm_qos_request,
+
+        TP_PROTO(const char *name, enum dev_pm_qos_req_type type,
+                 s32 new_value),
+
+        TP_ARGS(name, type, new_value),
+
+        TP_STRUCT__entry(
+                __string( name,                    name         )
+                __field( enum dev_pm_qos_req_type, type         )
+                __field( s32,                      new_value    )
+        ),
+
+        TP_fast_assign(
+                __assign_str(name, name);
+                __entry->type = type;
+                __entry->new_value = new_value;
+        ),
+
+        TP_printk("device=%s type=%s new_value=%d",
+                  __get_str(name),
+                  __print_symbolic(__entry->type,
+                        { DEV_PM_QOS_LATENCY,   "DEV_PM_QOS_LATENCY" },
+                        { DEV_PM_QOS_FLAGS,     "DEV_PM_QOS_FLAGS" }),
+                  __entry->new_value)
+);
+
+DEFINE_EVENT(dev_pm_qos_request, dev_pm_qos_add_request,
+
+        TP_PROTO(const char *name, enum dev_pm_qos_req_type type,
+                 s32 new_value),
+
+        TP_ARGS(name, type, new_value)
+);
+
+DEFINE_EVENT(dev_pm_qos_request, dev_pm_qos_update_request,
+
+        TP_PROTO(const char *name, enum dev_pm_qos_req_type type,
+                 s32 new_value),
+
+        TP_ARGS(name, type, new_value)
+);
+
+DEFINE_EVENT(dev_pm_qos_request, dev_pm_qos_remove_request,
+
+        TP_PROTO(const char *name, enum dev_pm_qos_req_type type,
+                 s32 new_value),
+
+        TP_ARGS(name, type, new_value)
+);
 #endif /* _TRACE_POWER_H */
 
 /* This part must be outside protection */