Commit a0bfa137 authored by Len Brown's avatar Len Brown

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
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/random.h> #include <linux/random.h>
#include <linux/hw_breakpoint.h> #include <linux/hw_breakpoint.h>
#include <linux/cpuidle.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/leds.h> #include <asm/leds.h>
...@@ -196,6 +197,7 @@ void cpu_idle(void) ...@@ -196,6 +197,7 @@ void cpu_idle(void)
cpu_relax(); cpu_relax();
} else { } else {
stop_critical_timings(); stop_critical_timings();
if (cpuidle_call_idle())
pm_idle(); pm_idle();
start_critical_timings(); start_critical_timings();
/* /*
......
...@@ -16,12 +16,13 @@ ...@@ -16,12 +16,13 @@
#include <linux/thread_info.h> #include <linux/thread_info.h>
#include <linux/irqflags.h> #include <linux/irqflags.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/cpuidle.h>
#include <asm/pgalloc.h> #include <asm/pgalloc.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/atomic.h> #include <asm/atomic.h>
#include <asm/smp.h> #include <asm/smp.h>
void (*pm_idle)(void) = NULL; static void (*pm_idle)(void);
static int hlt_counter; static int hlt_counter;
...@@ -100,6 +101,7 @@ void cpu_idle(void) ...@@ -100,6 +101,7 @@ void cpu_idle(void)
local_irq_disable(); local_irq_disable();
/* Don't trace irqs off for idle */ /* Don't trace irqs off for idle */
stop_critical_timings(); stop_critical_timings();
if (cpuidle_call_idle())
pm_idle(); pm_idle();
/* /*
* Sanity check to ensure that pm_idle() returns * Sanity check to ensure that pm_idle() returns
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/kdebug.h> #include <linux/kdebug.h>
#include <linux/cpuidle.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/system.h> #include <asm/system.h>
...@@ -109,6 +110,7 @@ void cpu_idle(void) ...@@ -109,6 +110,7 @@ void cpu_idle(void)
local_irq_disable(); local_irq_disable();
/* Don't trace irqs off for idle */ /* Don't trace irqs off for idle */
stop_critical_timings(); stop_critical_timings();
if (cpuidle_idle_call())
pm_idle(); pm_idle();
start_critical_timings(); start_critical_timings();
} }
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/ftrace.h> #include <linux/ftrace.h>
#include <linux/cpuidle.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/system.h> #include <asm/system.h>
...@@ -136,6 +137,7 @@ void cpu_idle(void) ...@@ -136,6 +137,7 @@ void cpu_idle(void)
enter_idle(); enter_idle();
/* Don't trace irqs off for idle */ /* Don't trace irqs off for idle */
stop_critical_timings(); stop_critical_timings();
if (cpuidle_idle_call())
pm_idle(); pm_idle();
start_critical_timings(); start_critical_timings();
......
...@@ -25,10 +25,10 @@ DEFINE_PER_CPU(struct cpuidle_device *, cpuidle_devices); ...@@ -25,10 +25,10 @@ DEFINE_PER_CPU(struct cpuidle_device *, cpuidle_devices);
DEFINE_MUTEX(cpuidle_lock); DEFINE_MUTEX(cpuidle_lock);
LIST_HEAD(cpuidle_detected_devices); LIST_HEAD(cpuidle_detected_devices);
static void (*pm_idle_old)(void);
static int enabled_devices; static int enabled_devices;
static int off __read_mostly; static int off __read_mostly;
static int initialized __read_mostly;
int cpuidle_disabled(void) int cpuidle_disabled(void)
{ {
...@@ -56,25 +56,23 @@ static int __cpuidle_register_device(struct cpuidle_device *dev); ...@@ -56,25 +56,23 @@ static int __cpuidle_register_device(struct cpuidle_device *dev);
* cpuidle_idle_call - the main idle loop * cpuidle_idle_call - the main idle loop
* *
* NOTE: no locks or semaphores should be used here * 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_device *dev = __this_cpu_read(cpuidle_devices);
struct cpuidle_state *target_state; struct cpuidle_state *target_state;
int next_state; int next_state;
if (off)
return -ENODEV;
if (!initialized)
return -ENODEV;
/* check if the device is ready */ /* check if the device is ready */
if (!dev || !dev->enabled) { if (!dev || !dev->enabled)
if (pm_idle_old) return -EBUSY;
pm_idle_old();
else
#if defined(CONFIG_ARCH_HAS_DEFAULT_IDLE)
default_idle();
#else
local_irq_enable();
#endif
return;
}
#if 0 #if 0
/* shows regressions, re-enable for 2.6.29 */ /* shows regressions, re-enable for 2.6.29 */
...@@ -99,7 +97,7 @@ static void cpuidle_idle_call(void) ...@@ -99,7 +97,7 @@ static void cpuidle_idle_call(void)
next_state = cpuidle_curr_governor->select(dev); next_state = cpuidle_curr_governor->select(dev);
if (need_resched()) { if (need_resched()) {
local_irq_enable(); local_irq_enable();
return; return 0;
} }
target_state = &dev->states[next_state]; target_state = &dev->states[next_state];
...@@ -124,6 +122,8 @@ static void cpuidle_idle_call(void) ...@@ -124,6 +122,8 @@ static void cpuidle_idle_call(void)
/* give the governor an opportunity to reflect on the outcome */ /* give the governor an opportunity to reflect on the outcome */
if (cpuidle_curr_governor->reflect) if (cpuidle_curr_governor->reflect)
cpuidle_curr_governor->reflect(dev); cpuidle_curr_governor->reflect(dev);
return 0;
} }
/** /**
...@@ -131,10 +131,10 @@ static void cpuidle_idle_call(void) ...@@ -131,10 +131,10 @@ static void cpuidle_idle_call(void)
*/ */
void cpuidle_install_idle_handler(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 */ /* Make sure all changes finished before we switch to new idle */
smp_wmb(); smp_wmb();
pm_idle = cpuidle_idle_call; initialized = 1;
} }
} }
...@@ -143,8 +143,8 @@ void cpuidle_install_idle_handler(void) ...@@ -143,8 +143,8 @@ void cpuidle_install_idle_handler(void)
*/ */
void cpuidle_uninstall_idle_handler(void) void cpuidle_uninstall_idle_handler(void)
{ {
if (enabled_devices && pm_idle_old && (pm_idle != pm_idle_old)) { if (enabled_devices) {
pm_idle = pm_idle_old; initialized = 0;
cpuidle_kick_cpus(); cpuidle_kick_cpus();
} }
} }
...@@ -440,8 +440,6 @@ static int __init cpuidle_init(void) ...@@ -440,8 +440,6 @@ static int __init cpuidle_init(void)
if (cpuidle_disabled()) if (cpuidle_disabled())
return -ENODEV; return -ENODEV;
pm_idle_old = pm_idle;
ret = cpuidle_add_class_sysfs(&cpu_sysdev_class); ret = cpuidle_add_class_sysfs(&cpu_sysdev_class);
if (ret) if (ret)
return ret; return ret;
......
...@@ -123,6 +123,7 @@ struct cpuidle_driver { ...@@ -123,6 +123,7 @@ struct cpuidle_driver {
#ifdef CONFIG_CPU_IDLE #ifdef CONFIG_CPU_IDLE
extern void disable_cpuidle(void); extern void disable_cpuidle(void);
extern int cpuidle_idle_call(void);
extern int cpuidle_register_driver(struct cpuidle_driver *drv); extern int cpuidle_register_driver(struct cpuidle_driver *drv);
struct cpuidle_driver *cpuidle_get_driver(void); struct cpuidle_driver *cpuidle_get_driver(void);
...@@ -137,6 +138,7 @@ extern void cpuidle_disable_device(struct cpuidle_device *dev); ...@@ -137,6 +138,7 @@ extern void cpuidle_disable_device(struct cpuidle_device *dev);
#else #else
static inline void disable_cpuidle(void) { } static inline void disable_cpuidle(void) { }
static inline int cpuidle_idle_call(void) { return -ENODEV; }
static inline int cpuidle_register_driver(struct cpuidle_driver *drv) static inline int cpuidle_register_driver(struct cpuidle_driver *drv)
{return -ENODEV; } {return -ENODEV; }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment