From patchwork Wed Oct 11 09:01:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 151224 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp395243vqb; Wed, 11 Oct 2023 02:02:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGdcAWkdaX+hk6bSVADpuikdY1hrvq4x2lZZS8t739eSWIWXLk9Zpl5b+PaJJcTGYOinGpM X-Received: by 2002:a05:6a21:a596:b0:163:d382:ba84 with SMTP id gd22-20020a056a21a59600b00163d382ba84mr25248454pzc.5.1697014933741; Wed, 11 Oct 2023 02:02:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697014933; cv=none; d=google.com; s=arc-20160816; b=0HT3hOvr34nOib+rdCrV2t29ZHvm0D1W1pVXoF/ozRyi6okGEd/Gaho5uHXmXN7HJt YwFBTgvRUO1uawxU0IErQVOZdiOjd0tXrz0dh8+hoE+V8pdHZRMywss0CNX4Ybi7bZL3 Or2tOFvnf3zVxHIXHTGITcnmWEpeWh0VuRHKagdt7xCGbwAqjzAZReg2XuLbJJtwdu/s x6oRk35J96qON+qrXyFUhY4v3vyShqhbauDorRp0GlrQ9wonn7L1yyxaLzWReb5OqLPD T5VNOc43HkRLorWD6f9glc5lWWIfyJDy61fqroZiseGyhX2gkkHa9h2GAAp+EPpRynqR oyqg== 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=u9cZVj4bv4IpZlK8V2Dgi2eMXLGVornMslcY7baLwK4=; fh=LWlv3U+xZ3+vQt4tlJRIlKl5VzN7iFjjE/bzRmlxKDA=; b=vdCNHD5ni1kNvXa5VkK+Yu5vNNjO0iC8niecx4ot7g0YvYYTbs5KpJviWWbdpXPxsy 1yYgdTqTvooHUZCAhidKHCkBw7MuWJxozjwP4nmgjF8HiR/Ey0LqNb1y9qRPYhpa9vJv OFuvcv338z+/xdP26SQTPSuOpPOBx1ygDvwsceJymGV0Les8LyXe4tNMnfZojgjpRSaD x+ESAyJe+3yjY/0x0f1xgkO7odyUknl1ZHcAmQoZiXdI0Pt4+FbUQe7SudyO0AQLpVb6 WG3z6hXkE4MHopC+8RqJLwggZzweISSme/IeQPUVOG44LcErGk2NVtbzbKSnt9s7LyNO +o0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=nX1CgwAs; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id u7-20020a170903124700b001b8b4330585si15034694plh.510.2023.10.11.02.02.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 02:02:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=nX1CgwAs; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 E373F8136BD8; Wed, 11 Oct 2023 02:01:57 -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 S230469AbjJKJBS (ORCPT + 19 others); Wed, 11 Oct 2023 05:01:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51868 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345837AbjJKJBH (ORCPT ); Wed, 11 Oct 2023 05:01:07 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A284CC4; Wed, 11 Oct 2023 02:01:04 -0700 (PDT) Date: Wed, 11 Oct 2023 09:01:01 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1697014863; 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=u9cZVj4bv4IpZlK8V2Dgi2eMXLGVornMslcY7baLwK4=; b=nX1CgwAs+3m5gpdkkHJ4vcUcxYXmcyzLm1jjRIU5W877u9mics17VqOLVzexqfU4gNmcQo fv8QdEWZG/UWY9naMFcRwhiIyOnYgejC/xMMv7Sbvzgy1BRtj6/xCb5QQ6TI9ZSD5S9mYV /hKFrCxiGmxZCbizSIbU/eWR+ASggNtkvxF8DImS/iapqwryGc6TUJ3zWh69duQB0vklEU xclAR297r6HNIbMDwCGVdEmWOxHz0J/k0xZGkkDRGblNOmcKmtv33ade47S0cqAWCDFaim 7+RcBcbuR80PBqh9CJELQbNsRD/eeGo+PqIxsABzIggyWHq0FkJr0DLfA2ej/A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1697014863; 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=u9cZVj4bv4IpZlK8V2Dgi2eMXLGVornMslcY7baLwK4=; b=Ab+3TSfpUHzELfL2r1tHpruNuVDjRRItOvoGXV9UF2HMIkO9TccQa74Zw7fG//lyc97Xl/ gfkdqVVzQKP8+FCg== 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: <169701486183.3135.695611343878814881.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=2.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no 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: 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]); Wed, 11 Oct 2023 02:01:58 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779381622971381231 X-GMAIL-MSGID: 1779449131324013419 The following commit has been merged into the x86/microcode branch of tip: Commit-ID: a983f3245ac2178cb697996e19d1fadee9648bfb Gitweb: https://git.kernel.org/tip/a983f3245ac2178cb697996e19d1fadee9648bfb Author: Thomas Gleixner AuthorDate: Tue, 10 Oct 2023 17:08:43 +02:00 Committer: Borislav Petkov (AMD) CommitterDate: Tue, 10 Oct 2023 19:44:59 +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 f6ed2c5..046b3a6 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;