Received: by 2002:a05:7412:f690:b0:e2:908c:2ebd with SMTP id ej16csp955755rdb; Fri, 20 Oct 2023 04:42:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHnqog+XompEF/WeIQk4U1bB7aeXf8V0yUCgQk7b/tSHsw1tRkpqUgAAB/qOGl6ev/zfhrO X-Received: by 2002:a05:6a21:3398:b0:16b:80b4:c39a with SMTP id yy24-20020a056a21339800b0016b80b4c39amr1675919pzb.19.1697802145494; Fri, 20 Oct 2023 04:42:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697802145; cv=none; d=google.com; s=arc-20160816; b=k7XFNTFsO/Qjn5sV6Vx2IHtFQUhUCKzbN8nss8qVHDeKjR0Jb+U43DD3//dLpT1xxm qB4eFTokhwHVmfgxc2bHlIYjKps11en1V0eRUetjULtvNmHyo9U8yYBJED9A819X8Bb3 d9eLP0qR4w38GBMpqOyo96Q9JpIgGo9j8vzgaD3/vTAZU/PNYRD0d6qsu6t7OQSLUi8W 1xQJd9XrbxS+5AYfx9jGNy2xal6cQcthI3z/sJtSNEiEDBRcqrIyeLwZtJ/tfpBCdgfk GaaIGQQsXPEeRWdNRbgAD66E6x+qNWmgCE4K6noHy8Mz/etwxHfF82tRdq4Fjla1cJqW KLjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=47fegGk78WLObql5tga+epDvENs5jZ0xTJTdq0Xxcws=; fh=LWlv3U+xZ3+vQt4tlJRIlKl5VzN7iFjjE/bzRmlxKDA=; b=ZRZsn1x0vJUFVZ3RVpJq4HhP8odARzicBcpjBo83lWOeILRDZee54a6dxDxFI8FnhE hw7Ra8YNWKDC/Fue/z6xytgxouS7ntjBk9L7zJXzv8lpU0W6Uliy1eZtnfA73BXuovA5 Gq4Zn2c3S47maALhqgbEduR+qPrPbN7qjq3BfczGnb/7Xf8XeKaaOELQ1zt7eo7/vh4V J3NzXo6/lwOgjCUgC1hnkX2hNEF4Zho46+tqIr4Nb30i+x6EoqCAuYoVpKqcXFOBKS/z F/S0tqcgu1ybGXguXr9+Ujfk8JvntJiglJ4tHGtjb3u+CcLXEwhVIhc0BsscLs2DxJsi sGbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=U8EKH9cg; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id g6-20020a636b06000000b00578a98c0687si1805991pgc.99.2023.10.20.04.42.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 04:42:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=U8EKH9cg; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id B1C2D81F3D6A; Fri, 20 Oct 2023 04:42:19 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377515AbjJTLlz (ORCPT + 99 others); Fri, 20 Oct 2023 07:41:55 -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: 7bit X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Fri, 20 Oct 2023 04:42:19 -0700 (PDT) The following commit has been merged into the x86/microcode branch of tip: Commit-ID: 78f52b9b8ac34713cb352a90d12fc82d2e8128e3 Gitweb: https://git.kernel.org/tip/78f52b9b8ac34713cb352a90d12fc82d2e8128e3 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/microcode/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 cpuid_1_eax) enum ucode_state ret; struct cpio_data cp; - cp = find_microcode_in_initrd(ucode_path); + find_blobs_in_containers(cpuid_1_eax, &cp); if (!(cp.data && cp.size)) return -EINVAL;