Commit bc83cccc761953f878088cdfa682de0970b5561f
1 parent
49553c2ef8
Exists in
master
and in
4 other branches
x86, mwait: Move mwait constants to a common header file
We have MWAIT constants spread across three different .c files, for no good reason. Move them all into a common header file. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> Reviewed-by: Arjan van de Ven <arjan@linux.intel.com> Cc: Len Brown <lenb@kernel.org> LKML-Reference: <tip-*@git.kernel.org>
Showing 4 changed files with 18 additions and 24 deletions Side-by-side Diff
arch/x86/include/asm/mwait.h
| 1 | +#ifndef _ASM_X86_MWAIT_H | |
| 2 | +#define _ASM_X86_MWAIT_H | |
| 3 | + | |
| 4 | +#define MWAIT_SUBSTATE_MASK 0xf | |
| 5 | +#define MWAIT_CSTATE_MASK 0xf | |
| 6 | +#define MWAIT_SUBSTATE_SIZE 4 | |
| 7 | +#define MWAIT_MAX_NUM_CSTATES 8 | |
| 8 | + | |
| 9 | +#define CPUID_MWAIT_LEAF 5 | |
| 10 | +#define CPUID5_ECX_EXTENSIONS_SUPPORTED 0x1 | |
| 11 | +#define CPUID5_ECX_INTERRUPT_BREAK 0x2 | |
| 12 | + | |
| 13 | +#define MWAIT_ECX_INTERRUPT_BREAK 0x1 | |
| 14 | + | |
| 15 | +#endif /* _ASM_X86_MWAIT_H */ |
arch/x86/kernel/acpi/cstate.c
| ... | ... | @@ -13,6 +13,7 @@ |
| 13 | 13 | |
| 14 | 14 | #include <acpi/processor.h> |
| 15 | 15 | #include <asm/acpi.h> |
| 16 | +#include <asm/mwait.h> | |
| 16 | 17 | |
| 17 | 18 | /* |
| 18 | 19 | * Initialize bm_flags based on the CPU cache properties |
| ... | ... | @@ -64,16 +65,6 @@ |
| 64 | 65 | static struct cstate_entry *cpu_cstate_entry; /* per CPU ptr */ |
| 65 | 66 | |
| 66 | 67 | static short mwait_supported[ACPI_PROCESSOR_MAX_POWER]; |
| 67 | - | |
| 68 | -#define MWAIT_SUBSTATE_MASK (0xf) | |
| 69 | -#define MWAIT_CSTATE_MASK (0xf) | |
| 70 | -#define MWAIT_SUBSTATE_SIZE (4) | |
| 71 | - | |
| 72 | -#define CPUID_MWAIT_LEAF (5) | |
| 73 | -#define CPUID5_ECX_EXTENSIONS_SUPPORTED (0x1) | |
| 74 | -#define CPUID5_ECX_INTERRUPT_BREAK (0x2) | |
| 75 | - | |
| 76 | -#define MWAIT_ECX_INTERRUPT_BREAK (0x1) | |
| 77 | 68 | |
| 78 | 69 | #define NATIVE_CSTATE_BEYOND_HALT (2) |
| 79 | 70 |
drivers/acpi/acpi_pad.c
| ... | ... | @@ -30,18 +30,13 @@ |
| 30 | 30 | #include <linux/slab.h> |
| 31 | 31 | #include <acpi/acpi_bus.h> |
| 32 | 32 | #include <acpi/acpi_drivers.h> |
| 33 | +#include <asm/mwait.h> | |
| 33 | 34 | |
| 34 | 35 | #define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad" |
| 35 | 36 | #define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator" |
| 36 | 37 | #define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80 |
| 37 | 38 | static DEFINE_MUTEX(isolated_cpus_lock); |
| 38 | 39 | |
| 39 | -#define MWAIT_SUBSTATE_MASK (0xf) | |
| 40 | -#define MWAIT_CSTATE_MASK (0xf) | |
| 41 | -#define MWAIT_SUBSTATE_SIZE (4) | |
| 42 | -#define CPUID_MWAIT_LEAF (5) | |
| 43 | -#define CPUID5_ECX_EXTENSIONS_SUPPORTED (0x1) | |
| 44 | -#define CPUID5_ECX_INTERRUPT_BREAK (0x2) | |
| 45 | 40 | static unsigned long power_saving_mwait_eax; |
| 46 | 41 | |
| 47 | 42 | static unsigned char tsc_detected_unstable; |
drivers/idle/intel_idle.c
| ... | ... | @@ -59,17 +59,10 @@ |
| 59 | 59 | #include <linux/hrtimer.h> /* ktime_get_real() */ |
| 60 | 60 | #include <trace/events/power.h> |
| 61 | 61 | #include <linux/sched.h> |
| 62 | +#include <asm/mwait.h> | |
| 62 | 63 | |
| 63 | 64 | #define INTEL_IDLE_VERSION "0.4" |
| 64 | 65 | #define PREFIX "intel_idle: " |
| 65 | - | |
| 66 | -#define MWAIT_SUBSTATE_MASK (0xf) | |
| 67 | -#define MWAIT_CSTATE_MASK (0xf) | |
| 68 | -#define MWAIT_SUBSTATE_SIZE (4) | |
| 69 | -#define MWAIT_MAX_NUM_CSTATES 8 | |
| 70 | -#define CPUID_MWAIT_LEAF (5) | |
| 71 | -#define CPUID5_ECX_EXTENSIONS_SUPPORTED (0x1) | |
| 72 | -#define CPUID5_ECX_INTERRUPT_BREAK (0x2) | |
| 73 | 66 | |
| 74 | 67 | static struct cpuidle_driver intel_idle_driver = { |
| 75 | 68 | .name = "intel_idle", |