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

Commit 43720bd6 authored by Paul Gortmaker's avatar Paul Gortmaker Committed by Rafael J. Wysocki
Browse files

PM / tracing: remove deprecated power trace API 



The text in Documentation said it would be removed in 2.6.41;
the text in the Kconfig said removal in the 3.1 release.  Either
way you look at it, we are well past both, so push it off a cliff.

Note that the POWER_CSTATE and the POWER_PSTATE are part of the
legacy tracing API.  Remove all tracepoints which use these flags.
As can be seen from context, most already have a trace entry via
trace_cpu_idle anyways.

Also, the cpufreq/cpufreq.c PSTATE one is actually unpaired, as
compared to the CSTATE ones which all have a clear start/stop.
As part of this, the trace_power_frequency also becomes orphaned,
so it too is deleted.

Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent ed1ac6e9

Documentation/trace/events-power.txt

+1 −26
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ Cf. include/trace/events/power.h for the events definitions. 
1. Power state switch events

============================



1.1 New trace API

1.1 Trace API

-----------------



A 'cpu' event class gathers the CPU-related events: cpuidle and
@@ -41,31 +41,6 @@ The event which has 'state=4294967295' in the trace is very important to the use 
space tools which are using it to detect the end of the current state, and so to

correctly draw the states diagrams and to calculate accurate statistics etc.



1.2 DEPRECATED trace API

------------------------



A new Kconfig option CONFIG_EVENT_POWER_TRACING_DEPRECATED with the default value of

'y' has been created. This allows the legacy trace power API to be used conjointly

with the new trace API.

The Kconfig option, the old trace API (in include/trace/events/power.h) and the

old trace points will disappear in a future release (namely 2.6.41).



power_start		"type=%lu state=%lu cpu_id=%lu"

power_frequency		"type=%lu state=%lu cpu_id=%lu"

power_end		"cpu_id=%lu"



The 'type' parameter takes one of those macros:

 . POWER_NONE	= 0,

 . POWER_CSTATE	= 1,	/* C-State */

 . POWER_PSTATE	= 2,	/* Frequency change or DVFS */



The 'state' parameter is set depending on the type:

 . Target C-state for type=POWER_CSTATE,

 . Target frequency for type=POWER_PSTATE,



power_end is used to indicate the exit of a state, corresponding to the latest

power_start event.



2. Clocks events

================

The clock events are used for clock enable/disable and for

arch/arm/mach-omap2/pm34xx.c

+0 −2
Original line number Diff line number Diff line
@@ -351,12 +351,10 @@ static void omap3_pm_idle(void) 
	if (omap_irq_pending())

		goto out;



	trace_power_start(POWER_CSTATE, 1, smp_processor_id());

	trace_cpu_idle(1, smp_processor_id());



	omap_sram_idle();



	trace_power_end(smp_processor_id());

	trace_cpu_idle(PWR_EVENT_EXIT, smp_processor_id());



out:

arch/x86/kernel/process.c

+0 −6
Original line number Diff line number Diff line
@@ -375,7 +375,6 @@ void cpu_idle(void) 
 */

void default_idle(void)

{

	trace_power_start_rcuidle(POWER_CSTATE, 1, smp_processor_id());

	trace_cpu_idle_rcuidle(1, smp_processor_id());

	current_thread_info()->status &= ~TS_POLLING;

	/*
@@ -389,7 +388,6 @@ void default_idle(void) 
	else

		local_irq_enable();

	current_thread_info()->status |= TS_POLLING;

	trace_power_end_rcuidle(smp_processor_id());

	trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, smp_processor_id());

}

#ifdef CONFIG_APM_MODULE
@@ -423,7 +421,6 @@ void stop_this_cpu(void *dummy) 
static void mwait_idle(void)

{

	if (!need_resched()) {

		trace_power_start_rcuidle(POWER_CSTATE, 1, smp_processor_id());

		trace_cpu_idle_rcuidle(1, smp_processor_id());

		if (this_cpu_has(X86_FEATURE_CLFLUSH_MONITOR))

			clflush((void *)&current_thread_info()->flags);
@@ -434,7 +431,6 @@ static void mwait_idle(void) 
			__sti_mwait(0, 0);

		else

			local_irq_enable();

		trace_power_end_rcuidle(smp_processor_id());

		trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, smp_processor_id());

	} else

		local_irq_enable();
@@ -447,12 +443,10 @@ static void mwait_idle(void) 
 */

static void poll_idle(void)

{

	trace_power_start_rcuidle(POWER_CSTATE, 0, smp_processor_id());

	trace_cpu_idle_rcuidle(0, smp_processor_id());

	local_irq_enable();

	while (!need_resched())

		cpu_relax();

	trace_power_end_rcuidle(smp_processor_id());

	trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, smp_processor_id());

}

drivers/cpufreq/cpufreq.c

+0 −1
Original line number Diff line number Diff line
@@ -294,7 +294,6 @@ void cpufreq_notify_transition(struct cpufreq_freqs *freqs, unsigned int state) 
		adjust_jiffies(CPUFREQ_POSTCHANGE, freqs);

		pr_debug("FREQ: %lu - CPU: %lu", (unsigned long)freqs->new,

			(unsigned long)freqs->cpu);

		trace_power_frequency(POWER_PSTATE, freqs->new, freqs->cpu);

		trace_cpu_frequency(freqs->new, freqs->cpu);

		srcu_notifier_call_chain(&cpufreq_transition_notifier_list,

				CPUFREQ_POSTCHANGE, freqs);

drivers/cpuidle/cpuidle.c

+0 −2
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ int cpuidle_idle_call(void) 
		return 0;

	}



	trace_power_start_rcuidle(POWER_CSTATE, next_state, dev->cpu);

	trace_cpu_idle_rcuidle(next_state, dev->cpu);



	if (cpuidle_state_is_coupled(dev, drv, next_state))
@@ -153,7 +152,6 @@ int cpuidle_idle_call(void) 
	else

		entered_state = cpuidle_enter_state(dev, drv, next_state);



	trace_power_end_rcuidle(dev->cpu);

	trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu);



	/* give the governor an opportunity to reflect on the outcome */