| Message ID | 169815366173.3135.15317194687578772075.tip-bot2@tip-bot2 |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1939207vqx;
Tue, 24 Oct 2023 06:25:03 -0700 (PDT)
X-Google-Smtp-Source:
AGHT+IGakoiJyJ7dvGowEYC+jgy8/WA6Wg/ROwnT29dmkEr+ciDLSlm9hViTFgrK15G3bAFPPtx5
X-Received: by 2002:a05:6a00:248d:b0:6b2:5992:9e89 with SMTP id
c13-20020a056a00248d00b006b259929e89mr14928602pfv.9.1698153903505;
Tue, 24 Oct 2023 06:25:03 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1698153903; cv=none;
d=google.com; s=arc-20160816;
b=Tzjo2wYEP4XOHFqjHT7eyS12/jza+esjKN5/2mRrfv+PADhzP6gUsovpk/O0jkTfsk
ti7MCIpY1kFBOx0pI4CsXmWPmNawhKleTrl6O+hl4dJ6BnlaTMCUKb6PAF7mDF6NkrRP
boVcuVizT/cYbryB9I1HZrYRNFZ9qtJxu57BETwrydhDizVXeSCBlXFk+aGsHx+3JHkl
U2veAqD9aWr/QacoAcR7vYE9/HCjKsYvtBp2EWMkX/oDaJww7pgjfrmLrWhlTe8fyqqZ
szi0AiJp1iAFUQYxg60v6cHHIRSmUxcoZnfW47ihMlE5UnXTU2/6vRmOiD/M5gLLJGdZ
QnIw==
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=9YJNAq3utUE/mbx92iL09S+Fybi+Kw1ltBDQ9lkJRbk=;
fh=LWlv3U+xZ3+vQt4tlJRIlKl5VzN7iFjjE/bzRmlxKDA=;
b=LmNbTLVVmkd6STL9mZTlfSpFD/YoqINZ/WDWyVi4miY6XXOApnHH9vzu7ZhYkhm+S8
YdvRteFJ7AQ7KH4msAfog5d/a2bXeegUqneMM7UrYawWBo5dvBygfFIjG6rncGxQUXYv
8NCD6DpNb4J34HJUNknoCEhEaezvIrwGcbn89nmkBo+imrrkLc73uYFxle0o+uOPqmIV
6A/4EVCDlvUj1J+tiaFocVDOSZ1MGgUtpEq7Of8zq8dpeCgyq8OaQmjfd/ztYQNONor2
2JP0CPqLfRESoaNFePUs8S9VQPMuJ05X8HBnen5FCiJSfpHxP8UeZNwMIfOftB2oxM9M
XSQA==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@linutronix.de header.s=2020 header.b=a9vSdJdO;
dkim=neutral (no key) header.i=@linutronix.de header.s=2020e
header.b=AjlzGHx9;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.36 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 pete.vger.email (pete.vger.email. [23.128.96.36])
by mx.google.com with ESMTPS id
cb17-20020a056a02071100b00578f1ab2287si8597225pgb.354.2023.10.24.06.25.03
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 24 Oct 2023 06:25:03 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36;
Authentication-Results: mx.google.com;
dkim=pass header.i=@linutronix.de header.s=2020 header.b=a9vSdJdO;
dkim=neutral (no key) header.i=@linutronix.de header.s=2020e
header.b=AjlzGHx9;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.36 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 pete.vger.email (Postfix) with ESMTP id 3F3FD806E294;
Tue, 24 Oct 2023 06:24:52 -0700 (PDT)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S234699AbjJXNWs (ORCPT <rfc822;a1648639935@gmail.com>
+ 26 others); Tue, 24 Oct 2023 09:22:48 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41372 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S234577AbjJXNWA (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Tue, 24 Oct 2023 09:22:00 -0400
Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66C79198A;
Tue, 24 Oct 2023 06:21:05 -0700 (PDT)
Date: Tue, 24 Oct 2023 13:21:01 -0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de;
s=2020; t=1698153663;
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=9YJNAq3utUE/mbx92iL09S+Fybi+Kw1ltBDQ9lkJRbk=;
b=a9vSdJdO6aZTYnv0b+lXKYhYm6rmhpjIo99z0WDJPKp96OWmzDLWvaSiB1fluOrxtrmglJ
rSma3nMagXSiexgHuWFw6W62Y7HuOIOwMflVVBF5in2Gf+fYYEHcVcRMoAWAVlpZDVO92M
qz6DyZCJ10odYDSk6Oskhr/2IY97Y5lUYYMQ6HVRH92JdsotuWZfbgic8fqX+exAYYWxDp
pRSUvqhPD9HdESM/DV38rYoB+xobF8+ted+R6MadrDEUoEZ8YY3QQYbTECONGxkIBovaBK
SO3l/F80Xgnwe93LREtQtNTLGh19OIs31sBhG+nFJy1ROeK+rkFnA+uLkrXN5w==
DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de;
s=2020e; t=1698153663;
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=9YJNAq3utUE/mbx92iL09S+Fybi+Kw1ltBDQ9lkJRbk=;
b=AjlzGHx9IBdGd1AR9n91c8GrffYfbmKLBuy2kNwVUWgXpzckwWB3ZLbFbQkE6dwF30eQGj
CzJf5R7Jh/W+poBw==
From: "tip-bot2 for Thomas Gleixner" <tip-bot2@linutronix.de>
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 <tglx@linutronix.de>,
"Borislav Petkov (AMD)" <bp@alien8.de>, 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: <169815366173.3135.15317194687578772075.tip-bot2@tip-bot2>
Robot-ID: <tip-bot2@linutronix.de>
Robot-Unsubscribe: Contact <mailto:tglx@linutronix.de> 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 pete.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test,
not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]);
Tue, 24 Oct 2023 06:24:52 -0700 (PDT)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1779381622971381231
X-GMAIL-MSGID: 1780643427115899808
|
| Series |
[tip:,x86/microcode] x86/microcode/amd: Cache builtin microcode too
|
|
Commit Message
tip-bot2 for Thomas Gleixner
Oct. 24, 2023, 1:21 p.m. UTC
The following commit has been merged into the x86/microcode branch of tip: Commit-ID: d419d28261e72e1c9ec418711b3da41df2265139 Gitweb: https://git.kernel.org/tip/d419d28261e72e1c9ec418711b3da41df2265139 Author: Thomas Gleixner <tglx@linutronix.de> AuthorDate: Tue, 10 Oct 2023 17:08:43 +02:00 Committer: Borislav Petkov (AMD) <bp@alien8.de> CommitterDate: Tue, 24 Oct 2023 15:05:54 +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 <tglx@linutronix.de> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> 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;