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
23672367
23682368 CPU FREQUENCY DRIVERS - ARM BIG LITTLE
23692369 M: Viresh Kumar <viresh.kumar@linaro.org>
2370−M: Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
2370+M: Sudeep Holla <sudeep.holla@arm.com>
23712371 L: cpufreq@vger.kernel.org
23722372 L: linux-pm@vger.kernel.org
23732373 W: 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
5151 return div_s64((int64_t)x << FRAC_BITS, (int64_t)y);
5252 }
5353
54−static u64 energy_divisor;
55−
5654 struct sample {
5755 int32_t core_pct_busy;
5856 u64 aperf;
@@ -630,12 +628,10 @@ static void intel_pstate_timer_func(unsigned long __data) · 571 unmodified lines
630628 {
631629 struct cpudata *cpu = (struct cpudata *) __data;
632630 struct sample *sample;
633− u64 energy;
634631
635632 intel_pstate_sample(cpu);
636633
637634 sample = &cpu->samples[cpu->sample_ptr];
638− rdmsrl(MSR_PKG_ENERGY_STATUS, energy);
639635
640636 intel_pstate_adjust_busy_pstate(cpu);
641637
@@ -644,7 +640,6 @@ static void intel_pstate_timer_func(unsigned long __data) · 2 unmodified lines
644640 cpu->pstate.current_pstate,
645641 sample->mperf,
646642 sample->aperf,
647− div64_u64(energy, energy_divisor),
648643 sample->freq);
649644
650645 intel_pstate_set_sample_time(cpu);
@@ -926,7 +921,6 @@ static int __init intel_pstate_init(void) · 275 unmodified lines
926921 int cpu, rc = 0;
927922 const struct x86_cpu_id *id;
928923 struct cpu_defaults *cpu_info;
929− u64 units;
930924
931925 if (no_load)
932926 return -ENODEV;
@@ -960,9 +954,6 @@ static int __init intel_pstate_init(void) · 27 unmodified lines
960954 if (rc)
961955 goto out;
962956
963− rdmsrl(MSR_RAPL_POWER_UNIT, units);
964− energy_divisor = 1 << ((units >> 8) & 0x1f); /* bits{12:8} */
965−
966957 intel_pstate_debug_expose_params();
967958 intel_pstate_sysfs_expose_params();
968959
include/trace/events/power.h+1−6
@@ -42,7 +42,6 @@ TRACE_EVENT(pstate_sample, · 41 unmodified lines
4242 u32 state,
4343 u64 mperf,
4444 u64 aperf,
45− u32 energy,
4645 u32 freq
4746 ),
4847
@@ -51,7 +50,6 @@ TRACE_EVENT(pstate_sample, · 2 unmodified lines
5150 state,
5251 mperf,
5352 aperf,
54− energy,
5553 freq
5654 ),
5755
@@ -61,7 +59,6 @@ TRACE_EVENT(pstate_sample, · 3 unmodified lines
6159 __field(u32, state)
6260 __field(u64, mperf)
6361 __field(u64, aperf)
64− __field(u32, energy)
6562 __field(u32, freq)
6663
6764 ),
@@ -72,17 +69,15 @@ TRACE_EVENT(pstate_sample, · 4 unmodified lines
7269 __entry->state = state;
7370 __entry->mperf = mperf;
7471 __entry->aperf = aperf;
75− __entry->energy = energy;
7672 __entry->freq = freq;
7773 ),
7874
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 ",
8076 (unsigned long)__entry->core_busy,
8177 (unsigned long)__entry->scaled_busy,
8278 (unsigned long)__entry->state,
8379 (unsigned long long)__entry->mperf,
8480 (unsigned long long)__entry->aperf,
85− (unsigned long)__entry->energy,
8681 (unsigned long)__entry->freq
8782 )
8883

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