This patch adds frequency tracing to the powernow-k8 cpufreq driver.
Adapted due to comments by:
* Li Zefan: * now uses CONFIG_TRACING instead of POWER_TRACER
* added space after ,
smp_call_function_single has to be used, as I understand the code
to be sure, that a frequency change is reported for all affected
cpu cores. Since the tracing infrastructure always traces events for
the cpu core reporting that event (one core can't report another cores
event). Every core has to report this one itself.
* Bert Wesarg: * removed tailing ; in macros
* fixed mail, which breaked long lines
* added signed-of-by line to mail
Signed of by Robert Schoene <robert.schoene@xxxxxxxxxxxxx>
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
index 6e44519..db80be1 100644
--- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
+++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
@@ -37,6 +37,10 @@
#include <linux/io.h>
#include <linux/delay.h>
+#ifdef CONFIG_TRACING
+#include <trace/events/power.h> /* tracing power events */
+# endif /* CONFIG_TRACING */
+
#include <asm/msr.h>
#include <linux/acpi.h>
@@ -54,6 +58,25 @@ static DEFINE_PER_CPU(struct powernow_k8_data *, powernow_data);
static int cpu_family = CPU_OPTERON;
+
+/* only trace power if it is selected */
+#ifdef CONFIG_TRACING
+ /* trace power event on a specific cpu/core */
+ static void trace_power_event(unsigned int *freq){
+ trace_power_frequency(POWER_PSTATE, *freq);
+ }
+
+ #define TRACE_POWER_FREQUENCY_EVENT(i, avail_cores, frequency) \
+ for_each_cpu(i,avail_cores) \
+ smp_call_function_single(i, trace_power_event, &frequency, 1)
+
+#else /* !CONFIG_TRACING */
+
+ #define TRACE_POWER_FREQUENCY_EVENT(i, avail_cores, frequency)
+
+# endif /* CONFIG_TRACING*/
+
+
#ifndef CONFIG_SMP
static inline const struct cpumask *cpu_core_mask(int cpu)
{
@@ -1074,6 +1097,8 @@ static int transition_frequency_fidvid(struct powernow_k8_data *data,
res = transition_fid_vid(data, fid, vid);
freqs.new = find_khz_freq_from_fid(data->currfid);
+ TRACE_POWER_FREQUENCY_EVENT(i,data->available_cores, freqs.new);
+
for_each_cpu(i, data->available_cores) {
freqs.cpu = i;
cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
@@ -1107,6 +1132,8 @@ static int transition_frequency_pstate(struct powernow_k8_data *data,
res = transition_pstate(data, pstate);
freqs.new = find_khz_freq_from_pstate(data->powernow_table, pstate);
+ TRACE_POWER_FREQUENCY_EVENT(i,data->available_cores, freqs.new);
+
for_each_cpu(i, data->available_cores) {
freqs.cpu = i;
cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
--
To unsubscribe from this list: send the line "unsubscribe cpufreq" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
