Commit 03ceaf67 authored by Borislav Petkov (AMD)'s avatar Borislav Petkov (AMD)

x86/CPU/AMD: Do the common init on future Zens too

There's no need to enable the common Zen init stuff for each new family
- just do it by default on everything >= 0x17 family.
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
Link: https://lore.kernel.org/r/20240201161024.30839-1-bp@alien8.de
parent 841c3516
...@@ -969,7 +969,6 @@ static void init_amd_zen_common(void) ...@@ -969,7 +969,6 @@ static void init_amd_zen_common(void)
static void init_amd_zen1(struct cpuinfo_x86 *c) static void init_amd_zen1(struct cpuinfo_x86 *c)
{ {
init_amd_zen_common();
fix_erratum_1386(c); fix_erratum_1386(c);
/* Fix up CPUID bits, but only if not virtualised. */ /* Fix up CPUID bits, but only if not virtualised. */
...@@ -1023,7 +1022,6 @@ static void zen2_zenbleed_check(struct cpuinfo_x86 *c) ...@@ -1023,7 +1022,6 @@ static void zen2_zenbleed_check(struct cpuinfo_x86 *c)
static void init_amd_zen2(struct cpuinfo_x86 *c) static void init_amd_zen2(struct cpuinfo_x86 *c)
{ {
init_amd_zen_common();
init_spectral_chicken(c); init_spectral_chicken(c);
fix_erratum_1386(c); fix_erratum_1386(c);
zen2_zenbleed_check(c); zen2_zenbleed_check(c);
...@@ -1031,8 +1029,6 @@ static void init_amd_zen2(struct cpuinfo_x86 *c) ...@@ -1031,8 +1029,6 @@ static void init_amd_zen2(struct cpuinfo_x86 *c)
static void init_amd_zen3(struct cpuinfo_x86 *c) static void init_amd_zen3(struct cpuinfo_x86 *c)
{ {
init_amd_zen_common();
if (!cpu_has(c, X86_FEATURE_HYPERVISOR)) { if (!cpu_has(c, X86_FEATURE_HYPERVISOR)) {
/* /*
* Zen3 (Fam19 model < 0x10) parts are not susceptible to * Zen3 (Fam19 model < 0x10) parts are not susceptible to
...@@ -1046,15 +1042,12 @@ static void init_amd_zen3(struct cpuinfo_x86 *c) ...@@ -1046,15 +1042,12 @@ static void init_amd_zen3(struct cpuinfo_x86 *c)
static void init_amd_zen4(struct cpuinfo_x86 *c) static void init_amd_zen4(struct cpuinfo_x86 *c)
{ {
init_amd_zen_common();
if (!cpu_has(c, X86_FEATURE_HYPERVISOR)) if (!cpu_has(c, X86_FEATURE_HYPERVISOR))
msr_set_bit(MSR_ZEN4_BP_CFG, MSR_ZEN4_BP_CFG_SHARED_BTB_FIX_BIT); msr_set_bit(MSR_ZEN4_BP_CFG, MSR_ZEN4_BP_CFG_SHARED_BTB_FIX_BIT);
} }
static void init_amd_zen5(struct cpuinfo_x86 *c) static void init_amd_zen5(struct cpuinfo_x86 *c)
{ {
init_amd_zen_common();
} }
static void init_amd(struct cpuinfo_x86 *c) static void init_amd(struct cpuinfo_x86 *c)
...@@ -1094,6 +1087,13 @@ static void init_amd(struct cpuinfo_x86 *c) ...@@ -1094,6 +1087,13 @@ static void init_amd(struct cpuinfo_x86 *c)
case 0x16: init_amd_jg(c); break; case 0x16: init_amd_jg(c); break;
} }
/*
* Save up on some future enablement work and do common Zen
* settings.
*/
if (c->x86 >= 0x17)
init_amd_zen_common();
if (boot_cpu_has(X86_FEATURE_ZEN1)) if (boot_cpu_has(X86_FEATURE_ZEN1))
init_amd_zen1(c); init_amd_zen1(c);
else if (boot_cpu_has(X86_FEATURE_ZEN2)) else if (boot_cpu_has(X86_FEATURE_ZEN2))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment