Skip to content
This repository was archived by the owner on Oct 3, 2024. It is now read-only.

Commit 91d248c

Browse files
committed
tools arch x86: Sync the msr-index.h copy with the kernel sources
To pick up the changes from these csets: 4ad3278 ("x86/speculation: Disable RRSBA behavior") d7caac9 ("x86/cpu/amd: Add Spectral Chicken") That cause no changes to tooling: $ tools/perf/trace/beauty/tracepoints/x86_msr.sh > before $ cp arch/x86/include/asm/msr-index.h tools/arch/x86/include/asm/msr-index.h $ tools/perf/trace/beauty/tracepoints/x86_msr.sh > after $ diff -u before after $ Just silences this perf build warning: Warning: Kernel ABI header at 'tools/arch/x86/include/asm/msr-index.h' differs from latest version at 'arch/x86/include/asm/msr-index.h' diff -u tools/arch/x86/include/asm/msr-index.h arch/x86/include/asm/msr-index.h Cc: Adrian Hunter <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Ian Rogers <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Pawan Gupta <[email protected]> Cc: Peter Zijlstra <[email protected]> Link: https://lore.kernel.org/lkml/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent f098add commit 91d248c

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

tools/arch/x86/include/asm/msr-index.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@
9595
#define MSR_IA32_ARCH_CAPABILITIES 0x0000010a
9696
#define ARCH_CAP_RDCL_NO BIT(0) /* Not susceptible to Meltdown */
9797
#define ARCH_CAP_IBRS_ALL BIT(1) /* Enhanced IBRS support */
98+
#define ARCH_CAP_RSBA BIT(2) /* RET may use alternative branch predictors */
9899
#define ARCH_CAP_SKIP_VMENTRY_L1DFLUSH BIT(3) /* Skip L1D flush on vmentry */
99100
#define ARCH_CAP_SSB_NO BIT(4) /*
100101
* Not susceptible to Speculative Store Bypass
@@ -576,6 +577,9 @@
576577
/* Fam 17h MSRs */
577578
#define MSR_F17H_IRPERF 0xc00000e9
578579

580+
#define MSR_ZEN2_SPECTRAL_CHICKEN 0xc00110e3
581+
#define MSR_ZEN2_SPECTRAL_CHICKEN_BIT BIT_ULL(1)
582+
579583
/* Fam 16h MSRs */
580584
#define MSR_F16H_L2I_PERF_CTL 0xc0010230
581585
#define MSR_F16H_L2I_PERF_CTR 0xc0010231

0 commit comments

Comments
 (0)