tools arch x86: Sync asm/cpufeatures.h with the kernel sources (71dd6528) · Commits · 戴 / test

To pick up the changes from: ("x86/cpufeatures: Add flag to track whether MSR IA32_FEAT_CTL is configured") ("x86/cpufeatures: Add support for fast short REP; MOVSB") These don't cause any changes in tooling, just silences this perf build warning: Warning: Kernel ABI header at 'tools/arch/x86/include/asm/cpufeatures.h' differs from latest version at 'arch/x86/include/asm/cpufeatures.h' diff -u tools/arch/x86/include/asm/cpufeatures.h arch/x86/include/asm/cpufeatures.h Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Borislav Petkov <bp@suse.de> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Sean Christopherson <sean.j.christopherson@intel.com> Cc: Tony Luck <tony.luck@intel.com> Signed-off-by:

Arnaldo Carvalho de Melo <acme@redhat.com>

tools/arch/x86/include/asm/cpufeatures.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -220,6 +220,7 @@
		#define X86_FEATURE_ZEN ( 732+28) / "" CPU is AMD family 0x17 (Zen) */
		#define X86_FEATURE_L1TF_PTEINV ( 732+29) / "" L1TF workaround PTE inversion */
		#define X86_FEATURE_IBRS_ENHANCED ( 732+30) / Enhanced IBRS */
		#define X86_FEATURE_MSR_IA32_FEAT_CTL ( 732+31) / "" MSR IA32_FEAT_CTL configured */

		/* Virtualization flags: Linux defined, word 8 */
		#define X86_FEATURE_TPR_SHADOW ( 832+ 0) / Intel TPR Shadow */
		@@ -357,6 +358,7 @@
		/* Intel-defined CPU features, CPUID level 0x00000007:0 (EDX), word 18 */
		#define X86_FEATURE_AVX512_4VNNIW (1832+ 2) / AVX-512 Neural Network Instructions */
		#define X86_FEATURE_AVX512_4FMAPS (1832+ 3) / AVX-512 Multiply Accumulation Single precision */
		#define X86_FEATURE_FSRM (1832+ 4) / Fast Short Rep Mov */
		#define X86_FEATURE_AVX512_VP2INTERSECT (1832+ 8) / AVX-512 Intersect for D/Q */
		#define X86_FEATURE_MD_CLEAR (1832+10) / VERW clears CPU buffers */
		#define X86_FEATURE_TSX_FORCE_ABORT (1832+13) / "" TSX_FORCE_ABORT */

Original line number	Diff line number	Diff line
		@@ -220,6 +220,7 @@
		#define X86_FEATURE_ZEN ( 732+28) / "" CPU is AMD family 0x17 (Zen) */
		#define X86_FEATURE_L1TF_PTEINV ( 732+29) / "" L1TF workaround PTE inversion */
		#define X86_FEATURE_IBRS_ENHANCED ( 732+30) / Enhanced IBRS */
		#define X86_FEATURE_MSR_IA32_FEAT_CTL ( 732+31) / "" MSR IA32_FEAT_CTL configured */

		/* Virtualization flags: Linux defined, word 8 */
		#define X86_FEATURE_TPR_SHADOW ( 832+ 0) / Intel TPR Shadow */
		@@ -357,6 +358,7 @@
		/* Intel-defined CPU features, CPUID level 0x00000007:0 (EDX), word 18 */
		#define X86_FEATURE_AVX512_4VNNIW (1832+ 2) / AVX-512 Neural Network Instructions */
		#define X86_FEATURE_AVX512_4FMAPS (1832+ 3) / AVX-512 Multiply Accumulation Single precision */
		#define X86_FEATURE_FSRM (1832+ 4) / Fast Short Rep Mov */
		#define X86_FEATURE_AVX512_VP2INTERSECT (1832+ 8) / AVX-512 Intersect for D/Q */
		#define X86_FEATURE_MD_CLEAR (1832+10) / VERW clears CPU buffers */
		#define X86_FEATURE_TSX_FORCE_ABORT (1832+13) / "" TSX_FORCE_ABORT */

Admin message