x86/cpufeature tree changes for v3.18
Linus,
Please pull the latest x86-cpufeature-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-cpufeature-for-linus
# HEAD: 9298b815efe500b272e4084ed05eeae7a92b5340 x86: Add more disabled features
This tree includes the following changes:
- Introduce DISABLED_MASK to list disabled CPU features, to simplify CPU feature handling and avoid excessive #ifdefs
- Remove the lightly used cpu_has_pae() primitive
Thanks,
Ingo
------------------>
Dave Hansen (3):
x86: Axe the lightly-used cpu_has_pae
x86: Introduce disabled-features
x86: Add more disabled features
arch/x86/boot/mkcpustr.c | 1 + arch/x86/include/asm/cpufeature.h | 52 +++++++++++++++++--------------- arch/x86/include/asm/disabled-features.h | 39 ++++++++++++++++++++++++ arch/x86/kernel/cpu/common.c | 2 +- arch/x86/kernel/cpu/mtrr/main.c | 6 ++-- arch/x86/kernel/machine_kexec_32.c | 3 +- 6 files changed, 74 insertions(+), 29 deletions(-) create mode 100644 arch/x86/include/asm/disabled-features.h
arch/x86/boot/mkcpustr.c +1 -0
@@ -16,6 +16,7 @@#include <stdio.h> #include "../include/asm/required-features.h" +#include "../include/asm/disabled-features.h" #include "../include/asm/cpufeature.h" #include "../kernel/cpu/capflags.c"
arch/x86/include/asm/cpufeature.h +28 -24
91 lines not on this page · raw message
arch/x86/include/asm/disabled-features.h new file +39 -0
@@ -0,0 +1,39 @@ +#ifndef _ASM_X86_DISABLED_FEATURES_H +#define _ASM_X86_DISABLED_FEATURES_H + +/* These features, although they might be available in a CPU +* will not be used because the compile options to support +* them are not present. +* +* This code allows them to be checked and disabled at +* compile time without an explicit #ifdef. Use +* cpu_feature_enabled(). +*/ + +#ifdef CONFIG_X86_64 +# define DISABLE_VME (1<<(X86_FEATURE_VME & 31)) +# define DISABLE_K6_MTRR (1<<(X86_FEATURE_K6_MTRR & 31)) +# define DISABLE_CYRIX_ARR (1<<(X86_FEATURE_CYRIX_ARR & 31)) +# define DISABLE_CENTAUR_MCR (1<<(X86_FEATURE_CENTAUR_MCR & 31)) +#else +# define DISABLE_VME 0 +# define DISABLE_K6_MTRR 0 +# define DISABLE_CYRIX_ARR 0 +# define DISABLE_CENTAUR_MCR 0 +#endif /* CONFIG_X86_64 */ + +/* +* Make sure to add features to the correct mask +*/ +#define DISABLED_MASK0 (DISABLE_VME) +#define DISABLED_MASK1 0 +#define DISABLED_MASK2 0 +#define DISABLED_MASK3 (DISABLE_CYRIX_ARR|DISABLE_CENTAUR_MCR|DISABLE_K6_MTRR) +#define DISABLED_MASK4 0 +#define DISABLED_MASK5 0 +#define DISABLED_MASK6 0 +#define DISABLED_MASK7 0 +#define DISABLED_MASK8 0 +#define DISABLED_MASK9 0 + +#endif /* _ASM_X86_DISABLED_FEATURES_H */
arch/x86/kernel/cpu/common.c +1 -1
@@ -1391,7 +1391,7 @@ void cpu_init(void)printk (KERN_INFO "Initializing CPU#%d\n" , cpu); -if (cpu_has_vme || cpu_has_tsc || cpu_has_de) +if (cpu_feature_enabled (X86_FEATURE_VME ) || cpu_has_tsc || cpu_has_de)clear_in_cr4 (X86_CR4_VME |X86_CR4_PVI |X86_CR4_TSD |X86_CR4_DE );load_current_idt ();
arch/x86/kernel/cpu/mtrr/main.c +3 -3
@@ -707,7 +707,7 @@ void __init mtrr_bp_init(void) }else {switch (boot_cpu_data.x86_vendor) {case X86_VENDOR_AMD : -if (cpu_has_k6_mtrr) { +if (cpu_feature_enabled (X86_FEATURE_K6_MTRR )) {/* Pre-Athlon (K6) AMD CPU MTRRs */ mtrr_if = mtrr_ops[X86_VENDOR_AMD ]; size_or_mask =SIZE_OR_MASK_BITS (32 );
@@ -715,14 +715,14 @@ void __init mtrr_bp_init(void) }break ;case X86_VENDOR_CENTAUR : -if (cpu_has_centaur_mcr) { +if (cpu_feature_enabled (X86_FEATURE_CENTAUR_MCR )) { mtrr_if = mtrr_ops[X86_VENDOR_CENTAUR ]; size_or_mask =SIZE_OR_MASK_BITS (32 ); size_and_mask =0 ; }break ;case X86_VENDOR_CYRIX : -if (cpu_has_cyrix_arr) { +if (cpu_feature_enabled (X86_FEATURE_CYRIX_ARR )) { mtrr_if = mtrr_ops[X86_VENDOR_CYRIX ]; size_or_mask =SIZE_OR_MASK_BITS (32 ); size_and_mask =0 ;
arch/x86/kernel/machine_kexec_32.c +2 -1
@@ -247,7 +247,8 @@ void machine_kexec(struct kimage *image)/* now call it */ image->start =relocate_kernel_ptr ((unsigned long )image->head, (unsigned long )page_list, - image->start, cpu_has_pae, + image->start, +boot_cpu_has (X86_FEATURE_PAE ), image->preserve_context);#ifdef CONFIG_KEXEC_JUMP