linux-kernel - [tip: x86/cpu] x86/cpu/amd: Use ZEN_MODEL_STEP_UCODE() for erratum_1386

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <176578311706.498.13474176921916799966.tip-bot2@tip-bot2>
Date: Mon, 15 Dec 2025 07:18:37 -0000
From: "tip-bot2 for Andrew Cooper" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Andrew Cooper <andrew.cooper3@...rix.com>, Ingo Molnar <mingo@...nel.org>,
 Borislav Petkov <bp@...en8.de>, Mario Limonciello <mario.limonciello@....com>,
 x86@...nel.org, linux-kernel@...r.kernel.org
Subject: [tip: x86/cpu] x86/cpu/amd: Use ZEN_MODEL_STEP_UCODE() for
 erratum_1386_microcode[]

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@...rix.com>
AuthorDate:    Wed, 26 Nov 2025 11:34:42 
Committer:     Ingo Molnar <mingo@...nel.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@...rix.com>
Signed-off-by: Ingo Molnar <mingo@...nel.org>
Cc: Borislav Petkov <bp@...en8.de>
Cc: Mario Limonciello <mario.limonciello@....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),
 	{}
 };