The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: 0da91912fc150d6d321b15e648bead202ced1a27
Gitweb: https://git.kernel.org/tip/0da91912fc150d6d321b15e648bead202ced1a27
Author: Borislav Petkov (AMD) <bp@xxxxxxxxx>
AuthorDate: Wed, 01 Nov 2023 12:31:44 +01:00
Committer: Borislav Petkov (AMD) <bp@xxxxxxxxx>
CommitterDate: Wed, 29 Nov 2023 12:11:59 +01:00
x86/CPU/AMD: Move erratum 1076 fix into the Zen1 init function
No functional changes.
Signed-off-by: Borislav Petkov (AMD) <bp@xxxxxxxxx>
Reviewed-by: Nikolay Borisov <nik.borisov@xxxxxxxx>
Link: http://lore.kernel.org/r/20231120104152.13740-5-bp@xxxxxxxxx
---
arch/x86/kernel/cpu/amd.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 3d74347..ebe6be8 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -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)) {
@@ -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);
|