aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/include/asm/cpufeatures.h2
-rw-r--r--arch/x86/kernel/fpu/xstate.c1
-rw-r--r--tools/arch/x86/include/asm/cpufeatures.h1
3 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h
index eafee3161d1c..d9d7136edf05 100644
--- a/arch/x86/include/asm/cpufeatures.h
+++ b/arch/x86/include/asm/cpufeatures.h
@@ -288,6 +288,7 @@
288#define X86_FEATURE_AVX512VBMI (16*32+ 1) /* AVX512 Vector Bit Manipulation instructions*/ 288#define X86_FEATURE_AVX512VBMI (16*32+ 1) /* AVX512 Vector Bit Manipulation instructions*/
289#define X86_FEATURE_PKU (16*32+ 3) /* Protection Keys for Userspace */ 289#define X86_FEATURE_PKU (16*32+ 3) /* Protection Keys for Userspace */
290#define X86_FEATURE_OSPKE (16*32+ 4) /* OS Protection Keys Enable */ 290#define X86_FEATURE_OSPKE (16*32+ 4) /* OS Protection Keys Enable */
291#define X86_FEATURE_AVX512_VPOPCNTDQ (16*32+14) /* POPCNT for vectors of DW/QW */
291#define X86_FEATURE_RDPID (16*32+ 22) /* RDPID instruction */ 292#define X86_FEATURE_RDPID (16*32+ 22) /* RDPID instruction */
292 293
293/* AMD-defined CPU features, CPUID level 0x80000007 (ebx), word 17 */ 294/* AMD-defined CPU features, CPUID level 0x80000007 (ebx), word 17 */
@@ -320,5 +321,4 @@
320#define X86_BUG_SWAPGS_FENCE X86_BUG(11) /* SWAPGS without input dep on GS */ 321#define X86_BUG_SWAPGS_FENCE X86_BUG(11) /* SWAPGS without input dep on GS */
321#define X86_BUG_MONITOR X86_BUG(12) /* IPI required to wake up remote CPU */ 322#define X86_BUG_MONITOR X86_BUG(12) /* IPI required to wake up remote CPU */
322#define X86_BUG_AMD_E400 X86_BUG(13) /* CPU is among the affected by Erratum 400 */ 323#define X86_BUG_AMD_E400 X86_BUG(13) /* CPU is among the affected by Erratum 400 */
323
324#endif /* _ASM_X86_CPUFEATURES_H */ 324#endif /* _ASM_X86_CPUFEATURES_H */
diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c
index 1d7770447b3e..35f7024aace5 100644
--- a/arch/x86/kernel/fpu/xstate.c
+++ b/arch/x86/kernel/fpu/xstate.c
@@ -78,6 +78,7 @@ void fpu__xstate_clear_all_cpu_caps(void)
78 setup_clear_cpu_cap(X86_FEATURE_PKU); 78 setup_clear_cpu_cap(X86_FEATURE_PKU);
79 setup_clear_cpu_cap(X86_FEATURE_AVX512_4VNNIW); 79 setup_clear_cpu_cap(X86_FEATURE_AVX512_4VNNIW);
80 setup_clear_cpu_cap(X86_FEATURE_AVX512_4FMAPS); 80 setup_clear_cpu_cap(X86_FEATURE_AVX512_4FMAPS);
81 setup_clear_cpu_cap(X86_FEATURE_AVX512_VPOPCNTDQ);
81} 82}
82 83
83/* 84/*
diff --git a/tools/arch/x86/include/asm/cpufeatures.h b/tools/arch/x86/include/asm/cpufeatures.h
index cddd5d06e1cb..3603556fa0d9 100644
--- a/tools/arch/x86/include/asm/cpufeatures.h
+++ b/tools/arch/x86/include/asm/cpufeatures.h
@@ -280,6 +280,7 @@
280/* Intel-defined CPU features, CPUID level 0x00000007:0 (ecx), word 16 */ 280/* Intel-defined CPU features, CPUID level 0x00000007:0 (ecx), word 16 */
281#define X86_FEATURE_PKU (16*32+ 3) /* Protection Keys for Userspace */ 281#define X86_FEATURE_PKU (16*32+ 3) /* Protection Keys for Userspace */
282#define X86_FEATURE_OSPKE (16*32+ 4) /* OS Protection Keys Enable */ 282#define X86_FEATURE_OSPKE (16*32+ 4) /* OS Protection Keys Enable */
283#define X86_FEATURE_AVX512_VPOPCNTDQ (16*32+14) /* POPCNT for vectors of DW/QW */
283 284
284/* AMD-defined CPU features, CPUID level 0x80000007 (ebx), word 17 */ 285/* AMD-defined CPU features, CPUID level 0x80000007 (ebx), word 17 */
285#define X86_FEATURE_OVERFLOW_RECOV (17*32+0) /* MCA overflow recovery support */ 286#define X86_FEATURE_OVERFLOW_RECOV (17*32+0) /* MCA overflow recovery support */