From nobody Tue Dec 16 13:48:40 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 47AE4C07545 for ; Tue, 24 Oct 2023 13:22:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234712AbjJXNWy (ORCPT ); Tue, 24 Oct 2023 09:22:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43406 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234592AbjJXNWC (ORCPT ); Tue, 24 Oct 2023 09:22:02 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F17901996; Tue, 24 Oct 2023 06:21:06 -0700 (PDT) Date: Tue, 24 Oct 2023 13:21:03 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1698153664; 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: in-reply-to:in-reply-to:references:references; bh=RHkCXTH24NyaO/g37ph9L853bwbDbAPXpoqm9V4BbAI=; b=xQrIyTAMZ/ywRVTrsjvQRwpa91AihXbpMK8KLqDJDITxQY4yhBGP3T5JiCpwP5CeTKcui6 rTIdE47NepxgymCPvWw2NYdYzVylsIuZo5xGhRoKhs3QUktEHiHT5IwXVhivL2taOX6Pdq mp3ebjtNIa2VpYoJbVQCqni7RiwI1Q9dGKABWWRpiUfrhjrT5sV2ofesepsO8KG2BFbkgj AgtqP+AyFhmzQlV7GjzQNIdnHlrA5Gw9bA/NLXxLeNduRvJ+KALN/WwWSQ8qUwKjq7eBtV 3WdPYFF0eFmSEY3Xgth25plgyeko/WsZMaHyUSH9Dt2pvH3K69Dms53syTZ1Zw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1698153664; 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: in-reply-to:in-reply-to:references:references; bh=RHkCXTH24NyaO/g37ph9L853bwbDbAPXpoqm9V4BbAI=; b=MP2aJJr7GuokitrlMyBFfIAsrFHIw8LwL3C0C/C65fB2kpc+LezgedJEivO40X+MpZKDNi yc7Pm1wqYfTvKzDg== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/microcode] x86/microcode/amd: Use correct per CPU ucode_cpu_info Cc: Thomas Gleixner , "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20231010150702.433454320@linutronix.de> References: <20231010150702.433454320@linutronix.de> MIME-Version: 1.0 Message-ID: <169815366328.3135.16050455974212164815.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/microcode branch of tip: Commit-ID: ecfd41089348fa4cc767dc588367e9fdf8cb6b9d Gitweb: https://git.kernel.org/tip/ecfd41089348fa4cc767dc588367e9fdf= 8cb6b9d Author: Thomas Gleixner AuthorDate: Tue, 10 Oct 2023 17:08:41 +02:00 Committer: Borislav Petkov (AMD) CommitterDate: Tue, 24 Oct 2023 15:05:54 +02:00 x86/microcode/amd: Use correct per CPU ucode_cpu_info find_blobs_in_containers() is invoked on every CPU but overwrites unconditionally ucode_cpu_info of CPU0. Fix this by using the proper CPU data and move the assignment into the call site apply_ucode_from_containers() so that the function can be reused. Signed-off-by: Thomas Gleixner Signed-off-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/20231010150702.433454320@linutronix.de --- arch/x86/kernel/cpu/microcode/amd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/micr= ocode/amd.c index b827390..56d8bd6 100644 --- a/arch/x86/kernel/cpu/microcode/amd.c +++ b/arch/x86/kernel/cpu/microcode/amd.c @@ -503,9 +503,6 @@ static void find_blobs_in_containers(unsigned int cpuid= _1_eax, struct cpio_data=20 if (!get_builtin_microcode(&cp, x86_family(cpuid_1_eax))) cp =3D find_microcode_in_initrd(ucode_path); =20 - /* Needed in load_microcode_amd() */ - ucode_cpu_info->cpu_sig.sig =3D cpuid_1_eax; - *ret =3D cp; } =20 @@ -513,6 +510,9 @@ static void apply_ucode_from_containers(unsigned int cp= uid_1_eax) { struct cpio_data cp =3D { }; =20 + /* Needed in load_microcode_amd() */ + ucode_cpu_info[smp_processor_id()].cpu_sig.sig =3D cpuid_1_eax; + find_blobs_in_containers(cpuid_1_eax, &cp); if (!(cp.data && cp.size)) return;