x86/idle for v2.6.37
Subsystems (3)
Linus,
Please pull the latest x86-idle-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-idle-for-linus
out-of-topic modifications in x86-idle-for-linus:
-------------------------------------------------drivers/acpi/acpi_pad.c # bc83ccc: x86, mwait: Move mwait constantsdrivers/idle/intel_idle.c # bc83ccc: x86, mwait: Move mwait constants
Thanks,
Ingo
------------------>
H. Peter Anvin (4):
x86, mwait: Move mwait constants to a common header file x86, hotplug: Use mwait to offline a processor, fix the legacy case x86, hotplug: Move WBINVD back outside the play_dead loop x86, hotplug: In the MWAIT case of play_dead, CLFLUSH the cache line
arch/x86/include/asm/mwait.h | 15 +++++++ arch/x86/include/asm/processor.h | 23 ----------- arch/x86/kernel/acpi/cstate.c | 11 +----- arch/x86/kernel/smpboot.c | 80 +++++++++++++++++++++++++++++++++++++- drivers/acpi/acpi_pad.c | 7 +--- drivers/idle/intel_idle.c | 9 +---- 6 files changed, 97 insertions(+), 48 deletions(-) create mode 100644 arch/x86/include/asm/mwait.h
arch/x86/include/asm/mwait.h new file +15 -0
@@ -0,0 +1,15 @@ +#ifndef _ASM_X86_MWAIT_H +#define _ASM_X86_MWAIT_H + +#define MWAIT_SUBSTATE_MASK 0xf +#define MWAIT_CSTATE_MASK 0xf +#define MWAIT_SUBSTATE_SIZE 4 +#define MWAIT_MAX_NUM_CSTATES 8 + +#define CPUID_MWAIT_LEAF 5 +#define CPUID5_ECX_EXTENSIONS_SUPPORTED 0x1 +#define CPUID5_ECX_INTERRUPT_BREAK 0x2 + +#define MWAIT_ECX_INTERRUPT_BREAK 0x1 + +#endif /* _ASM_X86_MWAIT_H */
arch/x86/include/asm/processor.h +0 -23
@@ -764,29 +764,6 @@ extern unsigned long idle_halt;extern unsigned long idle_nomwait;extern bool c1e_detected; -/* -* on systems with caches, caches must be flashed as the absolute -* last instruction before going into a suspended halt. Otherwise, -* dirty data can linger in the cache and become stale on resume, -* leading to strange errors. -* -* perform a variety of operations to guarantee that the compiler -* will not reorder instructions. wbinvd itself is serializing -* so the processor will not reorder. -* -* Systems without cache can just go into halt. -*/ -static inline void wbinvd_halt (void ) -{ -mb (); -/* check for clflush to determine if wbinvd is legal */ -if (cpu_has_clflush) - asmvolatile ("cli; wbinvd; 1: hlt; jmp 1b" : : :"memory" ); -else -while (1 ) -halt (); -} -extern void enable_sep_cpu (void );extern int sysenter_setup (void );
arch/x86/kernel/acpi/cstate.c +1 -10
@@ -13,6 +13,7 @@#include <acpi/processor.h> #include <asm/acpi.h> +#include <asm/mwait.h> /* * Initialize bm_flags based on the CPU cache properties
@@ -65,16 +66,6 @@ static struct cstate_entry *cpu_cstate_entry; /* per CPU ptr */static short mwait_supported[ACPI_PROCESSOR_MAX_POWER ]; -#define MWAIT_SUBSTATE_MASK (0xf) -#define MWAIT_CSTATE_MASK (0xf) -#define MWAIT_SUBSTATE_SIZE (4) - -#define CPUID_MWAIT_LEAF (5) -#define CPUID5_ECX_EXTENSIONS_SUPPORTED (0x1) -#define CPUID5_ECX_INTERRUPT_BREAK (0x2) - -#define MWAIT_ECX_INTERRUPT_BREAK (0x1) -#define NATIVE_CSTATE_BEYOND_HALT (2)static long acpi_processor_ffh_cstate_probe_cpu (void *_cx)
arch/x86/kernel/smpboot.c +79 -1
96 lines not on this page · raw message
drivers/acpi/acpi_pad.c +1 -6
@@ -30,18 +30,13 @@#include <linux/slab.h> #include <acpi/acpi_bus.h> #include <acpi/acpi_drivers.h> +#include <asm/mwait.h> #define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad"#define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator"#define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80static DEFINE_MUTEX (isolated_cpus_lock); -#define MWAIT_SUBSTATE_MASK (0xf) -#define MWAIT_CSTATE_MASK (0xf) -#define MWAIT_SUBSTATE_SIZE (4) -#define CPUID_MWAIT_LEAF (5) -#define CPUID5_ECX_EXTENSIONS_SUPPORTED (0x1) -#define CPUID5_ECX_INTERRUPT_BREAK (0x2)static unsigned long power_saving_mwait_eax;static unsigned char tsc_detected_unstable;
drivers/idle/intel_idle.c +1 -8
@@ -59,18 +59,11 @@#include <linux/hrtimer.h> /* ktime_get_real() */ #include <trace/events/power.h> #include <linux/sched.h> +#include <asm/mwait.h> #define INTEL_IDLE_VERSION "0.4"#define PREFIX "intel_idle: " -#define MWAIT_SUBSTATE_MASK (0xf) -#define MWAIT_CSTATE_MASK (0xf) -#define MWAIT_SUBSTATE_SIZE (4) -#define MWAIT_MAX_NUM_CSTATES 8 -#define CPUID_MWAIT_LEAF (5) -#define CPUID5_ECX_EXTENSIONS_SUPPORTED (0x1) -#define CPUID5_ECX_INTERRUPT_BREAK (0x2) -static struct cpuidle_driver intel_idle_driver = { .name ="intel_idle" , .owner =THIS_MODULE ,