From patchwork Sat Jan 28 17:28:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 49889 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1438763wrn; Sat, 28 Jan 2023 09:41:57 -0800 (PST) X-Google-Smtp-Source: AK7set9GJT6OrHWcH1aChg09gYWQ3blExtlnDtka6u/WdGCFu8wIr7Wy9KJpUTbAs2PT+eTdid9Y X-Received: by 2002:a05:6a20:7faa:b0:bc:30aa:8a6d with SMTP id d42-20020a056a207faa00b000bc30aa8a6dmr8548912pzj.2.1674927717154; Sat, 28 Jan 2023 09:41:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674927717; cv=none; d=google.com; s=arc-20160816; b=GnzPlUMl8IdJaupa6fhnVqKEgqnv5m+31rpo9WCstAwP45ftDxqP5d9QrqsYN3c5yN Q3hNxQu2+jyECyRdTRmWoq6WwnJ3wxoH0KdJpkJ2EroKYUx08ZuEtBfQhuYSP32hWTN0 5HCzCh+fa2ZFZJEgWgYVhjpwXcCp3Ia9/L06t3++Henbdc97chBpjadPOEzS5zkTdX+G Bcoaz+ldaCUv11PdhLkU4EUH8m0Ph+Al6TuypUmGOZ7yhEnzlAa1oQn5Rg5qMjyfKwN+ uutO7MxW2bAcP0duRCmDiDS/+ipprZ3sfPlJLwK6oiVPTgThh0T+CcFaukQhYgRjef5L LUqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=+vzZ0sUl7tHwPKOmp6gPXwrd5ukPPRAMBGv1pFet+nA=; b=00wh5QOsKmY8UnCuIxShfWQrbblpZCiSLdSPUCzpN4fUQ21fMKaMGebv3EH9/nbsk9 yKWd3zlTFTMRuEVowKxFdxsMtM6vgG49bw9Azv2zTRbjFMqTBK3WlRxKzAD81VoAcAEb TILhCCIUz6j1eOQ6j7LhrvdnjSg1RgRlCOWNhjlbmXAaNb/Ct+ozoGQ662jrlZ3vpkrJ 1UOn7AkZMtg7jxhDzA6f/iI4z48xE8AT/8xSQC/w6o0nPBA+kgnZ3WZ/miEDTlirU3bI XBieuwrqjx0DfgMYOSuuyikM8rdUFg4JtpxP2Iq3e36JC/HRflKbttRvX3//vgH1YLwx ZRgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=sqouXPdw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c124-20020a633582000000b004df27953506si7153035pga.510.2023.01.28.09.41.45; Sat, 28 Jan 2023 09:41:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=sqouXPdw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234840AbjA1Rk0 (ORCPT + 99 others); Sat, 28 Jan 2023 12:40:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36788 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234767AbjA1RkX (ORCPT ); Sat, 28 Jan 2023 12:40:23 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34D33298DA; Sat, 28 Jan 2023 09:39:51 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 6EAFCB800E2; Sat, 28 Jan 2023 17:39:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 91502C433D2; Sat, 28 Jan 2023 17:39:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674927569; bh=TTEHjs77lMSGyMyLb+GPNvLBucTI1hfj0V7Hm4KfZnM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sqouXPdwpFFry4G0PA0upcZn7eKG9kRL3+Eb7Svbv0uYsIBMt9RCKmR/0tA47fmqY HNtmXimUsJwyoj/53MBMd+h2CAD+6WuxO7nokFEZMVFmb1NezKIVBt0zNxjjvqryqK rjEgHJHOxrSYC7g/41hu+Ejnf6tCil7UQcjFpGbilF12+I5t3D9TsnqlpFH2OEzTde j/APOjrf+RxNzfCpmKF6hu9MFkjO93pJbzbBvOuiRDHyL2j4mJ7wHB9OWoObjMDd2K ztJR8wG/PqTVbNPhVwS7ekIm+QQBba/zedyz6GRCNZo945hJmNek6m8FPevzTik2fU lAfUdq39q5gAw== From: Jisheng Zhang To: Palmer Dabbelt , Paul Walmsley , Albert Ou , Anup Patel , Atish Patra , Heiko Stuebner , Andrew Jones , Conor Dooley Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org Subject: [PATCH v5 02/13] riscv: cpufeature: detect RISCV_ALTERNATIVES_EARLY_BOOT earlier Date: Sun, 29 Jan 2023 01:28:45 +0800 Message-Id: <20230128172856.3814-3-jszhang@kernel.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230128172856.3814-1-jszhang@kernel.org> References: <20230128172856.3814-1-jszhang@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756289006172076468?= X-GMAIL-MSGID: =?utf-8?q?1756289006172076468?= Currently riscv_cpufeature_patch_func() does nothing at the RISCV_ALTERNATIVES_EARLY_BOOT stage. Add a check to detect whether we are in this stage and exit early. This will allow us to use riscv_cpufeature_patch_func() for scanning of all ISA extensions. Signed-off-by: Jisheng Zhang Reviewed-by: Andrew Jones Reviewed-by: Heiko Stuebner Reviewed-by: Conor Dooley --- arch/riscv/kernel/cpufeature.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c index 62443fd32fa7..59e20cad1b3d 100644 --- a/arch/riscv/kernel/cpufeature.c +++ b/arch/riscv/kernel/cpufeature.c @@ -330,6 +330,9 @@ void __init_or_module riscv_cpufeature_patch_func(struct alt_entry *begin, struct alt_entry *alt; u32 tmp; + if (stage == RISCV_ALTERNATIVES_EARLY_BOOT) + return; + for (alt = begin; alt < end; alt++) { if (alt->vendor_id != 0) continue;