x86/cpu for v2.6.37
Linus,
Please pull the latest x86-cpu-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-cpu-for-linus
Thanks,
Ingo
------------------>
Andre Przywara (4):
x86, cpu: Fix renamed, not-yet-shipping AMD CPUID feature bit x86, cpu: Update AMD CPUID feature bits
x86, cpu: Fix allowed CPUID bits for KVM guests x86, kvm: add new AMD SVM feature bits
Andreas Herrmann (1):
x86, AMD: Remove needless CPU family check (for L3 cache info)
Borislav Petkov (2):
x86, tsc: Remove CPU frequency calibration on AMD x86, cpu: Fix X86_FEATURE_NOPL
H. Peter Anvin (1):
x86, cpu: Re-run get_cpu_cap() after adjusting the CPUID level
arch/x86/include/asm/cpufeature.h | 13 +++++++- arch/x86/kernel/cpu/amd.c | 19 +++++++++++- arch/x86/kernel/cpu/common.c | 17 +++++++---- arch/x86/kernel/cpu/cpu.h | 1 + arch/x86/kernel/cpu/intel.c | 1 + arch/x86/kernel/cpu/scattered.c | 6 ++++ arch/x86/kernel/tsc.c | 58 ------------------------------------- arch/x86/kvm/x86.c | 7 ++-- 8 files changed, 53 insertions(+), 69 deletions(-)
arch/x86/include/asm/cpufeature.h +12 -1
@@ -152,10 +152,14 @@#define X86_FEATURE_3DNOWPREFETCH (6*32+ 8)/* 3DNow prefetch instructions */ #define X86_FEATURE_OSVW (6*32+ 9)/* OS Visible Workaround */ #define X86_FEATURE_IBS (6*32+10)/* Instruction Based Sampling */ -#define X86_FEATURE_SSE5 (6*32+11)/* SSE-5 */ +#define X86_FEATURE_XOP (6*32+11)/* extended AVX instructions */ #define X86_FEATURE_SKINIT (6*32+12)/* SKINIT/STGI instructions */ #define X86_FEATURE_WDT (6*32+13)/* Watchdog timer */ +#define X86_FEATURE_LWP (6*32+15)/* Light Weight Profiling */ +#define X86_FEATURE_FMA4 (6*32+16)/* 4 operands MAC instructions */ #define X86_FEATURE_NODEID_MSR (6*32+19)/* NodeId MSR */ +#define X86_FEATURE_TBM (6*32+21)/* trailing bit manipulations */ +#define X86_FEATURE_TOPOEXT (6*32+22)/* topology extensions CPUID leafs */ /* * Auxiliary flags: Linux defined - For features scattered in various
@@ -179,6 +183,13 @@#define X86_FEATURE_LBRV (8*32+ 6)/* AMD LBR Virtualization support */ #define X86_FEATURE_SVML (8*32+ 7)/* "svm_lock" AMD SVM locking MSR */ #define X86_FEATURE_NRIPS (8*32+ 8)/* "nrip_save" AMD SVM next_rip save */ +#define X86_FEATURE_TSCRATEMSR (8*32+ 9)/* "tsc_scale" AMD TSC scaling support */ +#define X86_FEATURE_VMCBCLEAN (8*32+10)/* "vmcb_clean" AMD VMCB clean bits support */ +#define X86_FEATURE_FLUSHBYASID (8*32+11)/* AMD flush-by-ASID support */ +#define X86_FEATURE_DECODEASSISTS (8*32+12)/* AMD Decode Assists support */ +#define X86_FEATURE_PAUSEFILTER (8*32+13)/* AMD filtered pause intercept */ +#define X86_FEATURE_PFTHRESHOLD (8*32+14)/* AMD pause filter threshold */ +/* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx), word 9 */ #define X86_FEATURE_FSGSBASE (9*32+ 0)/* {RD/WR}{FS/GS}BASE instructions*/
arch/x86/kernel/cpu/amd.c +18 -1
@@ -412,6 +412,23 @@ static void __cpuinit early_init_amd(struct cpuinfo_x86 *c)set_cpu_cap (c,X86_FEATURE_EXTD_APICID ); }#endif + +/* We need to do the following only once */ +if (c != &boot_cpu_data) +return ; + +if (cpu_has (c,X86_FEATURE_CONSTANT_TSC )) { + +if (c->x86 >0x10 || + (c->x86 ==0x10 && c->x86_model >=0x2 )) { +u64 val; + +rdmsrl (MSR_K7_HWCR , val); +if (!(val &BIT (24 ))) + printk(KERN_WARNING FW_BUG "TSC doesn't count " +"with P0 frequency!\n" ); + } + } }static void __cpuinit init_amd (struct cpuinfo_x86 *c)
@@ -523,7 +540,7 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)#endif if (c->extended_cpuid_level >=0x80000006 ) { -if ((c->x86 >=0x0f ) && (cpuid_edx (0x80000006 ) &0xf000 )) +if (cpuid_edx (0x80000006 ) &0xf000 ) num_cache_leaves =4 ;else num_cache_leaves =3 ;
arch/x86/kernel/cpu/common.c +11 -6
@@ -545,7 +545,7 @@ void __cpuinit cpu_detect(struct cpuinfo_x86 *c) } } -static void __cpuinit get_cpu_cap (struct cpuinfo_x86 *c) +void __cpuinit get_cpu_cap (struct cpuinfo_x86 *c) {u32 tfms, xlvl;u32 ebx;
@@ -704,16 +704,21 @@ void __init early_cpu_init(void) }/* -* The NOPL instruction is supposed to exist on all CPUs with -* family >= 6; unfortunately, that's not true in practice because -* of early VIA chips and (more importantly) broken virtualizers that -* are not easy to detect. In the latter case it doesn't even *fail* -* reliably, so probing for it doesn't even work. Disable it completely +* The NOPL instruction is supposed to exist on all CPUs of family >= 6; +* unfortunately, that's not true in practice because of early VIA +* chips and (more importantly) broken virtualizers that are not easy +* to detect. In the latter case it doesn't even *fail* reliably, so +* probing for it doesn't even work. Disable it completely on 32-bit * unless we can find a reliable way to detect all the broken cases. +* Enable it explicitly on 64-bit for non-constant inputs of cpu_has(). */ static void __cpuinit detect_nopl (struct cpuinfo_x86 *c) { +#ifdef CONFIG_X86_32 clear_cpu_cap (c,X86_FEATURE_NOPL ); +#else +set_cpu_cap (c,X86_FEATURE_NOPL ); +#endif }static void __cpuinit generic_identify (struct cpuinfo_x86 *c)
arch/x86/kernel/cpu/cpu.h +1 -0
@@ -32,6 +32,7 @@ struct cpu_dev {extern const struct cpu_dev *const __x86_cpu_dev_start[], *const __x86_cpu_dev_end[]; +extern void get_cpu_cap (struct cpuinfo_x86 *c);extern void cpu_detect_cache_sizes (struct cpuinfo_x86 *c);#endif
arch/x86/kernel/cpu/intel.c +1 -0
@@ -39,6 +39,7 @@ static void __cpuinit early_init_intel(struct cpuinfo_x86 *c) misc_enable &= ~MSR_IA32_MISC_ENABLE_LIMIT_CPUID ;wrmsrl (MSR_IA32_MISC_ENABLE , misc_enable); c->cpuid_level =cpuid_eax (0 ); +get_cpu_cap (c); } }
arch/x86/kernel/cpu/scattered.c +6 -0
@@ -43,6 +43,12 @@ void __cpuinit init_scattered_cpuid_features(struct cpuinfo_x86 *c) { X86_FEATURE_LBRV, CR_EDX, 1, 0x8000000a, 0 }, { X86_FEATURE_SVML, CR_EDX, 2, 0x8000000a, 0 }, { X86_FEATURE_NRIPS, CR_EDX, 3, 0x8000000a, 0 }, + { X86_FEATURE_TSCRATEMSR, CR_EDX, 4, 0x8000000a, 0 }, + { X86_FEATURE_VMCBCLEAN, CR_EDX, 5, 0x8000000a, 0 }, + { X86_FEATURE_FLUSHBYASID, CR_EDX, 6, 0x8000000a, 0 }, + { X86_FEATURE_DECODEASSISTS, CR_EDX, 7, 0x8000000a, 0 }, + { X86_FEATURE_PAUSEFILTER, CR_EDX,10, 0x8000000a, 0 }, + { X86_FEATURE_PFTHRESHOLD, CR_EDX,12, 0x8000000a, 0 }, { 0, 0, 0, 0, 0 } };
arch/x86/kernel/tsc.c +0 -58
70 lines not on this page · raw message
arch/x86/kvm/x86.c +4 -3
@@ -1991,13 +1991,14 @@ static void do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function,0 /* Reserved */ |F (CX16 ) |0 /* xTPR Update, PDCM */ |0 /* Reserved, DCA */ |F (XMM4_1 ) |F (XMM4_2 ) |F (X2APIC ) |F (MOVBE ) |F (POPCNT ) | -0 /* Reserved, AES */ |F (XSAVE ) |0 /* OSXSAVE */ |F (AVX ); +0 /* Reserved*/ |F (AES ) |F (XSAVE ) |0 /* OSXSAVE */ |F (AVX ) | +F (F16C );/* cpuid 0x80000001.ecx */ const u32 kvm_supported_word6_x86_features =F (LAHF_LM ) |F (CMP_LEGACY ) |F (SVM ) |0 /* ExtApicSpace */ |F (CR8_LEGACY ) |F (ABM ) |F (SSE4A ) |F (MISALIGNSSE ) | - F(3DNOWPREFETCH) | 0 /* OSVW */ | 0 /* IBS */ | F(SSE5) | -0 /* SKINIT */ |0 /* WDT */ ; + F(3DNOWPREFETCH) | 0 /* OSVW */ | 0 /* IBS */ | F(XOP) | +0 /* SKINIT, WDT, LWP */ |F (FMA4 ) |F (TBM );/* all calls to cpuid_count() should be made on the same cpu */ get_cpu ();