Skip to content

Commit

Permalink
x86/CPU/AMD: Do the common init on future Zens too
Browse files Browse the repository at this point in the history
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: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com>
Link: https://lore.kernel.org/r/20240201161024.30839-1-bp@alien8.de
  • Loading branch information
Borislav Petkov (AMD) committed Feb 16, 2024
1 parent 841c351 commit 03ceaf6
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions arch/x86/kernel/cpu/amd.c
Original file line number Diff line number Diff line change
Expand Up @@ -969,7 +969,6 @@ static void init_amd_zen_common(void)

static void init_amd_zen1(struct cpuinfo_x86 *c)
{
init_amd_zen_common();
fix_erratum_1386(c);

/* Fix up CPUID bits, but only if not virtualised. */
Expand Down Expand Up @@ -1023,16 +1022,13 @@ static void zen2_zenbleed_check(struct cpuinfo_x86 *c)

static void init_amd_zen2(struct cpuinfo_x86 *c)
{
init_amd_zen_common();
init_spectral_chicken(c);
fix_erratum_1386(c);
zen2_zenbleed_check(c);
}

static void init_amd_zen3(struct cpuinfo_x86 *c)
{
init_amd_zen_common();

if (!cpu_has(c, X86_FEATURE_HYPERVISOR)) {
/*
* Zen3 (Fam19 model < 0x10) parts are not susceptible to
Expand All @@ -1046,15 +1042,12 @@ static void init_amd_zen3(struct cpuinfo_x86 *c)

static void init_amd_zen4(struct cpuinfo_x86 *c)
{
init_amd_zen_common();

if (!cpu_has(c, X86_FEATURE_HYPERVISOR))
msr_set_bit(MSR_ZEN4_BP_CFG, MSR_ZEN4_BP_CFG_SHARED_BTB_FIX_BIT);
}

static void init_amd_zen5(struct cpuinfo_x86 *c)
{
init_amd_zen_common();
}

static void init_amd(struct cpuinfo_x86 *c)
Expand Down Expand Up @@ -1094,6 +1087,13 @@ static void init_amd(struct cpuinfo_x86 *c)
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))
init_amd_zen1(c);
else if (boot_cpu_has(X86_FEATURE_ZEN2))
Expand Down

0 comments on commit 03ceaf6

Please sign in to comment.