From patchwork Fri Oct 20 11:37:53 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: 156058 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp992348vqb; Fri, 20 Oct 2023 04:42:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFYMQu/SRkOrWWsx0HVsN0tS80XJ0oqHmTZJmRgBU76g1rHqRJbX9qB1bDTCbLqGHBN/aEX X-Received: by 2002:a17:902:f104:b0:1c9:dff1:6ded with SMTP id e4-20020a170902f10400b001c9dff16dedmr1406729plb.1.1697802128039; Fri, 20 Oct 2023 04:42:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697802128; cv=none; d=google.com; s=arc-20160816; b=ML9jLu/aob9qbk+xvfblWk0L3bUdrcnfMPxRKaf3IsdLNX/n5FmY6PCpTT8Ze+bJs2 Co554kDFkPZq1STpAqR3jelpAExErxVbAsgiZhyr2QNulpRMhntdpNtr7488ovsmrDle wiverbpqxF4r7Yd9+TxhBGp3magWEpMjSL5I2sCXP9d7MftApnz02EnbIo8bvtvRbpfE e/q+hZiiLivLlgx7f2MSI0ueG/lpPScbl/fDrKQ7JjPtzCK0YiH+WO1nU1TH+dO47MTa lVhoW2QCoO63Gpao96ALLKjlmneew84JfE0AJL8KVxYA592zgB+s8Cdq4OCZNzcNffnt X7QQ== 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=BczCm80yMNtYYLLs9V0TgO64ubwxRuMBhSfMGrRZCi4=; fh=LWlv3U+xZ3+vQt4tlJRIlKl5VzN7iFjjE/bzRmlxKDA=; b=n2M01SDB9471T5zcPahYcH8J5i4ZLnZIbNRkv9njaTUa85S3c5WGOWbpCa6Cnuxjj/ n2Gj6QL6IObWrOdv0OTtfhRhnAQBla+PcaxNOqtZZUSeD1Lrcu7lxQeG8qQvuFzFCZHM ejTCMK2BYtJvXUvWzC67ei6E7hZQ8LYI71jLbNhmvC0yzuBMET8jYUTRn6vjmcrgvfw5 XQMvZZNuBlscxLyEf+xuZOIVYJpGOced2YX+DnCP8IIKCJyi9kD2Hk9EwJGBdwO//pWN KadlTVwzRbLKFikJShLJGSn5gXyxkvBCod0ALtc59+2uH76v390F1BwcE/pAtHY6Sk91 wMVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=0t3GzrdW; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=o3ouRRH2; 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 agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id u17-20020a170902e81100b001c5fa6d75acsi1764462plg.494.2023.10.20.04.42.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 04:42:08 -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=0t3GzrdW; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=o3ouRRH2; 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 7A97881F3D68; Fri, 20 Oct 2023 04:42:01 -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 S1377470AbjJTLkr (ORCPT + 25 others); Fri, 20 Oct 2023 07:40:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56828 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377380AbjJTLkN (ORCPT ); Fri, 20 Oct 2023 07:40:13 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03987273A; Fri, 20 Oct 2023 04:38:25 -0700 (PDT) Date: Fri, 20 Oct 2023 11:37:53 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1697801874; 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=BczCm80yMNtYYLLs9V0TgO64ubwxRuMBhSfMGrRZCi4=; b=0t3GzrdWL1hWbIU7wxHCWl3JgSKiCnaWZ05q8UmMODwR0vazmj6aspIJz2zJdcdke6x5Xe cejTJoIX8mYas1GozMfLAQ4xogweqE5Alune40D6ryQZRXFYwDYW5aWH0+pfX2MSDPZeeo wY6ebXntMqyEE3LuWAPXeCTzFSayLTSIcDVscYhT0rKuNSQ4TMeuhCGvmBKj3daWaIogVo dCQq/CK/meTStF/oyWSJl/tufcqqcLCV+aOHpUrmD8PRml0xSo5Eqkswh9u8DBS3f0shFy JvqHoY5Vp7UN6c1ZyVERZ9ryedHatsvO3ElWDGlHWHB0gzz0fU8DdJ0ZUUpcOg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1697801874; 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=BczCm80yMNtYYLLs9V0TgO64ubwxRuMBhSfMGrRZCi4=; b=o3ouRRH24jimf9OJzt/DAmDUDBYpGL5IJswImQ6UAhO8yqVDfh2uNw4FbDOEpR1WrkKFR3 GbI2HRzWC0oSymAQ== 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: Mop up early loading leftovers Cc: Thomas Gleixner , "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20231017211723.298854846@linutronix.de> References: <20231017211723.298854846@linutronix.de> MIME-Version: 1.0 Message-ID: <169780187358.3135.10296901941195056547.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails 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:01 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780039545185840809 X-GMAIL-MSGID: 1780274564323237399 The following commit has been merged into the x86/microcode branch of tip: Commit-ID: 7800dda414725c9c8c266ae9b0be811563714e14 Gitweb: https://git.kernel.org/tip/7800dda414725c9c8c266ae9b0be811563714e14 Author: Thomas Gleixner AuthorDate: Tue, 17 Oct 2023 23:23:56 +02:00 Committer: Borislav Petkov (AMD) CommitterDate: Thu, 19 Oct 2023 15:49:50 +02:00 x86/microcode: Mop up early loading leftovers Get rid of the initrd_gone hack which was required to keep find_microcode_in_initrd() functional after init. As find_microcode_in_initrd() is now only used during init, mark it accordingly. Signed-off-by: Thomas Gleixner Signed-off-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/20231017211723.298854846@linutronix.de --- arch/x86/kernel/cpu/microcode/core.c | 17 +---------------- arch/x86/kernel/cpu/microcode/internal.h | 1 - 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c index 15c5042..37145cf 100644 --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -44,8 +44,6 @@ static struct microcode_ops *microcode_ops; bool dis_ucode_ldr = true; -bool initrd_gone; - /* * Synchronization. * @@ -180,15 +178,7 @@ void load_ucode_ap(void) } } -/* Temporary workaround until find_microcode_in_initrd() is __init */ -static int __init mark_initrd_gone(void) -{ - initrd_gone = true; - return 0; -} -fs_initcall(mark_initrd_gone); - -struct cpio_data find_microcode_in_initrd(const char *path) +struct cpio_data __init find_microcode_in_initrd(const char *path) { #ifdef CONFIG_BLK_DEV_INITRD unsigned long start = 0; @@ -216,12 +206,7 @@ struct cpio_data find_microcode_in_initrd(const char *path) * has the virtual address of the beginning of the initrd. It also * possibly relocates the ramdisk. In either case, initrd_start contains * the updated address so use that instead. - * - * initrd_gone is for the hotplug case where we've thrown out initrd - * already. */ - if (initrd_gone) - return (struct cpio_data){ NULL, 0, "" }; if (initrd_start) start = initrd_start; diff --git a/arch/x86/kernel/cpu/microcode/internal.h b/arch/x86/kernel/cpu/microcode/internal.h index 89fbf74..4bef216 100644 --- a/arch/x86/kernel/cpu/microcode/internal.h +++ b/arch/x86/kernel/cpu/microcode/internal.h @@ -86,7 +86,6 @@ static inline unsigned int x86_cpuid_family(void) } extern bool dis_ucode_ldr; -extern bool initrd_gone; #ifdef CONFIG_CPU_SUP_AMD void load_ucode_amd_bsp(unsigned int family);