From nobody Thu Dec 18 09:11:33 2025 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3679873446; Wed, 18 Dec 2024 01:00:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734483619; cv=none; b=Ky73GdN2fuhDXEW//m30rsws+P7wy5VJa2aqfte7ZlZxnrPEz/OHWp1MkryEwbs7NMlwCHVNn6cWCUbTBBSLqX2RnMBCjpdJTQrX8b89pB20gKPvVg2DuBFcN+Ea3uMIaxA4DlJlMpPYWE5SS402j5eecOnpkjsvGe66xAhCpWo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734483619; c=relaxed/simple; bh=lZf1RS6l4rUt6gWkekN4i2atoJh4WQWDStrEH0PKGZY=; h=Date:From:To:Subject:Cc:MIME-Version:Message-ID:Content-Type; b=Sp6uk64PqUo2vyD54PhF+8G90GRXQjpWcRy0cJw85YD+nEmCf6VguPNp1l/bZbA7r2mlie+je3PnY/LEcpKOflEr6w91m/65e91E8fbNwZUxdKycGNpW5HehbDkuoUZEB1oNYo08UyGzqIvo2T3sJMbxu3RjIG8t18Jzkg27eAI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=3VaK9gbF; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=EkrmDvRA; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="3VaK9gbF"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="EkrmDvRA" Date: Wed, 18 Dec 2024 01:00:13 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1734483614; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jOBzrVCQ9Q2HcX71Z6bS8bemouPj3VcasxrE2ci7fc4=; b=3VaK9gbF389VmbKGr2fFf7q1uojDce/IJ3LSjcVXs86vg0YOsoXQcfmQynQYpOt96wNt10 llKcaiugb8YLiQjMyCHD1jLlQOg9y+p1EIfKYjy0fugvfZUjzR//RHLqM2mqvbtqWabn/o 9u0lsPuhuJ3ixUqqnpTVKUDDx+ZzF9BFwQMA2L27d4TOkXwEHUMv0f99/UHGzecDA3MIv4 oTPer8BrVlhsLR0HlqTOJ1C1S8AfaVUxuJE1MDEuhDbN7wIZAF6HMoYXWDc4KLZXXIL7s/ Rzcq9Y+nogY5sngS+iM2qTqYBJElyWqBThmLe8gL0fp7yW88pCq7r9UzZWnT+A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1734483614; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jOBzrVCQ9Q2HcX71Z6bS8bemouPj3VcasxrE2ci7fc4=; b=EkrmDvRAUyasQLWxLnBXIG03DgLHlv5DcKpb6sO+25MG4KWlkDXp2F+efXKYGJ7smtCXzB oxJ+9wumW9lSg1BQ== From: "tip-bot2 for Dave Hansen" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/cpu] x86/cpu: Move AMD erratum 1386 table over to 'x86_cpu_id' Cc: Dave Hansen , x86@kernel.org, linux-kernel@vger.kernel.org Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <173448361317.7135.17921207841466608654.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the x86/cpu branch of tip: Commit-ID: 064e8b122b65525115c4c2f181bd2ea33265e0c6 Gitweb: https://git.kernel.org/tip/064e8b122b65525115c4c2f181bd2ea33= 265e0c6 Author: Dave Hansen AuthorDate: Fri, 13 Dec 2024 10:51:32 -08:00 Committer: Dave Hansen CommitterDate: Tue, 17 Dec 2024 16:19:57 -08:00 x86/cpu: Move AMD erratum 1386 table over to 'x86_cpu_id' The AMD erratum 1386 detection code uses and old style 'x86_cpu_desc' table. Replace it with 'x86_cpu_id' so the old style can be removed. I did not create a new helper macro here. The new table is certainly more noisy than the old and it can be improved on. But I was hesitant to create a new macro just for a single site that is only two ugly lines in the end. Signed-off-by: Dave Hansen Signed-off-by: Dave Hansen Link: https://lore.kernel.org/all/20241213185132.07555E1D%40davehans-spike.= ostc.intel.com --- arch/x86/kernel/cpu/amd.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index d8408aa..7bb5b1a 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -795,10 +795,9 @@ static void init_amd_bd(struct cpuinfo_x86 *c) clear_rdrand_cpuid_bit(c); } =20 -static const struct x86_cpu_desc erratum_1386_microcode[] =3D { - AMD_CPU_DESC(0x17, 0x1, 0x2, 0x0800126e), - AMD_CPU_DESC(0x17, 0x31, 0x0, 0x08301052), - {}, +static const struct x86_cpu_id erratum_1386_microcode[] =3D { + X86_MATCH_VFM_STEPS(VFM_MAKE(X86_VENDOR_AMD, 0x17, 0x01), 0x2, 0x2, 0x080= 0126e), + X86_MATCH_VFM_STEPS(VFM_MAKE(X86_VENDOR_AMD, 0x17, 0x31), 0x0, 0x0, 0x083= 01052), }; =20 static void fix_erratum_1386(struct cpuinfo_x86 *c) @@ -814,7 +813,7 @@ static void fix_erratum_1386(struct cpuinfo_x86 *c) * Clear the feature flag only on microcode revisions which * don't have the fix. */ - if (x86_cpu_has_min_microcode_rev(erratum_1386_microcode)) + if (x86_match_min_microcode_rev(erratum_1386_microcode)) return; =20 clear_cpu_cap(c, X86_FEATURE_XSAVES);