x86/CPU/AMD: Move erratum 1076 fix into the Zen1 init function

[ Upstream commit 0da91912fc150d6d321b15e648bead202ced1a27 ]

No functional changes.

Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Nikolay Borisov <nik.borisov@suse.com>
Link: http://lore.kernel.org/r/20231120104152.13740-5-bp@alien8.de
Stable-dep-of: c7b2edd8377b ("perf/x86/amd/core: Update and fix stalled-cycles-* events for Zen 2 and later")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Borislav Petkov (AMD) 2023-11-01 12:31:44 +01:00 committed by Greg Kroah-Hartman
parent eae590201d
commit 2577e2a7ca

View File

@ -1028,6 +1028,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)) {
@ -1087,11 +1092,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);