1 files changed, 109 insertions, 85 deletions

diff --git a/kernel/trace/trace_power.c b/kernel/trace/trace_power.c
index 7bda248daf55..bae791ebcc51 100644
--- a/kernel/trace/trace_power.c
+++ b/kernel/trace/trace_power.c
@@ -11,15 +11,113 @@
 
 #include <linux/init.h>
 #include <linux/debugfs.h>
-#include <linux/ftrace.h>
+#include <trace/power.h>
 #include <linux/kallsyms.h>
 #include <linux/module.h>
 
 #include "trace.h"
+#include "trace_output.h"
 
 static struct trace_array *power_trace;
 static int __read_mostly trace_power_enabled;
 
+static void probe_power_start(struct power_trace *it, unsigned int type,
+                                unsigned int level)
+{
+        if (!trace_power_enabled)
+                return;
+
+        memset(it, 0, sizeof(struct power_trace));
+        it->state = level;
+        it->type = type;
+        it->stamp = ktime_get();
+}
+
+
+static void probe_power_end(struct power_trace *it)
+{
+        struct ring_buffer_event *event;
+        struct trace_power *entry;
+        struct trace_array_cpu *data;
+        struct trace_array *tr = power_trace;
+
+        if (!trace_power_enabled)
+                return;
+
+        preempt_disable();
+        it->end = ktime_get();
+        data = tr->data[smp_processor_id()];
+
+        event = trace_buffer_lock_reserve(tr, TRACE_POWER,
+                                          sizeof(*entry), 0, 0);
+        if (!event)
+                goto out;
+        entry   = ring_buffer_event_data(event);
+        entry->state_data = *it;
+        trace_buffer_unlock_commit(tr, event, 0, 0);
+ out:
+        preempt_enable();
+}
+
+static void probe_power_mark(struct power_trace *it, unsigned int type,
+                                unsigned int level)
+{
+        struct ring_buffer_event *event;
+        struct trace_power *entry;
+        struct trace_array_cpu *data;
+        struct trace_array *tr = power_trace;
+
+        if (!trace_power_enabled)
+                return;
+
+        memset(it, 0, sizeof(struct power_trace));
+        it->state = level;
+        it->type = type;
+        it->stamp = ktime_get();
+        preempt_disable();
+        it->end = it->stamp;
+        data = tr->data[smp_processor_id()];
+
+        event = trace_buffer_lock_reserve(tr, TRACE_POWER,
+                                          sizeof(*entry), 0, 0);
+        if (!event)
+                goto out;
+        entry   = ring_buffer_event_data(event);
+        entry->state_data = *it;
+        trace_buffer_unlock_commit(tr, event, 0, 0);
+ out:
+        preempt_enable();
+}
+
+static int tracing_power_register(void)
+{
+        int ret;
+
+        ret = register_trace_power_start(probe_power_start);
+        if (ret) {
+                pr_info("power trace: Couldn't activate tracepoint"
+                        " probe to trace_power_start\n");
+                return ret;
+        }
+        ret = register_trace_power_end(probe_power_end);
+        if (ret) {
+                pr_info("power trace: Couldn't activate tracepoint"
+                        " probe to trace_power_end\n");
+                goto fail_start;
+        }
+        ret = register_trace_power_mark(probe_power_mark);
+        if (ret) {
+                pr_info("power trace: Couldn't activate tracepoint"
+                        " probe to trace_power_mark\n");
+                goto fail_end;
+        }
+        return ret;
+fail_end:
+        unregister_trace_power_end(probe_power_end);
+fail_start:
+        unregister_trace_power_start(probe_power_start);
+        return ret;
+}
 
 static void start_power_trace(struct trace_array *tr)
 {
@@ -31,6 +129,14 @@ static void stop_power_trace(struct trace_array *tr)
         trace_power_enabled = 0;
 }
 
+static void power_trace_reset(struct trace_array *tr)
+{
+        trace_power_enabled = 0;
+        unregister_trace_power_start(probe_power_start);
+        unregister_trace_power_end(probe_power_end);
+        unregister_trace_power_mark(probe_power_mark);
+}
+
 
 static int power_trace_init(struct trace_array *tr)
 {
@@ -38,6 +144,7 @@ static int power_trace_init(struct trace_array *tr)
         power_trace = tr;
 
         trace_power_enabled = 1;
+        tracing_power_register();
 
         for_each_cpu(cpu, cpu_possible_mask)
                 tracing_reset(tr, cpu);
@@ -85,7 +192,7 @@ static struct tracer power_tracer __read_mostly =
         .init           = power_trace_init,
         .start          = start_power_trace,
         .stop           = stop_power_trace,
-        .reset          = stop_power_trace,
+        .reset          = power_trace_reset,
         .print_line     = power_print_line,
 };
 
@@ -94,86 +201,3 @@ static int init_power_trace(void)
         return register_tracer(&power_tracer);
 }
 device_initcall(init_power_trace);
-
-void trace_power_start(struct power_trace *it, unsigned int type,
-                         unsigned int level)
-{
-        if (!trace_power_enabled)
-                return;
-
-        memset(it, 0, sizeof(struct power_trace));
-        it->state = level;
-        it->type = type;
-        it->stamp = ktime_get();
-}
-EXPORT_SYMBOL_GPL(trace_power_start);
-
-
-void trace_power_end(struct power_trace *it)
-{
-        struct ring_buffer_event *event;
-        struct trace_power *entry;
-        struct trace_array_cpu *data;
-        unsigned long irq_flags;
-        struct trace_array *tr = power_trace;
-
-        if (!trace_power_enabled)
-                return;
-
-        preempt_disable();
-        it->end = ktime_get();
-        data = tr->data[smp_processor_id()];
-
-        event = ring_buffer_lock_reserve(tr->buffer, sizeof(*entry),
-                                         &irq_flags);
-        if (!event)
-                goto out;
-        entry   = ring_buffer_event_data(event);
-        tracing_generic_entry_update(&entry->ent, 0, 0);
-        entry->ent.type = TRACE_POWER;
-        entry->state_data = *it;
-        ring_buffer_unlock_commit(tr->buffer, event, irq_flags);
-
-        trace_wake_up();
-
- out:
-        preempt_enable();
-}
-EXPORT_SYMBOL_GPL(trace_power_end);
-
-void trace_power_mark(struct power_trace *it, unsigned int type,
-                         unsigned int level)
-{
-        struct ring_buffer_event *event;
-        struct trace_power *entry;
-        struct trace_array_cpu *data;
-        unsigned long irq_flags;
-        struct trace_array *tr = power_trace;
-
-        if (!trace_power_enabled)
-                return;
-
-        memset(it, 0, sizeof(struct power_trace));
-        it->state = level;
-        it->type = type;
-        it->stamp = ktime_get();
-        preempt_disable();
-        it->end = it->stamp;
-        data = tr->data[smp_processor_id()];
-
-        event = ring_buffer_lock_reserve(tr->buffer, sizeof(*entry),
-                                         &irq_flags);
-        if (!event)
-                goto out;
-        entry   = ring_buffer_event_data(event);
-        tracing_generic_entry_update(&entry->ent, 0, 0);
-        entry->ent.type = TRACE_POWER;
-        entry->state_data = *it;
-        ring_buffer_unlock_commit(tr->buffer, event, irq_flags);
-
-        trace_wake_up();
-
- out:
-        preempt_enable();
-}
-EXPORT_SYMBOL_GPL(trace_power_mark);