From patchwork Tue Oct 10 15:08:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 150837 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp271896vqb; Tue, 10 Oct 2023 08:09:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGrGU1AQqqik+89lfCDYdtlvlCQagVLyIvZL51Hk6QUg0bt2/TkQPCuwBrQ3O9g4Qd3IzVn X-Received: by 2002:a17:902:e881:b0:1c4:4c10:6ae3 with SMTP id w1-20020a170902e88100b001c44c106ae3mr21458480plg.23.1696950552981; Tue, 10 Oct 2023 08:09:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696950552; cv=none; d=google.com; s=arc-20160816; b=hLfWfCn0MAPKPJebrbqwB27HHDdUuxbNC0DzRRTijUMgr110J5tGWaaTlBiHtVFb5b BEVYhgfxO/0L0Fim43+uln+UDjJ3WdF/2OBbIAblXJWDVos59dzKkbnq+H3JBC8OOm5s qv1/f2LfybRo8iGdg2LEO3fjD0rpTLxDSMwa6Zqnqjov76gJ1MG5ksjBaBL/WBLUGcTn X7v/Omw233083Io4PkHuxK9x/bVEjCPEa/epYebh80KdnxfJLvI4pD3rF2XUCgXVGMfm 3K6LTy/oucr03Yg+8qs2QCFHwJGZ1TrbdtnoyrkrGnwEh6Zhx5cgXcPKoSR1eyvcTkZF dzGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:mime-version:references:subject:cc:to:from :dkim-signature:dkim-signature:message-id; bh=/T+TzF884nNOcfjx73gfiSU4BbvmUfK//JWS9uWIFHE=; fh=8iy+GLBXZdpcs/hIddJ7mbUapYjefwP9Gb111pAzFms=; b=GSqbI3E3qdqD5+U/rezBeAbWZuFHBNQtbw36YTwjY9/t9qV2mHxb+AyqcqML3OTx2o uZ7s/QtmrSxiOE0B62CuHW7B1xbYtIsJqNk8I9XbRO+igXwv8rCLh9YptjqvAeOEGFSb RghqctemTXv8lVWtX34hYKeKys3h1W5YC2JL9TaplbUYi0oXAzzEXj9mhSnsXPE6mVml 9NapdhWp4IEMXKlh8zzojln+Ei4kMFlI7XsJHHJhg94XFxCFDqNtJGoOKBx+9cL2FEOL KaS5kpKGrr4xVQdJPbMjQc9PPeAO9Gtno7dHEHTU3UYvJjvbdDIUJuQSIZ0PJeB7Q+e0 gx0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=UjYOvh2V; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id g17-20020a170902d1d100b001c6240dec44si11371030plb.389.2023.10.10.08.09.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 08:09:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=UjYOvh2V; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (Postfix) with ESMTP id 0E84881FD9EF; Tue, 10 Oct 2023 08:09:09 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233313AbjJJPIw (ORCPT + 20 others); Tue, 10 Oct 2023 11:08:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56328 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232771AbjJJPIu (ORCPT ); Tue, 10 Oct 2023 11:08:50 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05F3DB6 for ; Tue, 10 Oct 2023 08:08:45 -0700 (PDT) Message-ID: <20231010150702.495139089@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1696950523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=/T+TzF884nNOcfjx73gfiSU4BbvmUfK//JWS9uWIFHE=; b=UjYOvh2VC6Qb27nBg0v5biPxpMwuhhQtZW6sc/vHworpZJWFUmmL1xs9xvUH5Q7bHov+Zo O3EJUgZCFv6JsmVenu4muN+hwxmC85oC3XUv7fkZsVczJLGNIMfk1XTDS0pAMdjAN7Yvij OmZnp1tPOnaS1iQ1qsXgvKxViMY08SlnC8qIpY+RQSOeM/GpF+JH/VCXfZroj0Z/A7ORnV gxPx0OCySchgvDvdY76I/W01PuvoDGvhoNOObe6g4yNn9jI/umpJBw+PU7RqG8zBxC1EAt 3d1JcXusqK36cWnu+DJ1uAUOVNSRfeDI9+0AUki/3WHM/zX62Xra6CAiklthbA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1696950523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=/T+TzF884nNOcfjx73gfiSU4BbvmUfK//JWS9uWIFHE=; b=Npgb09TuRPXz3VxOCdmN5TGC1qv8YH6pOzkUvF9voFqfDFS3bOjGpYBkfQhKqzucwwSUlV LhtveAMaQLv5t4AA== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Borislav Petkov Subject: [patch 2/5] x86/microcode/amd: Cache builtin microcode too References: <20231010145130.987300357@linutronix.de> MIME-Version: 1.0 Date: Tue, 10 Oct 2023 17:08:43 +0200 (CEST) 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 fry.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 (fry.vger.email [0.0.0.0]); Tue, 10 Oct 2023 08:09:09 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779381622971381231 X-GMAIL-MSGID: 1779381622971381231 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 --- arch/x86/kernel/cpu/microcode/amd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- 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( 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;