History

Merge branch 'pm-cpufreq'

* pm-cpufreq: MAINTAINERS / cpufreq: update Sudeep's email address intel_pstate: Remove energy reporting from pstate_sample tracepoint

Rafael J. Wysocki committed 12 years ago

Commit 465e5fc2 parents d990ce0 171d0ba3 files · +2 −16Browse files

Unified · Split

3 files
  1. MAINTAINERS +1 −1
  2. drivers/cpufreq/intel_pstate.c +0 −9
  3. include/trace/events/power.h +1 −6
MAINTAINERS+1−1
@@ -2367,7 +2367,7 @@ F: include/linux/cpufreq.h · 2366 unmodified lines
2367 2367
2368CPU FREQUENCY DRIVERS - ARM BIG LITTLE2368CPU FREQUENCY DRIVERS - ARM BIG LITTLE
2369M: Viresh Kumar <viresh.kumar@linaro.org>2369M: Viresh Kumar <viresh.kumar@linaro.org>
2370M: Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>2370M: Sudeep Holla <sudeep.holla@arm.com>
2371L: cpufreq@vger.kernel.org2371L: cpufreq@vger.kernel.org
2372L: linux-pm@vger.kernel.org2372L: linux-pm@vger.kernel.org
2373W: http://www.arm.com/products/processors/technologies/biglittleprocessing.php2373W: http://www.arm.com/products/processors/technologies/biglittleprocessing.php
drivers/cpufreq/intel_pstate.c+0−9
@@ -51,8 +51,6 @@ static inline int32_t div_fp(int32_t x, int32_t y) · 50 unmodified lines
51 return div_s64((int64_t)x << FRAC_BITS, (int64_t)y);51 return div_s64((int64_t)x << FRAC_BITS, (int64_t)y);
52}52}
53 53
54static u64 energy_divisor;
55
56struct sample {54struct sample {
57 int32_t core_pct_busy;55 int32_t core_pct_busy;
58 u64 aperf;56 u64 aperf;
@@ -630,12 +628,10 @@ static void intel_pstate_timer_func(unsigned long __data) · 571 unmodified lines
630{628{
631 struct cpudata *cpu = (struct cpudata *) __data;629 struct cpudata *cpu = (struct cpudata *) __data;
632 struct sample *sample;630 struct sample *sample;
633 u64 energy;
634 631
635 intel_pstate_sample(cpu);632 intel_pstate_sample(cpu);
636 633
637 sample = &cpu->samples[cpu->sample_ptr];634 sample = &cpu->samples[cpu->sample_ptr];
638 rdmsrl(MSR_PKG_ENERGY_STATUS, energy);
639 635
640 intel_pstate_adjust_busy_pstate(cpu);636 intel_pstate_adjust_busy_pstate(cpu);
641 637
@@ -644,7 +640,6 @@ static void intel_pstate_timer_func(unsigned long __data) · 2 unmodified lines
644 cpu->pstate.current_pstate,640 cpu->pstate.current_pstate,
645 sample->mperf,641 sample->mperf,
646 sample->aperf,642 sample->aperf,
647 div64_u64(energy, energy_divisor),
648 sample->freq);643 sample->freq);
649 644
650 intel_pstate_set_sample_time(cpu);645 intel_pstate_set_sample_time(cpu);
@@ -926,7 +921,6 @@ static int __init intel_pstate_init(void) · 275 unmodified lines
926 int cpu, rc = 0;921 int cpu, rc = 0;
927 const struct x86_cpu_id *id;922 const struct x86_cpu_id *id;
928 struct cpu_defaults *cpu_info;923 struct cpu_defaults *cpu_info;
929 u64 units;
930 924
931 if (no_load)925 if (no_load)
932 return -ENODEV;926 return -ENODEV;
@@ -960,9 +954,6 @@ static int __init intel_pstate_init(void) · 27 unmodified lines
960 if (rc)954 if (rc)
961 goto out;955 goto out;
962 956
963 rdmsrl(MSR_RAPL_POWER_UNIT, units);
964 energy_divisor = 1 << ((units >> 8) & 0x1f); /* bits{12:8} */
965
966 intel_pstate_debug_expose_params();957 intel_pstate_debug_expose_params();
967 intel_pstate_sysfs_expose_params();958 intel_pstate_sysfs_expose_params();
968 959
include/trace/events/power.h+1−6
@@ -42,7 +42,6 @@ TRACE_EVENT(pstate_sample, · 41 unmodified lines
42 u32 state,42 u32 state,
43 u64 mperf,43 u64 mperf,
44 u64 aperf,44 u64 aperf,
45 u32 energy,
46 u32 freq45 u32 freq
47 ),46 ),
48 47
@@ -51,7 +50,6 @@ TRACE_EVENT(pstate_sample, · 2 unmodified lines
51 state,50 state,
52 mperf,51 mperf,
53 aperf,52 aperf,
54 energy,
55 freq53 freq
56 ),54 ),
57 55
@@ -61,7 +59,6 @@ TRACE_EVENT(pstate_sample, · 3 unmodified lines
61 __field(u32, state)59 __field(u32, state)
62 __field(u64, mperf)60 __field(u64, mperf)
63 __field(u64, aperf)61 __field(u64, aperf)
64 __field(u32, energy)
65 __field(u32, freq)62 __field(u32, freq)
66 63
67 ),64 ),
@@ -72,17 +69,15 @@ TRACE_EVENT(pstate_sample, · 4 unmodified lines
72 __entry->state = state;69 __entry->state = state;
73 __entry->mperf = mperf;70 __entry->mperf = mperf;
74 __entry->aperf = aperf;71 __entry->aperf = aperf;
75 __entry->energy = energy;
76 __entry->freq = freq;72 __entry->freq = freq;
77 ),73 ),
78 74
79 TP_printk("core_busy=%lu scaled=%lu state=%lu mperf=%llu aperf=%llu energy=%lu freq=%lu ",75 TP_printk("core_busy=%lu scaled=%lu state=%lu mperf=%llu aperf=%llu freq=%lu ",
80 (unsigned long)__entry->core_busy,76 (unsigned long)__entry->core_busy,
81 (unsigned long)__entry->scaled_busy,77 (unsigned long)__entry->scaled_busy,
82 (unsigned long)__entry->state,78 (unsigned long)__entry->state,
83 (unsigned long long)__entry->mperf,79 (unsigned long long)__entry->mperf,
84 (unsigned long long)__entry->aperf,80 (unsigned long long)__entry->aperf,
85 (unsigned long)__entry->energy,
86 (unsigned long)__entry->freq81 (unsigned long)__entry->freq
87 )82 )
88 83

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t