x86: Fix AMD feature bits for XOP and FMA4 instructions
PATCH 1/1 x86: Fix AMD feature bits for XOP and FMA4 instructions
The AMD SSE5 feature set as-it has been replaced by some extensions to the AVX instruction set. Thus the bit formerly advertised as SSE5 is re-used for one of these extensions (XOP).
Replace the name and add another one described in the new AMD APM6 manual (doc #43479, p. 25). Although this changes the /proc/cpuinfo output, it is not user visible, as there are no CPUs (yet) having either of these features.
Additionally as long as AVX is not sane for KVM to pass-through, XOP and FMA4 are neither.
Signed-off-by Andre Przywara <[email protected]>
--- arch/x86/include/asm/cpufeature.h | 3 ++- arch/x86/kvm/x86.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-)
arch/x86/include/asm/cpufeature.h +2 -1
@@ -150,9 +150,10 @@#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_FMA4 (6*32+16)/* 4 operands MAC instructions */ #define X86_FEATURE_NODEID_MSR (6*32+19)/* NodeId MSR */ /*
arch/x86/kvm/x86.c +2 -2
@@ -1859,8 +1859,8 @@ static void do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function,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 */ | 0 /* XOP */ | +0 /* SKINIT, WDT */ |0 /* FMA4 */ ;/* all calls to cpuid_count() should be made on the same cpu */ get_cpu ();
Signature · 1 line
1.6.4