The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: a2aabcfc6015b6196f161b6bf4df1519ab09c3e1
Gitweb: https://git.kernel.org/tip/a2aabcfc6015b6196f161b6bf4df1519ab09c3e1
Author: Andrew Cooper <andrew.cooper3@citrix.com>
AuthorDate: Wed, 26 Nov 2025 11:34:42
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Sun, 14 Dec 2025 09:55:47 +01:00
x86/cpu/amd: Use ZEN_MODEL_STEP_UCODE() for erratum_1386_microcode[]
... to simplify the result.
No functional change.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Mario Limonciello <mario.limonciello@amd.com>
Link: https://patch.msgid.link/20251126113442.877024-1-andrew.cooper3@citrix.com
---
arch/x86/kernel/cpu/amd.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 86059f2..c04f53f 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -873,8 +873,8 @@ static void init_amd_bd(struct cpuinfo_x86 *c)
}
static const struct x86_cpu_id erratum_1386_microcode[] = {
- X86_MATCH_VFM_STEPS(VFM_MAKE(X86_VENDOR_AMD, 0x17, 0x01), 0x2, 0x2, 0x0800126e),
- X86_MATCH_VFM_STEPS(VFM_MAKE(X86_VENDOR_AMD, 0x17, 0x31), 0x0, 0x0, 0x08301052),
+ ZEN_MODEL_STEP_UCODE(0x17, 0x01, 0x2, 0x0800126e),
+ ZEN_MODEL_STEP_UCODE(0x17, 0x31, 0x0, 0x08301052),
{}
};