From 96b56157b38cffced997ffa71fdd4bf71024fc67 Mon Sep 17 00:00:00 2001 From: Jon Medhurst Date: Thu, 30 Oct 2014 18:01:15 +0000 Subject: gator: Version 5.20 Signed-off-by: Jon Medhurst --- drivers/gator/gator_trace_power.c | 61 ++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 36 deletions(-) (limited to 'drivers/gator/gator_trace_power.c') diff --git a/drivers/gator/gator_trace_power.c b/drivers/gator/gator_trace_power.c index f2754b1c2b56..46e04b29a187 100644 --- a/drivers/gator/gator_trace_power.c +++ b/drivers/gator/gator_trace_power.c @@ -22,18 +22,20 @@ #endif -// cpu_frequency and cpu_idle trace points were introduced in Linux kernel v2.6.38 -// the now deprecated power_frequency trace point was available prior to 2.6.38, but only for x86 +/* cpu_frequency and cpu_idle trace points were introduced in Linux + * kernel v2.6.38 the now deprecated power_frequency trace point was + * available prior to 2.6.38, but only for x86 + */ #if GATOR_CPU_FREQ_SUPPORT enum { POWER_CPU_FREQ, - POWER_CPU_IDLE, POWER_TOTAL }; static DEFINE_PER_CPU(ulong, idle_prev_state); static ulong power_cpu_enabled[POWER_TOTAL]; static ulong power_cpu_key[POWER_TOTAL]; +static ulong power_cpu_cores; static int gator_trace_power_create_files(struct super_block *sb, struct dentry *root) { @@ -41,8 +43,9 @@ static int gator_trace_power_create_files(struct super_block *sb, struct dentry int cpu; bool found_nonzero_freq = false; - // Even if CONFIG_CPU_FREQ is defined, it still may not be used. Check - // for non-zero values from cpufreq_quick_get + /* Even if CONFIG_CPU_FREQ is defined, it still may not be + * used. Check for non-zero values from cpufreq_quick_get + */ for_each_online_cpu(cpu) { if (cpufreq_quick_get(cpu) > 0) { found_nonzero_freq = true; @@ -51,27 +54,18 @@ static int gator_trace_power_create_files(struct super_block *sb, struct dentry } if (found_nonzero_freq) { - // cpu_frequency + /* cpu_frequency */ dir = gatorfs_mkdir(sb, root, "Linux_power_cpu_freq"); - if (!dir) { + if (!dir) return -1; - } gatorfs_create_ulong(sb, dir, "enabled", &power_cpu_enabled[POWER_CPU_FREQ]); gatorfs_create_ro_ulong(sb, dir, "key", &power_cpu_key[POWER_CPU_FREQ]); } - // cpu_idle - dir = gatorfs_mkdir(sb, root, "Linux_power_cpu_idle"); - if (!dir) { - return -1; - } - gatorfs_create_ulong(sb, dir, "enabled", &power_cpu_enabled[POWER_CPU_IDLE]); - gatorfs_create_ro_ulong(sb, dir, "key", &power_cpu_key[POWER_CPU_IDLE]); - return 0; } -// 'cpu' may not equal smp_processor_id(), i.e. may not be running on the core that is having the freq/idle state change +/* 'cpu' may not equal smp_processor_id(), i.e. may not be running on the core that is having the freq/idle state change */ GATOR_DEFINE_PROBE(cpu_frequency, TP_PROTO(unsigned int frequency, unsigned int cpu)) { cpu = lcpu_to_pcpu(cpu); @@ -82,56 +76,50 @@ GATOR_DEFINE_PROBE(cpu_idle, TP_PROTO(unsigned int state, unsigned int cpu)) { cpu = lcpu_to_pcpu(cpu); - if (state == per_cpu(idle_prev_state, cpu)) { + if (state == per_cpu(idle_prev_state, cpu)) return; - } if (implements_wfi()) { if (state == PWR_EVENT_EXIT) { - // transition from wfi to non-wfi + /* transition from wfi to non-wfi */ marshal_idle(cpu, MESSAGE_IDLE_EXIT); } else { - // transition from non-wfi to wfi + /* transition from non-wfi to wfi */ marshal_idle(cpu, MESSAGE_IDLE_ENTER); } } per_cpu(idle_prev_state, cpu) = state; - - if (power_cpu_enabled[POWER_CPU_IDLE]) { - // Increment state so that no negative numbers are sent - marshal_event_single(cpu, power_cpu_key[POWER_CPU_IDLE], state + 1); - } } static void gator_trace_power_online(void) { int pcpu = get_physical_cpu(); int lcpu = get_logical_cpu(); - if (power_cpu_enabled[POWER_CPU_FREQ]) { + + if (power_cpu_enabled[POWER_CPU_FREQ]) marshal_event_single64(pcpu, power_cpu_key[POWER_CPU_FREQ], cpufreq_quick_get(lcpu) * 1000L); - } } static void gator_trace_power_offline(void) { - // Set frequency to zero on an offline + /* Set frequency to zero on an offline */ int cpu = get_physical_cpu(); - if (power_cpu_enabled[POWER_CPU_FREQ]) { + + if (power_cpu_enabled[POWER_CPU_FREQ]) marshal_event_single(cpu, power_cpu_key[POWER_CPU_FREQ], 0); - } } static int gator_trace_power_start(void) { int cpu; - // register tracepoints + /* register tracepoints */ if (power_cpu_enabled[POWER_CPU_FREQ]) if (GATOR_REGISTER_TRACE(cpu_frequency)) goto fail_cpu_frequency_exit; - // Always register for cpu:idle for detecting WFI, independent of power_cpu_enabled[POWER_CPU_IDLE] + /* Always register for cpu_idle for detecting WFI */ if (GATOR_REGISTER_TRACE(cpu_idle)) goto fail_cpu_idle_exit; pr_debug("gator: registered power event tracepoints\n"); @@ -142,7 +130,7 @@ static int gator_trace_power_start(void) return 0; - // unregister tracepoints on error + /* unregister tracepoints on error */ fail_cpu_idle_exit: if (power_cpu_enabled[POWER_CPU_FREQ]) GATOR_UNREGISTER_TRACE(cpu_frequency); @@ -161,14 +149,15 @@ static void gator_trace_power_stop(void) GATOR_UNREGISTER_TRACE(cpu_idle); pr_debug("gator: unregistered power event tracepoints\n"); - for (i = 0; i < POWER_TOTAL; i++) { + for (i = 0; i < POWER_TOTAL; i++) power_cpu_enabled[i] = 0; - } } static void gator_trace_power_init(void) { int i; + + power_cpu_cores = nr_cpu_ids; for (i = 0; i < POWER_TOTAL; i++) { power_cpu_enabled[i] = 0; power_cpu_key[i] = gator_events_get_key(); -- cgit v1.2.3