From nobody Tue Dec 16 19:55:48 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 255B0CDB47E for ; Fri, 20 Oct 2023 11:41:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377336AbjJTLl5 (ORCPT ); Fri, 20 Oct 2023 07:41:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377381AbjJTLla (ORCPT ); Fri, 20 Oct 2023 07:41:30 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD9BE2D43; Fri, 20 Oct 2023 04:38:26 -0700 (PDT) Date: Fri, 20 Oct 2023 11:37:55 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1697801875; 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=47fegGk78WLObql5tga+epDvENs5jZ0xTJTdq0Xxcws=; b=U8EKH9cgfN5Y3AKsePYtmHeKkylX2IC9PEXo1gCJlWkS4eupNsSncbQPcrMu0i5PdWj85a B5KUZ7fSeh8BvTNMUYpfvTkfAZNHgrUYHiZ+VIz+Im1Yfvt6Osh+krjds70g+/SPWypxGi j0iXDFv8krparTCoSR8Lk4jA+hyvbMC1xrlzrhgOW97I1YrZMZHXcTLBkDSLoBfQQgC8Pn usT/oU2HuengUHLf7AQ06DdOfg9RQsY/+rlz8UF6waNIJIU3Ibzt/1GlOAsM8Ow3HzeFCj Ji+ucn6ANkHkXV8cA2wMBQb/Wnbj41zF+7zZXOlzsxdT04Tg1EPMtzlUPouDJw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1697801875; 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=47fegGk78WLObql5tga+epDvENs5jZ0xTJTdq0Xxcws=; b=3vsTXnEl16QDLeGsZh83u6Ejdafhyvw3kxiw/7GyU1X2rf1gwo81rWrjw43HMywDZam/pW 3pWxIhKUp9DX4BDQ== 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: Cache builtin microcode too Cc: Thomas Gleixner , "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20231010150702.495139089@linutronix.de> References: <20231010150702.495139089@linutronix.de> MIME-Version: 1.0 Message-ID: <169780187520.3135.17318786431537770737.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: 78f52b9b8ac34713cb352a90d12fc82d2e8128e3 Gitweb: https://git.kernel.org/tip/78f52b9b8ac34713cb352a90d12fc82d2= e8128e3 Author: Thomas Gleixner AuthorDate: Tue, 10 Oct 2023 17:08:43 +02:00 Committer: Borislav Petkov (AMD) CommitterDate: Thu, 19 Oct 2023 15:44:35 +02:00 x86/microcode/amd: Cache builtin microcode too save_microcode_in_initrd_amd() fails to cache builtin microcode and only scans initrd. Use find_blobs_in_containers() instead which covers both. Signed-off-by: Thomas Gleixner Signed-off-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/20231010150702.495139089@linutronix.de --- arch/x86/kernel/cpu/microcode/amd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/micr= ocode/amd.c index 56d8bd6..2458379 100644 --- a/arch/x86/kernel/cpu/microcode/amd.c +++ b/arch/x86/kernel/cpu/microcode/amd.c @@ -533,7 +533,7 @@ int __init save_microcode_in_initrd_amd(unsigned int cp= uid_1_eax) enum ucode_state ret; struct cpio_data cp; =20 - cp =3D find_microcode_in_initrd(ucode_path); + find_blobs_in_containers(cpuid_1_eax, &cp); if (!(cp.data && cp.size)) return -EINVAL;