From 25050f53be29518a3c9bdd0628333cd3121d2750 Mon Sep 17 00:00:00 2001 From: "Liu, Jinsong" Date: Tue, 6 Dec 2011 11:27:18 +0000 Subject: X86: expose Intel new features to pv/hvm Intel recently release some new features, including FMA/AVX2/BMI1/BMI2/LZCNT/MOVBE. Refer to http://software.intel.com/file/36945 This patch expose these new features to pv and hvm. Signed-off-by: Liu, Jinsong Committed-by: Keir Fraser --- tools/libxc/xc_cpufeature.h | 5 +++++ tools/libxc/xc_cpuid_x86.c | 17 +++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) (limited to 'tools/libxc') diff --git a/tools/libxc/xc_cpufeature.h b/tools/libxc/xc_cpufeature.h index 96a44ff59f..01a378a741 100644 --- a/tools/libxc/xc_cpufeature.h +++ b/tools/libxc/xc_cpufeature.h @@ -74,6 +74,7 @@ #define X86_FEATURE_TM2 8 /* Thermal Monitor 2 */ #define X86_FEATURE_SSSE3 9 /* Supplemental Streaming SIMD Exts-3 */ #define X86_FEATURE_CID 10 /* Context ID */ +#define X86_FEATURE_FMA 12 /* Fused Multiply Add */ #define X86_FEATURE_CX16 13 /* CMPXCHG16B */ #define X86_FEATURE_XTPR 14 /* Send Task Priority Messages */ #define X86_FEATURE_PDCM 15 /* Perf/Debug Capability MSR */ @@ -81,6 +82,7 @@ #define X86_FEATURE_SSE4_1 19 /* Streaming SIMD Extensions 4.1 */ #define X86_FEATURE_SSE4_2 20 /* Streaming SIMD Extensions 4.2 */ #define X86_FEATURE_X2APIC 21 /* x2APIC */ +#define X86_FEATURE_MOVBE 22 /* movbe instruction */ #define X86_FEATURE_POPCNT 23 /* POPCNT instruction */ #define X86_FEATURE_TSC_DEADLINE 24 /* "tdt" TSC Deadline Timer */ #define X86_FEATURE_AES 25 /* AES acceleration instructions */ @@ -125,7 +127,10 @@ /* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx) */ #define X86_FEATURE_FSGSBASE 0 /* {RD,WR}{FS,GS}BASE instructions */ +#define X86_FEATURE_BMI1 3 /* 1st group bit manipulation extensions */ +#define X86_FEATURE_AVX2 5 /* AVX2 instructions */ #define X86_FEATURE_SMEP 7 /* Supervisor Mode Execution Protection */ +#define X86_FEATURE_BMI2 8 /* 2nd group bit manipulation extensions */ #define X86_FEATURE_ERMS 9 /* Enhanced REP MOVSB/STOSB */ #endif /* __LIBXC_CPUFEATURE_H */ diff --git a/tools/libxc/xc_cpuid_x86.c b/tools/libxc/xc_cpuid_x86.c index 1b8da179cc..ccd73501ea 100644 --- a/tools/libxc/xc_cpuid_x86.c +++ b/tools/libxc/xc_cpuid_x86.c @@ -195,7 +195,8 @@ static void intel_xc_cpuid_policy( int is_64bit = hypervisor_is_64bit(xch) && is_pae; /* Only a few features are advertised in Intel's 0x80000001. */ - regs[2] &= (is_64bit ? bitmaskof(X86_FEATURE_LAHF_LM) : 0); + regs[2] &= (is_64bit ? bitmaskof(X86_FEATURE_LAHF_LM) : 0) | + bitmaskof(X86_FEATURE_ABM); regs[3] &= ((is_pae ? bitmaskof(X86_FEATURE_NX) : 0) | (is_64bit ? bitmaskof(X86_FEATURE_LM) : 0) | (is_64bit ? bitmaskof(X86_FEATURE_SYSCALL) : 0) | @@ -307,9 +308,11 @@ static void xc_cpuid_hvm_policy( regs[2] &= (bitmaskof(X86_FEATURE_XMM3) | bitmaskof(X86_FEATURE_PCLMULQDQ) | bitmaskof(X86_FEATURE_SSSE3) | + bitmaskof(X86_FEATURE_FMA) | bitmaskof(X86_FEATURE_CX16) | bitmaskof(X86_FEATURE_SSE4_1) | bitmaskof(X86_FEATURE_SSE4_2) | + bitmaskof(X86_FEATURE_MOVBE) | bitmaskof(X86_FEATURE_POPCNT) | bitmaskof(X86_FEATURE_AES) | bitmaskof(X86_FEATURE_F16C) | @@ -357,7 +360,10 @@ static void xc_cpuid_hvm_policy( case 0x00000007: /* Intel-defined CPU features */ if ( input[1] == 0 ) { - regs[1] &= (bitmaskof(X86_FEATURE_SMEP) | + regs[1] &= (bitmaskof(X86_FEATURE_BMI1) | + bitmaskof(X86_FEATURE_AVX2) | + bitmaskof(X86_FEATURE_SMEP) | + bitmaskof(X86_FEATURE_BMI2) | bitmaskof(X86_FEATURE_ERMS) | bitmaskof(X86_FEATURE_FSGSBASE)); } else @@ -485,8 +491,11 @@ static void xc_cpuid_pv_policy( case 0x00000007: if ( input[1] == 0 ) - regs[1] &= (bitmaskof(X86_FEATURE_FSGSBASE) | - bitmaskof(X86_FEATURE_ERMS)); + regs[1] &= (bitmaskof(X86_FEATURE_BMI1) | + bitmaskof(X86_FEATURE_AVX2) | + bitmaskof(X86_FEATURE_BMI2) | + bitmaskof(X86_FEATURE_ERMS) | + bitmaskof(X86_FEATURE_FSGSBASE)); else regs[1] = 0; regs[0] = regs[2] = regs[3] = 0; -- cgit v1.2.3