From patchwork Wed Apr 13 03:03:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Heiko_St=C3=BCbner?= X-Patchwork-Id: 12811419 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A598FC433EF for ; Wed, 13 Apr 2022 03:03:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=XD48g5qEGNaMqudHPjmkOvhl0010iksdXW4hC25gyZ0=; b=HLAqa4KdwU3fAP oKj0lQt7ALGqMBT/YFuUvzjUNVSn6Iwqt4w/B20DYfDboB/iwFM7Oz3xurS2vYSGCK3TV5M4rH80s ASE/HwJ0VazOXZsLQlU+pV+0pCewNKa173EA/6jBrfqb1nLAlbN1WHPabZ4vzhtJ6tMWk1/3BN77B lvgG4GRNqTAbL3YVcym3FOyppVjR2pjUeURq2rqaSPmf/8Ul+l8yfiXcWdRsXmQOEpBeyywTk66Sn wbKosTs3DzC2giJIoI1ihj5sSxHsd1WPNAn2No0RdJiOzOEaFbvkxs062PwWFB2H8/3jYyvMW+wba R3OyIAjo61sTfxRLBm2A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1neTIC-00GTv3-Kn; Wed, 13 Apr 2022 03:03:40 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1neTI3-00GTpP-Oo for linux-riscv@bombadil.infradead.org; Wed, 13 Apr 2022 03:03:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=wqdeRl7jHofN4Z1alkv3hGslmUw1rjDMh2GLBbQfddQ=; b=qulGs1EaIF8l91xICWDgHCDqF9 pJVkcL3Vr0qy3799/7aQO36IwP+kODzkWBcEccbvZcoehmP4mOOJo7vXZlPBHm7D/Qn6o1nXytshs c/VFRn3WA0delZW7GLXu9zVACJ7kWi3meFYpicBwSnT3U1JukYO7Epoahu/DJPNJo3jCSIu23msV9 CX7J87MGv2KLeEieQpu4vvZfckUz1vwMQrhlMsF9w3182noOnShI1KM+gPO214M6DM7VfV7sKI4A8 BzTbHrCDj6R/TCwtzONMxRrgUDqgmTm+GHfK+St1MivXRT2dr2LsdeC3g5C3htGqCUm5MTxzBhRBQ 4UpPB5Kw==; Received: from gloria.sntech.de ([185.11.138.130]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1neTHz-004WXf-Hv for linux-riscv@lists.infradead.org; Wed, 13 Apr 2022 03:03:29 +0000 Received: from ip5b412258.dynamic.kabel-deutschland.de ([91.65.34.88] helo=phil.fritz.box) by gloria.sntech.de with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1neTHr-0006sN-Ne; Wed, 13 Apr 2022 05:03:19 +0200 From: Heiko Stuebner To: palmer@dabbelt.com, paul.walmsley@sifive.com, aou@eecs.berkeley.edu Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, wefu@redhat.com, liush@allwinnertech.com, guoren@kernel.org, atishp@atishpatra.org, anup@brainfault.org, drew@beagleboard.org, hch@lst.de, arnd@arndb.de, wens@csie.org, maxime@cerno.tech, gfavor@ventanamicro.com, andrea.mondelli@huawei.com, behrensj@mit.edu, xinhaoqu@huawei.com, mick@ics.forth.gr, allen.baum@esperantotech.com, jscheid@ventanamicro.com, rtrauben@gmail.com, samuel@sholland.org, cmuellner@linux.com, philipp.tomsich@vrull.eu, Heiko Stuebner Subject: [PATCH v9 07/12] riscv: move boot alternatives to after fill_hwcap Date: Wed, 13 Apr 2022 05:03:02 +0200 Message-Id: <20220413030307.133807-8-heiko@sntech.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220413030307.133807-1-heiko@sntech.de> References: <20220413030307.133807-1-heiko@sntech.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220413_040327_687598_9558EF6C X-CRM114-Status: GOOD ( 12.91 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Move the application of boot alternatives to after the hw-capabilities are populated. This allows to check for available extensions when determining which alternatives to apply and also makes it actually work if CONFIG_SMP is disabled for whatever reason. Signed-off-by: Heiko Stuebner Reviewed-by: Christoph Hellwig Reviewed-by: Guo Ren Reviewed-by: Philipp Tomsich --- arch/riscv/kernel/setup.c | 2 ++ arch/riscv/kernel/smpboot.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c index f4f4a64bc3a0..9162e9a824d2 100644 --- a/arch/riscv/kernel/setup.c +++ b/arch/riscv/kernel/setup.c @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -295,6 +296,7 @@ void __init setup_arch(char **cmdline_p) #endif riscv_fill_hwcap(); + apply_boot_alternatives(); } static int __init topology_init(void) diff --git a/arch/riscv/kernel/smpboot.c b/arch/riscv/kernel/smpboot.c index a6d13dca1403..f1e4948a4b52 100644 --- a/arch/riscv/kernel/smpboot.c +++ b/arch/riscv/kernel/smpboot.c @@ -32,7 +32,6 @@ #include #include #include -#include #include "head.h" @@ -41,7 +40,6 @@ static DECLARE_COMPLETION(cpu_running); void __init smp_prepare_boot_cpu(void) { init_cpu_topology(); - apply_boot_alternatives(); } void __init smp_prepare_cpus(unsigned int max_cpus)