Merge branch 'pm-runtime' into pm-for-linus

* pm-runtime:
  PM / Tracing: build rpm-traces.c only if CONFIG_PM_RUNTIME is set
  PM / Runtime: Replace dev_dbg() with trace_rpm_*()
  PM / Runtime: Introduce trace points for tracing rpm_* functions
  PM / Runtime: Don't run callbacks under lock for power.irq_safe set
  USB: Add wakeup info to debugging messages
  PM / Runtime: pm_runtime_idle() can be called in atomic context
  PM / Runtime: Add macro to test for runtime PM events
  PM / Runtime: Add might_sleep() to runtime PM functions

1 files changed, 99 insertions, 0 deletions

diff --git a/include/trace/events/rpm.h b/include/trace/events/rpm.h
new file mode 100644
index 000000000000..d62c558bf64b
--- /dev/null
+++ b/include/trace/events/rpm.h
@@ -0,0 +1,99 @@
+
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM rpm
+
+#if !defined(_TRACE_RUNTIME_POWER_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_RUNTIME_POWER_H
+
+#include <linux/ktime.h>
+#include <linux/tracepoint.h>
+#include <linux/device.h>
+
+/*
+ * The rpm_internal events are used for tracing some important
+ * runtime pm internal functions.
+ */
+DECLARE_EVENT_CLASS(rpm_internal,
+
+        TP_PROTO(struct device *dev, int flags),
+
+        TP_ARGS(dev, flags),
+
+        TP_STRUCT__entry(
+                __string(       name,           dev_name(dev)   )
+                __field(        int,            flags           )
+                __field(        int ,           usage_count     )
+                __field(        int ,           disable_depth   )
+                __field(        int ,           runtime_auto    )
+                __field(        int ,           request_pending )
+                __field(        int ,           irq_safe        )
+                __field(        int ,           child_count     )
+        ),
+
+        TP_fast_assign(
+                __assign_str(name, dev_name(dev));
+                __entry->flags = flags;
+                __entry->usage_count = atomic_read(
+                        &dev->power.usage_count);
+                __entry->disable_depth = dev->power.disable_depth;
+                __entry->runtime_auto = dev->power.runtime_auto;
+                __entry->request_pending = dev->power.request_pending;
+                __entry->irq_safe = dev->power.irq_safe;
+                __entry->child_count = atomic_read(
+                        &dev->power.child_count);
+        ),
+
+        TP_printk("%s flags-%x cnt-%-2d dep-%-2d auto-%-1d p-%-1d"
+                        " irq-%-1d child-%d",
+                        __get_str(name), __entry->flags,
+                        __entry->usage_count,
+                        __entry->disable_depth,
+                        __entry->runtime_auto,
+                        __entry->request_pending,
+                        __entry->irq_safe,
+                        __entry->child_count
+                 )
+);
+DEFINE_EVENT(rpm_internal, rpm_suspend,
+
+        TP_PROTO(struct device *dev, int flags),
+
+        TP_ARGS(dev, flags)
+);
+DEFINE_EVENT(rpm_internal, rpm_resume,
+
+        TP_PROTO(struct device *dev, int flags),
+
+        TP_ARGS(dev, flags)
+);
+DEFINE_EVENT(rpm_internal, rpm_idle,
+
+        TP_PROTO(struct device *dev, int flags),
+
+        TP_ARGS(dev, flags)
+);
+
+TRACE_EVENT(rpm_return_int,
+        TP_PROTO(struct device *dev, unsigned long ip, int ret),
+        TP_ARGS(dev, ip, ret),
+
+        TP_STRUCT__entry(
+                __string(       name,           dev_name(dev))
+                __field(        unsigned long,          ip      )
+                __field(        int,                    ret     )
+        ),
+
+        TP_fast_assign(
+                __assign_str(name, dev_name(dev));
+                __entry->ip = ip;
+                __entry->ret = ret;
+        ),
+
+        TP_printk("%pS:%s ret=%d", (void *)__entry->ip, __get_str(name),
+                __entry->ret)
+);
+
+#endif /* _TRACE_RUNTIME_POWER_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>