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

Commit a0bfa137 authored by Len Brown's avatar Len Brown
Browse files

cpuidle: stop depending on pm_idle 



cpuidle users should call cpuidle_call_idle() directly
rather than via (pm_idle)() function pointer.

Architecture may choose to continue using (pm_idle)(),
but cpuidle need not depend on it:

  my_arch_cpu_idle()
	...
	if(cpuidle_call_idle())
		pm_idle();

cc: Kevin Hilman <khilman@deeprootsystems.com>
cc: Paul Mundt <lethal@linux-sh.org>
cc: x86@kernel.org
Acked-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 4bfc8288

arch/arm/kernel/process.c

+3 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/uaccess.h>

#include <linux/random.h>

#include <linux/hw_breakpoint.h>

#include <linux/cpuidle.h>



#include <asm/cacheflush.h>

#include <asm/leds.h>
@@ -196,6 +197,7 @@ void cpu_idle(void) 
				cpu_relax();

			} else {

				stop_critical_timings();

				if (cpuidle_call_idle())

					pm_idle();

				start_critical_timings();

				/*

arch/sh/kernel/idle.c

+4 −2
Original line number Diff line number Diff line
@@ -16,12 +16,13 @@ 
#include <linux/thread_info.h>

#include <linux/irqflags.h>

#include <linux/smp.h>

#include <linux/cpuidle.h>

#include <asm/pgalloc.h>

#include <asm/system.h>

#include <asm/atomic.h>

#include <asm/smp.h>



void (*pm_idle)(void) = NULL;

static void (*pm_idle)(void);



static int hlt_counter;
@@ -100,6 +101,7 @@ void cpu_idle(void) 
			local_irq_disable();

			/* Don't trace irqs off for idle */

			stop_critical_timings();

			if (cpuidle_call_idle())

				pm_idle();

			/*

			 * Sanity check to ensure that pm_idle() returns

arch/x86/kernel/process_32.c

+3 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <linux/uaccess.h>

#include <linux/io.h>

#include <linux/kdebug.h>

#include <linux/cpuidle.h>



#include <asm/pgtable.h>

#include <asm/system.h>
@@ -109,6 +110,7 @@ void cpu_idle(void) 
			local_irq_disable();

			/* Don't trace irqs off for idle */

			stop_critical_timings();

			if (cpuidle_idle_call())

				pm_idle();

			start_critical_timings();

		}

arch/x86/kernel/process_64.c

+3 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <linux/uaccess.h>

#include <linux/io.h>

#include <linux/ftrace.h>

#include <linux/cpuidle.h>



#include <asm/pgtable.h>

#include <asm/system.h>
@@ -136,6 +137,7 @@ void cpu_idle(void) 
			enter_idle();

			/* Don't trace irqs off for idle */

			stop_critical_timings();

			if (cpuidle_idle_call())

				pm_idle();

			start_critical_timings();

drivers/cpuidle/cpuidle.c

+18 −20
Original line number Diff line number Diff line
@@ -25,10 +25,10 @@ DEFINE_PER_CPU(struct cpuidle_device *, cpuidle_devices); 


DEFINE_MUTEX(cpuidle_lock);

LIST_HEAD(cpuidle_detected_devices);

static void (*pm_idle_old)(void);



static int enabled_devices;

static int off __read_mostly;

static int initialized __read_mostly;



int cpuidle_disabled(void)

{
@@ -56,25 +56,23 @@ static int __cpuidle_register_device(struct cpuidle_device *dev); 
 * cpuidle_idle_call - the main idle loop

 *

 * NOTE: no locks or semaphores should be used here

 * return non-zero on failure

 */

static void cpuidle_idle_call(void)

int cpuidle_idle_call(void)

{

	struct cpuidle_device *dev = __this_cpu_read(cpuidle_devices);

	struct cpuidle_state *target_state;

	int next_state;



	if (off)

		return -ENODEV;



	if (!initialized)

		return -ENODEV;



	/* check if the device is ready */

	if (!dev || !dev->enabled) {

		if (pm_idle_old)

			pm_idle_old();

		else

#if defined(CONFIG_ARCH_HAS_DEFAULT_IDLE)

			default_idle();

#else

			local_irq_enable();

#endif

		return;

	}

	if (!dev || !dev->enabled)

		return -EBUSY;



#if 0

	/* shows regressions, re-enable for 2.6.29 */
@@ -99,7 +97,7 @@ static void cpuidle_idle_call(void) 
	next_state = cpuidle_curr_governor->select(dev);

	if (need_resched()) {

		local_irq_enable();

		return;

		return 0;

	}



	target_state = &dev->states[next_state];
@@ -124,6 +122,8 @@ static void cpuidle_idle_call(void) 
	/* give the governor an opportunity to reflect on the outcome */

	if (cpuidle_curr_governor->reflect)

		cpuidle_curr_governor->reflect(dev);



	return 0;

}



/**
@@ -131,10 +131,10 @@ static void cpuidle_idle_call(void) 
 */

void cpuidle_install_idle_handler(void)

{

	if (enabled_devices && (pm_idle != cpuidle_idle_call)) {

	if (enabled_devices) {

		/* Make sure all changes finished before we switch to new idle */

		smp_wmb();

		pm_idle = cpuidle_idle_call;

		initialized = 1;

	}

}
@@ -143,8 +143,8 @@ void cpuidle_install_idle_handler(void) 
 */

void cpuidle_uninstall_idle_handler(void)

{

	if (enabled_devices && pm_idle_old && (pm_idle != pm_idle_old)) {

		pm_idle = pm_idle_old;

	if (enabled_devices) {

		initialized = 0;

		cpuidle_kick_cpus();

	}

}
@@ -440,8 +440,6 @@ static int __init cpuidle_init(void) 
	if (cpuidle_disabled())

		return -ENODEV;



	pm_idle_old = pm_idle;



	ret = cpuidle_add_class_sysfs(&cpu_sysdev_class);

	if (ret)

		return ret;