Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 465e5fc4 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-cpufreq' 

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

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -2367,7 +2367,7 @@ F: include/linux/cpufreq.h 


CPU FREQUENCY DRIVERS - ARM BIG LITTLE

M:	Viresh Kumar <viresh.kumar@linaro.org>

M:	Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>

M:	Sudeep Holla <sudeep.holla@arm.com>

L:	cpufreq@vger.kernel.org

L:	linux-pm@vger.kernel.org

W:	http://www.arm.com/products/processors/technologies/biglittleprocessing.php

drivers/cpufreq/intel_pstate.c

+0 −9
Original line number Diff line number Diff line
@@ -51,8 +51,6 @@ static inline int32_t div_fp(int32_t x, int32_t y) 
	return div_s64((int64_t)x << FRAC_BITS, (int64_t)y);

}



static u64 energy_divisor;



struct sample {

	int32_t core_pct_busy;

	u64 aperf;
@@ -630,12 +628,10 @@ static void intel_pstate_timer_func(unsigned long __data) 
{

	struct cpudata *cpu = (struct cpudata *) __data;

	struct sample *sample;

	u64 energy;



	intel_pstate_sample(cpu);



	sample = &cpu->samples[cpu->sample_ptr];

	rdmsrl(MSR_PKG_ENERGY_STATUS, energy);



	intel_pstate_adjust_busy_pstate(cpu);
@@ -644,7 +640,6 @@ static void intel_pstate_timer_func(unsigned long __data) 
			cpu->pstate.current_pstate,

			sample->mperf,

			sample->aperf,

			div64_u64(energy, energy_divisor),

			sample->freq);



	intel_pstate_set_sample_time(cpu);
@@ -926,7 +921,6 @@ static int __init intel_pstate_init(void) 
	int cpu, rc = 0;

	const struct x86_cpu_id *id;

	struct cpu_defaults *cpu_info;

	u64 units;



	if (no_load)

		return -ENODEV;
@@ -960,9 +954,6 @@ static int __init intel_pstate_init(void) 
	if (rc)

		goto out;



	rdmsrl(MSR_RAPL_POWER_UNIT, units);

	energy_divisor = 1 << ((units >> 8) & 0x1f); /* bits{12:8} */



	intel_pstate_debug_expose_params();

	intel_pstate_sysfs_expose_params();

include/trace/events/power.h

+1 −6
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ TRACE_EVENT(pstate_sample, 
		u32 state,

		u64 mperf,

		u64 aperf,

		u32 energy,

		u32 freq

		),
@@ -51,7 +50,6 @@ TRACE_EVENT(pstate_sample, 
		state,

		mperf,

		aperf,

		energy,

		freq

		),
@@ -61,7 +59,6 @@ TRACE_EVENT(pstate_sample, 
		__field(u32, state)

		__field(u64, mperf)

		__field(u64, aperf)

		__field(u32, energy)

		__field(u32, freq)



	),
@@ -72,17 +69,15 @@ TRACE_EVENT(pstate_sample, 
		__entry->state = state;

		__entry->mperf = mperf;

		__entry->aperf = aperf;

		__entry->energy = energy;

		__entry->freq = freq;

		),



	TP_printk("core_busy=%lu scaled=%lu state=%lu mperf=%llu aperf=%llu energy=%lu freq=%lu ",

	TP_printk("core_busy=%lu scaled=%lu state=%lu mperf=%llu aperf=%llu freq=%lu ",

		(unsigned long)__entry->core_busy,

		(unsigned long)__entry->scaled_busy,

		(unsigned long)__entry->state,

		(unsigned long long)__entry->mperf,

		(unsigned long long)__entry->aperf,

		(unsigned long)__entry->energy,

		(unsigned long)__entry->freq

		)