From patchwork Tue Oct 24 13:20:59 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: 157469 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1938882vqx; Tue, 24 Oct 2023 06:24:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG/Q3bSs1CVEmvhpoaEnST7KyvxOWwFv2I1hzRMO1zUcbe6UIhvUW4LFCbQJE23PreUC7aZ X-Received: by 2002:a17:902:b284:b0:1c9:c35f:9a25 with SMTP id u4-20020a170902b28400b001c9c35f9a25mr9255705plr.34.1698153867614; Tue, 24 Oct 2023 06:24:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698153867; cv=none; d=google.com; s=arc-20160816; b=HUGkS/Ag0QmWVxuFqgYlgV81toTP9kCILypR3rMH+UOf1+qTxth4dgks8F9lGbu6C+ Ba+doEM74ZHSr9HO+hrpXbpoQUiHt6nXP7KfIK9GRDUSQ7Gf1s3/gTeCQZCelJXYw08M 8cnFYh32GOEqKXR5F77QW2MdzlHPVgO9MMdIWl0CrVxztOcWqpy77Bvl5sOlpiqpMlh0 jytaCUU8GtM5DFldQfM0muEpINjPzyubzXAACSi0rh80u/cTgOvjpcuYRULlTYb7EVm2 NyDIcxz5aDKy7T3AzIltHvx0W0DVg7X0xhwKW9+/bWzoWnvFPJGqgZG8dJIBSdT2etRC RlJQ== 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=kEZBCqBTW6/7XbM2B3x2pq8TOwlodBnG6NHznBvq9uE=; fh=LWlv3U+xZ3+vQt4tlJRIlKl5VzN7iFjjE/bzRmlxKDA=; b=twJUQtC00CfyiVlYK3tmNoX6HO3HhnwF8Ckiek28zhDafJzW6s+7SI4fVplNXxgn8O 0XcY90MOG7uf0p9wZPLLRV6g1jT+ICLl9dCPnyVAEvpVl2/vk7HsLl79ez8PSGHVlkdH 76QkpzHYhdFof/euKmPiFm9j/X8vItlt4QURlMfWXUSDG7m/YmYgE8EfzQ76sZwfmfhQ Q5WcsCPvqnkDDKzGt5jgz08ob6kmFtfig7BotcA3lJLfxHTkODllvyQFAFGGTSZy6uM0 IZ3I9fT8j6pXCgBsX413alaUHO0ubITeBCAsPRqXhtjK1wmfd+2ZKzNT7H5z8Wy4wIUl 0AKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=M4oFKiLF; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; 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 1-20020a170902c10100b001bdd35033ebsi8063194pli.361.2023.10.24.06.24.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Oct 2023 06:24:27 -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=M4oFKiLF; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; 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 34C6E802E898; Tue, 24 Oct 2023 06:24:12 -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 S234654AbjJXNWU (ORCPT + 26 others); Tue, 24 Oct 2023 09:22:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234665AbjJXNVi (ORCPT ); Tue, 24 Oct 2023 09:21:38 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 349A810D7; Tue, 24 Oct 2023 06:21:01 -0700 (PDT) Date: Tue, 24 Oct 2023 13:20:59 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1698153660; 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=kEZBCqBTW6/7XbM2B3x2pq8TOwlodBnG6NHznBvq9uE=; b=M4oFKiLFK7rEqa3qtOyrBMzoz3PJrEUBQCUuCAxO8iKSgst/4tvNPazwFsFu1XQWQ+gTau t5Ul9QS7y70/uf6OeRYYItPqZFXCzExdPXwsWlQsTAsjK+Pe+JSAaZo0KJlxsS8CFgCoor hM+Ybw22cxE4O1uW/aOsUuMMOoBPer+weK6tdBLFXNI3qn54s+J9KUhx5/pvPwJ6c9b85M iohNU2ZZNHSs0bTkpxbnP4pXicomO43+EBCJzBrSrKVm+2F0mto5xT5JhlRxs2Xn+nqSFe us+mbkJXhSyo2zkyXcl2U8hgdaLi2WhhAIA46AWqqZ782xzs6vop6gQ6JXPZhg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1698153660; 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=kEZBCqBTW6/7XbM2B3x2pq8TOwlodBnG6NHznBvq9uE=; b=3Fb04KvzxJEt4/Z4AsQSgjCyy7BN6nWMZbUUjkZ1JMaN6dV8tBtEWVybeMC8nP3Hfqjbqy M2xzh95fP7mxF1AA== 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: <169815365952.3135.15815116375212749325.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 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, 24 Oct 2023 06:24:12 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780039545185840809 X-GMAIL-MSGID: 1780643390045836682 The following commit has been merged into the x86/microcode branch of tip: Commit-ID: 8529e8ab6c6fab8ebf06ead98e77d7646b42fc48 Gitweb: https://git.kernel.org/tip/8529e8ab6c6fab8ebf06ead98e77d7646b42fc48 Author: Thomas Gleixner AuthorDate: Tue, 17 Oct 2023 23:23:56 +02:00 Committer: Borislav Petkov (AMD) CommitterDate: Tue, 24 Oct 2023 15:05:54 +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);