From: Ingo Molnar <mingo@kernel.org>
Date: Wed, 11 Oct 2023 20:48:46 +0000 (+0200)
Subject: Merge branch 'x86/urgent' into perf/core, to resolve conflict
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8f4156d58713b058e9aeebb28ffbe5f45ae57b47;p=linux.git

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>
---

8f4156d58713b058e9aeebb28ffbe5f45ae57b47
diff --cc arch/x86/include/asm/msr-index.h
index dc159acb350a4,b37abb55e948b..0ad9ba8baa8a0
--- a/arch/x86/include/asm/msr-index.h
+++ b/arch/x86/include/asm/msr-index.h
@@@ -637,13 -637,11 +637,16 @@@
  /* AMD Last Branch Record MSRs */
  #define MSR_AMD64_LBR_SELECT			0xc000010e
  
- /* Fam 19h MSRs */
 -/* Zen4 */
++/* 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
+ 
 -/* Zen 2 */
++/* Fam 17h (Zen 2) MSRs */
 +#define MSR_F17H_IRPERF			0xc00000e9
 +
  #define MSR_ZEN2_SPECTRAL_CHICKEN	0xc00110e3
  #define MSR_ZEN2_SPECTRAL_CHICKEN_BIT	BIT_ULL(1)