Skip to content

Commit

Permalink
x86/CPU/AMD: Move erratum 1076 fix into the Zen1 init function
Browse files Browse the repository at this point in the history
No functional changes.

Signed-off-by: Borislav Petkov (AMD) <[email protected]>
Reviewed-by: Nikolay Borisov <[email protected]>
Link: http://lore.kernel.org/r/[email protected]
  • Loading branch information
bp3tk0v committed Nov 29, 2023
1 parent affc66c commit 0da9191
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions arch/x86/kernel/cpu/amd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1024,6 +1024,11 @@ static void init_amd_zn(struct cpuinfo_x86 *c)
#ifdef CONFIG_NUMA
node_reclaim_distance = 32;
#endif
}

static void init_amd_zen(struct cpuinfo_x86 *c)
{
fix_erratum_1386(c);

/* Fix up CPUID bits, but only if not virtualised. */
if (!cpu_has(c, X86_FEATURE_HYPERVISOR)) {
Expand Down Expand Up @@ -1074,11 +1079,6 @@ static void zenbleed_check(struct cpuinfo_x86 *c)
}
}

static void init_amd_zen(struct cpuinfo_x86 *c)
{
fix_erratum_1386(c);
}

static void init_amd_zen2(struct cpuinfo_x86 *c)
{
fix_erratum_1386(c);
Expand Down

0 comments on commit 0da9191

Please sign in to comment.