Commit e4f2e5ea authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6

* 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:
  intel_idle: native hardware cpuidle driver for latest Intel processors
  ACPI: acpi_idle: touch TS_POLLING only in the non-MWAIT case
  acpi_pad: uses MONITOR/MWAIT, so it doesn't need to clear TS_POLLING
  sched: clarify commment for TS_POLLING
  ACPI: allow a native cpuidle driver to displace ACPI
  cpuidle: make cpuidle_curr_driver static
  cpuidle: add cpuidle_unregister_driver() error check
  cpuidle: fail to register if !CONFIG_CPU_IDLE
parents 9a90e098 26717172
...@@ -2887,6 +2887,13 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git ...@@ -2887,6 +2887,13 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git
S: Maintained S: Maintained
F: drivers/input/ F: drivers/input/
INTEL IDLE DRIVER
M: Len Brown <lenb@kernel.org>
L: linux-pm@lists.linux-foundation.org
T: git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6.git
S: Supported
F: drivers/idle/intel_idle.c
INTEL FRAMEBUFFER DRIVER (excluding 810 and 815) INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)
M: Maik Broemme <mbroemme@plusserver.de> M: Maik Broemme <mbroemme@plusserver.de>
L: linux-fbdev@vger.kernel.org L: linux-fbdev@vger.kernel.org
......
...@@ -239,8 +239,8 @@ static inline struct thread_info *current_thread_info(void) ...@@ -239,8 +239,8 @@ static inline struct thread_info *current_thread_info(void)
#define TS_USEDFPU 0x0001 /* FPU was used by this task #define TS_USEDFPU 0x0001 /* FPU was used by this task
this quantum (SMP) */ this quantum (SMP) */
#define TS_COMPAT 0x0002 /* 32bit syscall active (64BIT)*/ #define TS_COMPAT 0x0002 /* 32bit syscall active (64BIT)*/
#define TS_POLLING 0x0004 /* true if in idle loop #define TS_POLLING 0x0004 /* idle task polling need_resched,
and not sleeping */ skip sending interrupt */
#define TS_RESTORE_SIGMASK 0x0008 /* restore signal mask in do_signal() */ #define TS_RESTORE_SIGMASK 0x0008 /* restore signal mask in do_signal() */
#define tsk_is_polling(t) (task_thread_info(t)->status & TS_POLLING) #define tsk_is_polling(t) (task_thread_info(t)->status & TS_POLLING)
......
...@@ -10,6 +10,7 @@ obj-$(CONFIG_PCI) += pci/ ...@@ -10,6 +10,7 @@ obj-$(CONFIG_PCI) += pci/
obj-$(CONFIG_PARISC) += parisc/ obj-$(CONFIG_PARISC) += parisc/
obj-$(CONFIG_RAPIDIO) += rapidio/ obj-$(CONFIG_RAPIDIO) += rapidio/
obj-y += video/ obj-y += video/
obj-y += idle/
obj-$(CONFIG_ACPI) += acpi/ obj-$(CONFIG_ACPI) += acpi/
obj-$(CONFIG_SFI) += sfi/ obj-$(CONFIG_SFI) += sfi/
# PnP must come after ACPI since it will eventually need to check if acpi # PnP must come after ACPI since it will eventually need to check if acpi
...@@ -91,7 +92,6 @@ obj-$(CONFIG_EISA) += eisa/ ...@@ -91,7 +92,6 @@ obj-$(CONFIG_EISA) += eisa/
obj-y += lguest/ obj-y += lguest/
obj-$(CONFIG_CPU_FREQ) += cpufreq/ obj-$(CONFIG_CPU_FREQ) += cpufreq/
obj-$(CONFIG_CPU_IDLE) += cpuidle/ obj-$(CONFIG_CPU_IDLE) += cpuidle/
obj-y += idle/
obj-$(CONFIG_MMC) += mmc/ obj-$(CONFIG_MMC) += mmc/
obj-$(CONFIG_MEMSTICK) += memstick/ obj-$(CONFIG_MEMSTICK) += memstick/
obj-$(CONFIG_NEW_LEDS) += leds/ obj-$(CONFIG_NEW_LEDS) += leds/
......
...@@ -172,13 +172,6 @@ static int power_saving_thread(void *data) ...@@ -172,13 +172,6 @@ static int power_saving_thread(void *data)
do_sleep = 0; do_sleep = 0;
current_thread_info()->status &= ~TS_POLLING;
/*
* TS_POLLING-cleared state must be visible before we test
* NEED_RESCHED:
*/
smp_mb();
expire_time = jiffies + HZ * (100 - idle_pct) / 100; expire_time = jiffies + HZ * (100 - idle_pct) / 100;
while (!need_resched()) { while (!need_resched()) {
...@@ -209,8 +202,6 @@ static int power_saving_thread(void *data) ...@@ -209,8 +202,6 @@ static int power_saving_thread(void *data)
} }
} }
current_thread_info()->status |= TS_POLLING;
/* /*
* current sched_rt has threshold for rt task running time. * current sched_rt has threshold for rt task running time.
* When a rt task uses 95% CPU time, the rt thread will be * When a rt task uses 95% CPU time, the rt thread will be
......
...@@ -616,6 +616,7 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device) ...@@ -616,6 +616,7 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
acpi_processor_get_limit_info(pr); acpi_processor_get_limit_info(pr);
if (cpuidle_get_driver() == &acpi_idle_driver)
acpi_processor_power_init(pr, device); acpi_processor_power_init(pr, device);
pr->cdev = thermal_cooling_device_register("Processor", device, pr->cdev = thermal_cooling_device_register("Processor", device,
...@@ -920,9 +921,14 @@ static int __init acpi_processor_init(void) ...@@ -920,9 +921,14 @@ static int __init acpi_processor_init(void)
if (!acpi_processor_dir) if (!acpi_processor_dir)
return -ENOMEM; return -ENOMEM;
#endif #endif
result = cpuidle_register_driver(&acpi_idle_driver);
if (result < 0) if (!cpuidle_register_driver(&acpi_idle_driver)) {
goto out_proc; printk(KERN_DEBUG "ACPI: %s registered with cpuidle\n",
acpi_idle_driver.name);
} else {
printk(KERN_DEBUG "ACPI: acpi_idle yielding to %s",
cpuidle_get_driver()->name);
}
result = acpi_bus_register_driver(&acpi_processor_driver); result = acpi_bus_register_driver(&acpi_processor_driver);
if (result < 0) if (result < 0)
...@@ -941,7 +947,6 @@ static int __init acpi_processor_init(void) ...@@ -941,7 +947,6 @@ static int __init acpi_processor_init(void)
out_cpuidle: out_cpuidle:
cpuidle_unregister_driver(&acpi_idle_driver); cpuidle_unregister_driver(&acpi_idle_driver);
out_proc:
#ifdef CONFIG_ACPI_PROCFS #ifdef CONFIG_ACPI_PROCFS
remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir); remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir);
#endif #endif
......
...@@ -872,6 +872,7 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev, ...@@ -872,6 +872,7 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
return(acpi_idle_enter_c1(dev, state)); return(acpi_idle_enter_c1(dev, state));
local_irq_disable(); local_irq_disable();
if (cx->entry_method != ACPI_CSTATE_FFH) { if (cx->entry_method != ACPI_CSTATE_FFH) {
current_thread_info()->status &= ~TS_POLLING; current_thread_info()->status &= ~TS_POLLING;
/* /*
...@@ -879,13 +880,13 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev, ...@@ -879,13 +880,13 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
* NEED_RESCHED: * NEED_RESCHED:
*/ */
smp_mb(); smp_mb();
}
if (unlikely(need_resched())) { if (unlikely(need_resched())) {
current_thread_info()->status |= TS_POLLING; current_thread_info()->status |= TS_POLLING;
local_irq_enable(); local_irq_enable();
return 0; return 0;
} }
}
/* /*
* Must be done before busmaster disable as we might need to * Must be done before busmaster disable as we might need to
...@@ -911,6 +912,7 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev, ...@@ -911,6 +912,7 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
sched_clock_idle_wakeup_event(idle_time_ns); sched_clock_idle_wakeup_event(idle_time_ns);
local_irq_enable(); local_irq_enable();
if (cx->entry_method != ACPI_CSTATE_FFH)
current_thread_info()->status |= TS_POLLING; current_thread_info()->status |= TS_POLLING;
cx->usage++; cx->usage++;
...@@ -962,6 +964,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev, ...@@ -962,6 +964,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
} }
local_irq_disable(); local_irq_disable();
if (cx->entry_method != ACPI_CSTATE_FFH) { if (cx->entry_method != ACPI_CSTATE_FFH) {
current_thread_info()->status &= ~TS_POLLING; current_thread_info()->status &= ~TS_POLLING;
/* /*
...@@ -969,13 +972,13 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev, ...@@ -969,13 +972,13 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
* NEED_RESCHED: * NEED_RESCHED:
*/ */
smp_mb(); smp_mb();
}
if (unlikely(need_resched())) { if (unlikely(need_resched())) {
current_thread_info()->status |= TS_POLLING; current_thread_info()->status |= TS_POLLING;
local_irq_enable(); local_irq_enable();
return 0; return 0;
} }
}
acpi_unlazy_tlb(smp_processor_id()); acpi_unlazy_tlb(smp_processor_id());
...@@ -1028,6 +1031,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev, ...@@ -1028,6 +1031,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
sched_clock_idle_wakeup_event(idle_time_ns); sched_clock_idle_wakeup_event(idle_time_ns);
local_irq_enable(); local_irq_enable();
if (cx->entry_method != ACPI_CSTATE_FFH)
current_thread_info()->status |= TS_POLLING; current_thread_info()->status |= TS_POLLING;
cx->usage++; cx->usage++;
......
...@@ -156,7 +156,7 @@ int cpuidle_enable_device(struct cpuidle_device *dev) ...@@ -156,7 +156,7 @@ int cpuidle_enable_device(struct cpuidle_device *dev)
if (dev->enabled) if (dev->enabled)
return 0; return 0;
if (!cpuidle_curr_driver || !cpuidle_curr_governor) if (!cpuidle_get_driver() || !cpuidle_curr_governor)
return -EIO; return -EIO;
if (!dev->state_count) if (!dev->state_count)
return -EINVAL; return -EINVAL;
...@@ -207,7 +207,7 @@ void cpuidle_disable_device(struct cpuidle_device *dev) ...@@ -207,7 +207,7 @@ void cpuidle_disable_device(struct cpuidle_device *dev)
{ {
if (!dev->enabled) if (!dev->enabled)
return; return;
if (!cpuidle_curr_driver || !cpuidle_curr_governor) if (!cpuidle_get_driver() || !cpuidle_curr_governor)
return; return;
dev->enabled = 0; dev->enabled = 0;
...@@ -271,10 +271,11 @@ static int __cpuidle_register_device(struct cpuidle_device *dev) ...@@ -271,10 +271,11 @@ static int __cpuidle_register_device(struct cpuidle_device *dev)
{ {
int ret; int ret;
struct sys_device *sys_dev = get_cpu_sysdev((unsigned long)dev->cpu); struct sys_device *sys_dev = get_cpu_sysdev((unsigned long)dev->cpu);
struct cpuidle_driver *cpuidle_driver = cpuidle_get_driver();
if (!sys_dev) if (!sys_dev)
return -EINVAL; return -EINVAL;
if (!try_module_get(cpuidle_curr_driver->owner)) if (!try_module_get(cpuidle_driver->owner))
return -EINVAL; return -EINVAL;
init_completion(&dev->kobj_unregister); init_completion(&dev->kobj_unregister);
...@@ -284,7 +285,7 @@ static int __cpuidle_register_device(struct cpuidle_device *dev) ...@@ -284,7 +285,7 @@ static int __cpuidle_register_device(struct cpuidle_device *dev)
per_cpu(cpuidle_devices, dev->cpu) = dev; per_cpu(cpuidle_devices, dev->cpu) = dev;
list_add(&dev->device_list, &cpuidle_detected_devices); list_add(&dev->device_list, &cpuidle_detected_devices);
if ((ret = cpuidle_add_sysfs(sys_dev))) { if ((ret = cpuidle_add_sysfs(sys_dev))) {
module_put(cpuidle_curr_driver->owner); module_put(cpuidle_driver->owner);
return ret; return ret;
} }
...@@ -325,6 +326,7 @@ EXPORT_SYMBOL_GPL(cpuidle_register_device); ...@@ -325,6 +326,7 @@ EXPORT_SYMBOL_GPL(cpuidle_register_device);
void cpuidle_unregister_device(struct cpuidle_device *dev) void cpuidle_unregister_device(struct cpuidle_device *dev)
{ {
struct sys_device *sys_dev = get_cpu_sysdev((unsigned long)dev->cpu); struct sys_device *sys_dev = get_cpu_sysdev((unsigned long)dev->cpu);
struct cpuidle_driver *cpuidle_driver = cpuidle_get_driver();
if (dev->registered == 0) if (dev->registered == 0)
return; return;
...@@ -340,7 +342,7 @@ void cpuidle_unregister_device(struct cpuidle_device *dev) ...@@ -340,7 +342,7 @@ void cpuidle_unregister_device(struct cpuidle_device *dev)
cpuidle_resume_and_unlock(); cpuidle_resume_and_unlock();
module_put(cpuidle_curr_driver->owner); module_put(cpuidle_driver->owner);
} }
EXPORT_SYMBOL_GPL(cpuidle_unregister_device); EXPORT_SYMBOL_GPL(cpuidle_unregister_device);
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
/* For internal use only */ /* For internal use only */
extern struct cpuidle_governor *cpuidle_curr_governor; extern struct cpuidle_governor *cpuidle_curr_governor;
extern struct cpuidle_driver *cpuidle_curr_driver;
extern struct list_head cpuidle_governors; extern struct list_head cpuidle_governors;
extern struct list_head cpuidle_detected_devices; extern struct list_head cpuidle_detected_devices;
extern struct mutex cpuidle_lock; extern struct mutex cpuidle_lock;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include "cpuidle.h" #include "cpuidle.h"
struct cpuidle_driver *cpuidle_curr_driver; static struct cpuidle_driver *cpuidle_curr_driver;
DEFINE_SPINLOCK(cpuidle_driver_lock); DEFINE_SPINLOCK(cpuidle_driver_lock);
/** /**
...@@ -39,14 +39,26 @@ int cpuidle_register_driver(struct cpuidle_driver *drv) ...@@ -39,14 +39,26 @@ int cpuidle_register_driver(struct cpuidle_driver *drv)
EXPORT_SYMBOL_GPL(cpuidle_register_driver); EXPORT_SYMBOL_GPL(cpuidle_register_driver);
/**
* cpuidle_get_driver - return the current driver
*/
struct cpuidle_driver *cpuidle_get_driver(void)
{
return cpuidle_curr_driver;
}
EXPORT_SYMBOL_GPL(cpuidle_get_driver);
/** /**
* cpuidle_unregister_driver - unregisters a driver * cpuidle_unregister_driver - unregisters a driver
* @drv: the driver * @drv: the driver
*/ */
void cpuidle_unregister_driver(struct cpuidle_driver *drv) void cpuidle_unregister_driver(struct cpuidle_driver *drv)
{ {
if (!drv) if (drv != cpuidle_curr_driver) {
WARN(1, "invalid cpuidle_unregister_driver(%s)\n",
drv->name);
return; return;
}
spin_lock(&cpuidle_driver_lock); spin_lock(&cpuidle_driver_lock);
cpuidle_curr_driver = NULL; cpuidle_curr_driver = NULL;
......
...@@ -47,10 +47,11 @@ static ssize_t show_current_driver(struct sysdev_class *class, ...@@ -47,10 +47,11 @@ static ssize_t show_current_driver(struct sysdev_class *class,
char *buf) char *buf)
{ {
ssize_t ret; ssize_t ret;
struct cpuidle_driver *cpuidle_driver = cpuidle_get_driver();
spin_lock(&cpuidle_driver_lock); spin_lock(&cpuidle_driver_lock);
if (cpuidle_curr_driver) if (cpuidle_driver)
ret = sprintf(buf, "%s\n", cpuidle_curr_driver->name); ret = sprintf(buf, "%s\n", cpuidle_driver->name);
else else
ret = sprintf(buf, "none\n"); ret = sprintf(buf, "none\n");
spin_unlock(&cpuidle_driver_lock); spin_unlock(&cpuidle_driver_lock);
......
config INTEL_IDLE
tristate "Cpuidle Driver for Intel Processors"
depends on CPU_IDLE
depends on X86
depends on CPU_SUP_INTEL
depends on EXPERIMENTAL
help
Enable intel_idle, a cpuidle driver that includes knowledge of
native Intel hardware idle features. The acpi_idle driver
can be configured at the same time, in order to handle
processors intel_idle does not support.
menu "Memory power savings" menu "Memory power savings"
depends on X86_64 depends on X86_64
......
obj-$(CONFIG_I7300_IDLE) += i7300_idle.o obj-$(CONFIG_I7300_IDLE) += i7300_idle.o
obj-$(CONFIG_INTEL_IDLE) += intel_idle.o
This diff is collapsed.
...@@ -125,6 +125,7 @@ struct cpuidle_driver { ...@@ -125,6 +125,7 @@ struct cpuidle_driver {
#ifdef CONFIG_CPU_IDLE #ifdef CONFIG_CPU_IDLE
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);
extern void cpuidle_unregister_driver(struct cpuidle_driver *drv); extern void cpuidle_unregister_driver(struct cpuidle_driver *drv);
extern int cpuidle_register_device(struct cpuidle_device *dev); extern int cpuidle_register_device(struct cpuidle_device *dev);
extern void cpuidle_unregister_device(struct cpuidle_device *dev); extern void cpuidle_unregister_device(struct cpuidle_device *dev);
...@@ -137,16 +138,17 @@ extern void cpuidle_disable_device(struct cpuidle_device *dev); ...@@ -137,16 +138,17 @@ extern void cpuidle_disable_device(struct cpuidle_device *dev);
#else #else
static inline int cpuidle_register_driver(struct cpuidle_driver *drv) static inline int cpuidle_register_driver(struct cpuidle_driver *drv)
{return 0;} {return -ENODEV; }
static inline struct cpuidle_driver *cpuidle_get_driver(void) {return NULL; }
static inline void cpuidle_unregister_driver(struct cpuidle_driver *drv) { } static inline void cpuidle_unregister_driver(struct cpuidle_driver *drv) { }
static inline int cpuidle_register_device(struct cpuidle_device *dev) static inline int cpuidle_register_device(struct cpuidle_device *dev)
{return 0;} {return -ENODEV; }
static inline void cpuidle_unregister_device(struct cpuidle_device *dev) { } static inline void cpuidle_unregister_device(struct cpuidle_device *dev) { }
static inline void cpuidle_pause_and_lock(void) { } static inline void cpuidle_pause_and_lock(void) { }
static inline void cpuidle_resume_and_unlock(void) { } static inline void cpuidle_resume_and_unlock(void) { }
static inline int cpuidle_enable_device(struct cpuidle_device *dev) static inline int cpuidle_enable_device(struct cpuidle_device *dev)
{return 0;} {return -ENODEV; }
static inline void cpuidle_disable_device(struct cpuidle_device *dev) { } static inline void cpuidle_disable_device(struct cpuidle_device *dev) { }
#endif #endif
......
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