Received: by 2002:a05:7412:251c:b0:e2:908c:2ebd with SMTP id w28csp1884179rda; Tue, 24 Oct 2023 06:23:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGnNb1T+OMbLoUgiMrCqFZPv0FBSlLVH9p00SvaAdMLM4k6jUBnVvIB1FLEF8IKR+6jj+5T X-Received: by 2002:a17:90b:3e85:b0:27d:1567:f51d with SMTP id rj5-20020a17090b3e8500b0027d1567f51dmr13068052pjb.47.1698153837499; Tue, 24 Oct 2023 06:23:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698153837; cv=none; d=google.com; s=arc-20160816; b=k3fDNghG8vBikCnsOtg8+DbWWJeChQFbaQGiW7pwEOsAlLuoJ6iFCdi/m9N7f8o3f2 BZShJsJ84f9ktKzlKdPknDKdlNKIXsE4muBdTv1X2vKfm8506BjDOISC7HfSsJKpW7It 0RahbIJPvTM1pweSRRzMWQ8VDuZHH4BPalxIJG7eL7kjnQt/UKW1OLKfd3lfcqObxdMD h58FxTR0tLxm2BXfT8jrqiErn8A7duyQ6BVvlQGEo9Cv/O33Cw8LPsLao+NWgZSMg7nT BIpkxcYXxws78VO8m3kCz5QoGNgvDqjDOK9aKidUYh4pVIsVNiOcdjwpUiw0NQzSePtF 8Bmw== 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 Return-Path: Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id l20-20020a170903005400b001ca86fa1e1csi7919319pla.484.2023.10.24.06.23.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Oct 2023 06:23:57 -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 68E2A803DAEC; Tue, 24 Oct 2023 06:23:44 -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 S234694AbjJXNWr (ORCPT + 99 others); Tue, 24 Oct 2023 09:22:47 -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 ); 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" 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: <169815366173.3135.15317194687578772075.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 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]); Tue, 24 Oct 2023 06:23:44 -0700 (PDT) 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 AuthorDate: Tue, 10 Oct 2023 17:08:43 +02:00 Committer: Borislav Petkov (AMD) 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 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;