diff options
| author | Ingo Molnar <mingo@kernel.org> | 2023-10-11 23:48:46 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2023-10-11 23:54:03 +0300 |
| commit | 8f4156d58713b058e9aeebb28ffbe5f45ae57b47 (patch) | |
| tree | f4fd0167e871eeb1dea4a2387e59d348960b69e9 /arch/x86/include/asm/msr-index.h | |
| parent | 25e56847821f7375bdee7dae1027c7917d07ce4b (diff) | |
| parent | f454b18e07f518bcd0c05af17a2239138bff52de (diff) | |
| download | linux-8f4156d58713b058e9aeebb28ffbe5f45ae57b47.tar.xz | |
Merge branch 'x86/urgent' into perf/core, to resolve conflict
Resolve an MSR enumeration conflict.
Conflicts:
arch/x86/include/asm/msr-index.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/msr-index.h')
| -rw-r--r-- | arch/x86/include/asm/msr-index.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index dc159acb350a..0ad9ba8baa8a 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -637,11 +637,14 @@ /* AMD Last Branch Record MSRs */ #define MSR_AMD64_LBR_SELECT 0xc000010e -/* Fam 19h MSRs */ +/* Fam 19h (Zen 4) MSRs */ #define MSR_F19H_UMC_PERF_CTL 0xc0010800 #define MSR_F19H_UMC_PERF_CTR 0xc0010801 -/* Fam 17h MSRs */ +#define MSR_ZEN4_BP_CFG 0xc001102e +#define MSR_ZEN4_BP_CFG_SHARED_BTB_FIX_BIT 5 + +/* Fam 17h (Zen 2) MSRs */ #define MSR_F17H_IRPERF 0xc00000e9 #define MSR_ZEN2_SPECTRAL_CHICKEN 0xc00110e3 |