From patchwork Sun Nov 28 16:07:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 12642971 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 986DBC433EF for ; Sun, 28 Nov 2021 16:15:12 +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=ZzSrbDkGHqs5wtITCwyvk6QKPFJNATTBPOdSpGoRln4=; b=wkGiv580rgLdq/ XFO/GTdcEWczx7WSNK/hKIQReNvPFsRe/sk+OcG+KeS/6CWrWBKOOOo7664YaWtPoiGx3hO8P+tkJ s218gyDeTzvWA5n+oehXG84HHpQjWczhAh6F5vwWV0AQwwZFOMI8sBIIvj4Z7epTIOvXSYmyvNUfV Mhw3bddooQyifx5UFCFYue+1iBIUcqpd7i38sNMgUdU+ubd0/2P8TrtYIDhWryHSDNtx60UI9y4Eg 9KiOwUPuG0Is4vaAULvOW8TdUzv9cFWiPrCgbQSVe9KwsQv7b+8y6fP8x67OTBqGMatQnLgw2BkNU YtmvgecKakn3xiRMvlRg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mrMpT-00G9a4-1A; Sun, 28 Nov 2021 16:15:03 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mrMpP-00G9Yk-RW; Sun, 28 Nov 2021 16:15:01 +0000 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 71209B80D22; Sun, 28 Nov 2021 16:14:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 88C4CC53FC7; Sun, 28 Nov 2021 16:14:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1638116097; bh=EISRwtT6a67IdIj4/hZElSg1YibLzkj4w6ZbgU3blVc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vAH6L/KcOcN75/rLs5688vzmsPhitHpT1faPJuZHuLUaMMsET3nyJ3SkpAPdGfKHv kn20n3RwRwsYxfE4VsMrnx9x47uNGpkgXIdUhkN2DgIFyI/ukTU/4/ZQHqCx8JpC8M hTpM1BdAKeYzq3gISSD2PizLejukCS/lq8QPBaPbwb9G72IxaxYFD3dZSQ+8MBW5ZS 1dmZugcsTLXaNULjnqNSbMiAAlURg3MPsGjmymcXj6K+TsN0U42iI9aL5QAQ7FIMss QJ90YepRR704ZLiSq+XYWZv242Rbsxv0qHmBkwaZs9MEChRevZkBgPBiT3z2h/IC9c RxIm4ZJMBNGrw== From: Jisheng Zhang To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Anup Patel , Atish Patra Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm-riscv@lists.infradead.org Subject: [PATCH 1/5] riscv: remove cpu_stop() Date: Mon, 29 Nov 2021 00:07:37 +0800 Message-Id: <20211128160741.2122-2-jszhang@kernel.org> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211128160741.2122-1-jszhang@kernel.org> References: <20211128160741.2122-1-jszhang@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211128_081500_051708_A0B4B66B X-CRM114-Status: GOOD ( 10.90 ) 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 Except arch_cpu_idle_dead(), no users of this function. So remove cpu_stop() and fold its code into arch_cpu_idle_dead(). Signed-off-by: Jisheng Zhang --- arch/riscv/include/asm/smp.h | 2 -- arch/riscv/kernel/cpu-hotplug.c | 8 +------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/arch/riscv/include/asm/smp.h b/arch/riscv/include/asm/smp.h index a7d2811f3536..e2b0d6c40a6c 100644 --- a/arch/riscv/include/asm/smp.h +++ b/arch/riscv/include/asm/smp.h @@ -63,8 +63,6 @@ asmlinkage void smp_callin(void); #if defined CONFIG_HOTPLUG_CPU int __cpu_disable(void); void __cpu_die(unsigned int cpu); -void cpu_stop(void); -#else #endif /* CONFIG_HOTPLUG_CPU */ #else diff --git a/arch/riscv/kernel/cpu-hotplug.c b/arch/riscv/kernel/cpu-hotplug.c index df84e0c13db1..be7f05b542bb 100644 --- a/arch/riscv/kernel/cpu-hotplug.c +++ b/arch/riscv/kernel/cpu-hotplug.c @@ -14,12 +14,6 @@ #include #include -void cpu_stop(void); -void arch_cpu_idle_dead(void) -{ - cpu_stop(); -} - bool cpu_has_hotplug(unsigned int cpu) { if (cpu_ops[cpu]->cpu_stop) @@ -75,7 +69,7 @@ void __cpu_die(unsigned int cpu) /* * Called from the idle thread for the CPU which has been shutdown. */ -void cpu_stop(void) +void arch_cpu_idle_dead(void) { idle_task_exit(); From patchwork Sun Nov 28 16:07:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 12642973 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 D85AFC433FE for ; Sun, 28 Nov 2021 16:15:12 +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=UmE0Ji2tGA9Or/iJ2AHEE1hojSR24Y6HF8Nh7gnANYA=; b=ILVrFGb12eaq4e jbAglH6m/MZoQiZFuxYxyHo9hSWdbu60nlj4E9nUdc0RsYT5WU1Ih+9+96rtCCZnlQ+FBYPD7NA1S GG/Ei3CZFtg6sT9wWnShd2IevPBUmATea9Q2DX/RXy6t1bRqGYzkMBTiKjJ6S1CMygFwfrgRQYjlm UwLWghG3Qrfxhc0s9YrKSnxe4FSRJOh9m2usEcvp4XarEWzeGLQsTA+ErnvgwpYmz1kRrz5JXeyNm wkAXNOtNaZJWhV1pC+573UUocM5ExoH37Lz7R+Fnk9bi6TDeibRxsZo6oEO6BEwGSNrJeBEpNMBss +2VIl99+wiE4xgLFJ76A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mrMpV-00G9bA-0T; Sun, 28 Nov 2021 16:15:05 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mrMpS-00G9Zn-Vc; Sun, 28 Nov 2021 16:15:04 +0000 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 A0887B80D10; Sun, 28 Nov 2021 16:15:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BB508C004E1; Sun, 28 Nov 2021 16:14:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1638116100; bh=TkeGvT+T+N/UbFTgouihV6/Po7pgj+jD5L9aMgcATg0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iSR9fRcuC9YGICfR8TRlzvzfboaEGTVg8vMXWO8rBsG9zf5qf03Qw0gxl/9oAqDCJ pxC1OZCGmW7Mt69MxcTY+javIYrnP7uuKv5aTQYV0qD+0SNQLSyBUwHFo77zl5GRtC sBDyN2piMZsoo/QyARnRcIkC8Znu0aXi9hV8WjUcUAMaeTb2lwWlryjnXNEl/9GVKo yENOdwbsIlyWdYzBG+vPXPyXxoWqCK2Aufso2kWCgXP+jJAwxulwLpPBobDKqRyJmP VRl5gaBdAjGorQFV5A2AHgYBbTV58MQ4jONtNM7kauRfiveRb0FQ4ftuqwsQDkxATV /BzPDtPKHMw0w== From: Jisheng Zhang To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Anup Patel , Atish Patra Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm-riscv@lists.infradead.org Subject: [PATCH 2/5] riscv: head: make secondary_start_common() static Date: Mon, 29 Nov 2021 00:07:38 +0800 Message-Id: <20211128160741.2122-3-jszhang@kernel.org> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211128160741.2122-1-jszhang@kernel.org> References: <20211128160741.2122-1-jszhang@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211128_081503_206496_439174AF X-CRM114-Status: UNSURE ( 9.03 ) X-CRM114-Notice: Please train this message. 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 There are no users outside head.S so make secondary_start_common() static. Signed-off-by: Jisheng Zhang --- arch/riscv/kernel/head.S | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/riscv/kernel/head.S b/arch/riscv/kernel/head.S index f52f01ecbeea..3ce95f8783bd 100644 --- a/arch/riscv/kernel/head.S +++ b/arch/riscv/kernel/head.S @@ -177,8 +177,7 @@ secondary_start_sbi: REG_L sp, (a4) REG_L tp, (a5) - .global secondary_start_common -secondary_start_common: +.Lsecondary_start_common: #ifdef CONFIG_MMU /* Enable virtual memory and relocate to virtual address */ @@ -365,7 +364,7 @@ clear_bss_done: beqz tp, .Lwait_for_cpu_up fence - tail secondary_start_common + tail .Lsecondary_start_common #endif END(_start_kernel) From patchwork Sun Nov 28 16:07:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 12642975 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 C06AFC433EF for ; Sun, 28 Nov 2021 16:15:14 +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=peKiv0sU8Eznv7VtWq5fzZLLpZAXjBOfBP4nvHJQdPU=; b=jkKQn4Y2Pmqiac JpldHUtXAdT6rd6inG0D8yYUahqycrKnWDCazvgCJaCHIK/1sm8vawV5ww3c15RjrJEFubehb5t3T Tzty+wg+QXL0m6evUvXBM1UtLujZvHGIpK8rkTP/4nSdHMjYGoLGWufSYnrE6WScrLzxlxDfrx3uj FiYGOd/ADgURr+US6F3DtjaV+zpYUX3BO8K2Jjy64LI69eQXaR36WMzny8ZzVueWpDNPhK7pKrIgp AZLH7oLqlXExiKQywps/NYEoNcN8F488QbUXm1rNvmeKQM/ZCkJVqwXZNkfF9jPhU4JZRn5nZ/s8q 1ws0v5Bob+33PajttWpQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mrMpX-00G9cF-7J; Sun, 28 Nov 2021 16:15:07 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mrMpU-00G9aa-63; Sun, 28 Nov 2021 16:15:05 +0000 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 dfw.source.kernel.org (Postfix) with ESMTPS id BF7CC60FE7; Sun, 28 Nov 2021 16:15:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EF7BBC53FC7; Sun, 28 Nov 2021 16:15:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1638116103; bh=ExbSBshbbwnHbo97uVIa25GN2ty9N/NPvVqrH0yw1Qw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CVi9MPib5uv8YRVEFHTi8Xoi2v5ZYmsvyU22wWKwwLQkTPyC79OL8m6quDzVXg4tW eQRpWZ6FI1/cs1D0JLmd2TW+9kpVeb2XNCRDALLqZvdTgTxAGyn8ZrtNbtpWGlPMRS L+9RtLjhVZIDzjcXGAlVaofEceO1btUF6UAEE70trmO1xu5dEfXQoO89tn1eNYPu5T vlsr+1fkcJ9cMwfxmsNy5RcgeV4m2Z2HBF/5TYGKMRLD8OiBfyFb/9aKrvUvdEZUAo t22oooPzh2Pp/hYL05thWDJVSX8ZwLJm820ifj/0Cp3J1HG9gDIxymKXcku0rc/U1c IpUEkSTJm+rCA== From: Jisheng Zhang To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Anup Patel , Atish Patra Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm-riscv@lists.infradead.org Subject: [PATCH 3/5] riscv: kvm: make kvm_riscv_vcpu_fp_clean() static Date: Mon, 29 Nov 2021 00:07:39 +0800 Message-Id: <20211128160741.2122-4-jszhang@kernel.org> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211128160741.2122-1-jszhang@kernel.org> References: <20211128160741.2122-1-jszhang@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211128_081504_285136_A15854E5 X-CRM114-Status: GOOD ( 10.05 ) 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 There are no users outside vcpu_fp.c so make kvm_riscv_vcpu_fp_clean() static. Signed-off-by: Jisheng Zhang --- arch/riscv/kvm/vcpu_fp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv/kvm/vcpu_fp.c b/arch/riscv/kvm/vcpu_fp.c index 1b070152578f..4449a976e5a6 100644 --- a/arch/riscv/kvm/vcpu_fp.c +++ b/arch/riscv/kvm/vcpu_fp.c @@ -26,7 +26,7 @@ void kvm_riscv_vcpu_fp_reset(struct kvm_vcpu *vcpu) cntx->sstatus |= SR_FS_OFF; } -void kvm_riscv_vcpu_fp_clean(struct kvm_cpu_context *cntx) +static void kvm_riscv_vcpu_fp_clean(struct kvm_cpu_context *cntx) { cntx->sstatus &= ~SR_FS; cntx->sstatus |= SR_FS_CLEAN; From patchwork Sun Nov 28 16:07:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 12642977 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 1BC92C433EF for ; Sun, 28 Nov 2021 16:15:19 +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=Z/SK6i2D85b/ZYLO/AjeZ0SIsXZ7Q3EVGlJLwreBqNA=; b=ryR+ocsoP7KsPz zCl5ptnKsKroryhR5dpuRGLnENBzAGKUzEQ78PtAVx15gxPgOldeECoi4cZq8d29609ytwL1VsVn0 sbaIYHWJY19h5eV64tOrD2BWYf86Xr4iXt57kYdAvV3ERJt7rZlLyTLk96CxZmwQWN7FVR/060qsb FqJ/esS1PE+XCvjS5fa6AZWgrqf0FEO4O4nLjUqs/sF9FoNmJ5BYli0E44A9R6Y9v8OzoJfNFblIA cnJKnFDss3ovsYkhNCbSxhf9dlnKlojNznOAWkE+tMxM8okN0xhf4cniq31Ioa3kpUuoH/gf3+wbL Mjt2fwsMZL6AlTtULfnA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mrMpb-00G9fK-KC; Sun, 28 Nov 2021 16:15:11 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mrMpY-00G9cr-9c; Sun, 28 Nov 2021 16:15:09 +0000 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 dfw.source.kernel.org (Postfix) with ESMTPS id D6C9961024; Sun, 28 Nov 2021 16:15:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BB3E6C004E1; Sun, 28 Nov 2021 16:15:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1638116107; bh=rYqEjOuhGRt60uVjKCwFcGC7KuRPU2ovghUYTYMOErM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z7yBUNy4YNqqt2EydCYUmsGMQ/ojOhslhaUmhU5tXwVdmjLil5xgf0uZJ6Nbs090h 0bW0t+JSb51IT20MZS6N4mVaCt0QaCKTvMvoy98JVknxwOhbHJ+N0WW4PIGWtNj+7s 6XUGqtlAhdc4fFhGpspCAstMMIFOA0SDPRWIaG3knab7fSmrcKX6qInGhG9O8Yb2xq lgslqsIDdjtdIpoLdJ2oJSBZ0sq4rsEk91ay0iQDVkMKVGZIa+J7zVbYSq3jktSuwE qMITcarSVQH/s3enr6eCAxzaqteTA4HXhTp6e5ChkGL4mN8gorHKexwO2KEDAtmC13 Dsn62e1ySBtgQ== From: Jisheng Zhang To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Anup Patel , Atish Patra Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm-riscv@lists.infradead.org Subject: [PATCH 4/5] riscv: errata: alternative: mark vendor_patch_func __initdata Date: Mon, 29 Nov 2021 00:07:40 +0800 Message-Id: <20211128160741.2122-5-jszhang@kernel.org> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211128160741.2122-1-jszhang@kernel.org> References: <20211128160741.2122-1-jszhang@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211128_081508_418288_1089A22E X-CRM114-Status: GOOD ( 10.68 ) 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 The function pointer vendor_patch_func is only used during init, so mark it as __initdata. Signed-off-by: Jisheng Zhang --- arch/riscv/errata/alternative.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/riscv/errata/alternative.c b/arch/riscv/errata/alternative.c index 3b15885db70b..e8b4a0fe488c 100644 --- a/arch/riscv/errata/alternative.c +++ b/arch/riscv/errata/alternative.c @@ -22,7 +22,8 @@ static struct cpu_manufacturer_info_t { } cpu_mfr_info; static void (*vendor_patch_func)(struct alt_entry *begin, struct alt_entry *end, - unsigned long archid, unsigned long impid); + unsigned long archid, + unsigned long impid) __initdata; static inline void __init riscv_fill_cpu_mfr_info(void) { From patchwork Sun Nov 28 16:07:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 12642979 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 DE9D1C433F5 for ; Sun, 28 Nov 2021 16:15:23 +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=eVX5isduG3Zg4TjMCSbml25YyLOTjX87rIEC6gRok+k=; b=3NwmjH86qaOk3v khbJfGCQgHq3vGSuFoshea47GvXehpPXj8LdphrXDsMZQkLti9ZoNeXgF95R4Iy2RXLTRGmiVFa/V Kqaqv8h7xvNYkPg7BJDMOpdNwnBFGiTWh77dRuGjktp+kx7HI5FTGdCJe1IXsHnOBB1zWw1iGQBDL NvxCdNk5XiBVGwwSbg486p+R06DuWb9F1J4rE9shejLoDdUO3xTcLhdsQZiItysHHJw3IC3yikwlV lh4wtyCh7DFEHabsC5TPoEdmdvdjhIPB+nI9Uw/qO2XJV280EJZPSCDZNm6HcVcn3KDNV9U0zpaCY eOHARZIWV5rL9RkYlWmg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mrMpg-00G9jF-BM; Sun, 28 Nov 2021 16:15:16 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mrMpd-00G9fw-1l; Sun, 28 Nov 2021 16:15:14 +0000 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 BB851B80D29; Sun, 28 Nov 2021 16:15:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CE6C0C53FCB; Sun, 28 Nov 2021 16:15:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1638116110; bh=vTJ+kJ0LGa5qNHZ7RxBihZ2BrKTUuELoQ0am/1I/pr8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XUD1f05OrZVzW97bOm57rVyEfy9CMsa+dt4IKu9VjDT1F5196D0uL2tpWobOF6Xiu scu5CWliDRO9tBEROkm5Sg9vUW60EdSVH4iKBrobqW5++i43tGryjRAAMcv8zC1Q2C mzzMkylnpa17YCfNMO58pMzuq5hjhvB/teHsz/dl7xXNYsRTvAAHLSyKqrO4U8vFr0 YwcWNwpPYJIb1Bo4hOUsFHFpIu6YerwShemGLGr+LTj3W9hV/1NMxVkXbhYc5pzH3Y r9G94g4E6jJKG8zuQdEFp1Wt5YNvtVTidVTnHKmpX2li0TLOsqRzeRJAigG4E/XtX7 zzoMSbWIsOYDA== From: Jisheng Zhang To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Anup Patel , Atish Patra Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm-riscv@lists.infradead.org Subject: [PATCH 5/5] riscv: head: remove useless __PAGE_ALIGNED_BSS and .balign Date: Mon, 29 Nov 2021 00:07:41 +0800 Message-Id: <20211128160741.2122-6-jszhang@kernel.org> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211128160741.2122-1-jszhang@kernel.org> References: <20211128160741.2122-1-jszhang@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211128_081513_257550_17B925DC X-CRM114-Status: UNSURE ( 9.46 ) X-CRM114-Notice: Please train this message. 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 After commit 83e7b8769a08 ("RISC-V: move empty_zero_page definition to C and export it"), the empty_zero_page has been moved outside head.S, the __PAGE_ALIGNED_BSS and .balign LoCs are useless, clean up them. Signed-off-by: Jisheng Zhang --- arch/riscv/kernel/head.S | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/riscv/kernel/head.S b/arch/riscv/kernel/head.S index 3ce95f8783bd..c128a32c2ed3 100644 --- a/arch/riscv/kernel/head.S +++ b/arch/riscv/kernel/head.S @@ -447,7 +447,3 @@ ENTRY(reset_regs) ret END(reset_regs) #endif /* CONFIG_RISCV_M_MODE */ - -__PAGE_ALIGNED_BSS - /* Empty zero page */ - .balign PAGE_SIZE