Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Anup Patel <anup.patel@wdc.com>
To:     Palmer Dabbelt <palmer@dabbelt.com>,
        Palmer Dabbelt <palmerdabbelt@google.com>,
        Paul Walmsley <paul.walmsley@sifive.com>,
        Albert Ou <aou@eecs.berkeley.edu>,
        Daniel Lezcano <daniel.lezcano@linaro.org>,
        Ulf Hansson <ulf.hansson@linaro.org>,
        "Rafael J . Wysocki" <rjw@rjwysocki.net>,
        Pavel Machek <pavel@ucw.cz>, Rob Herring <robh+dt@kernel.org>
Cc:     Sandeep Tripathy <milun.tripathy@gmail.com>,
        Atish Patra <atish.patra@wdc.com>,
        Alistair Francis <Alistair.Francis@wdc.com>,
        Liush <liush@allwinnertech.com>,
        Anup Patel <anup@brainfault.org>, devicetree@vger.kernel.org,
        linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org,
        linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
        Anup Patel <anup.patel@wdc.com>
Subject: [PATCH v9 2/8] RISC-V: Rename relocate() and make it global
Date:   Tue, 12 Oct 2021 15:28:51 +0530
Message-Id: <20211012095857.1314214-3-anup.patel@wdc.com>
In-Reply-To: <20211012095857.1314214-1-anup.patel@wdc.com>
References: <20211012095857.1314214-1-anup.patel@wdc.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
WDCIPOUTBOUND: EOP-TRUE
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?p2Ov4Pzly2CF5b0xytsWWl2G06zmAxd3TnnxTuyHjt2Fzfx15FwMgOykGIY1?=
 =?us-ascii?Q?rcpt6hstdg5ivVvxek5x8P1WLycpc3maLhYhqNyJp1eo3wnWdHMIC60Gehh5?=
 =?us-ascii?Q?8DaiT/on6EOpqV36Ip8qJtq33Wc5ykkFSfC1MQ0YN3NhSpFjX6Wu30zybrca?=
 =?us-ascii?Q?+G9MDIiy39xsdtIrvYfUh1p8efwBo3Z4owScOhP9WtONI0fE6gVNo04zsBhc?=
 =?us-ascii?Q?lMnXSfhdLrA5iOm4mH3H5bPDWntHqKJNSnqBmBJpFJM9xf279lIPTiK9SK2f?=
 =?us-ascii?Q?Quj39Xuu8y8I/tZ6rxPK4vNd2DcO4eKMSbLIZufMBXdTorMR77RL+gzNLUlr?=
 =?us-ascii?Q?zx5dlDDjZs9g/0feiZlYW3oKc7lbGmOqNcaTKbqbLGJYml6Hed/e9BUkl1HS?=
 =?us-ascii?Q?tS9uhQh3Ss6kTZtHZUeCxew9EhWACboQMwAujk4eNGeKTTKic7zaHZ6swoTm?=
 =?us-ascii?Q?eqzpQsqlDocDkYwl8izUofoC6hbLINEQHl7Qy5ZLRe0LPMoP7TTbBoN3kjyv?=
 =?us-ascii?Q?bpf5EjniYVEnx5o0MCch3+LHGE3Ssd47AgnCfn1nzeGPOqJWNUhki60yFB5u?=
 =?us-ascii?Q?5FvkOkyY1x1EcBOv/5jrlUndZWaSWobyNxgSJZNgdTK2z4wa15JWYxy0Uz4W?=
 =?us-ascii?Q?NYMceQ1V7/qax7pDuHQJblXFme4asSMGlvw258/HDCC4FgbLbibE6ebqV0T5?=
 =?us-ascii?Q?HXDRUnbIhWR9N7Cn2jpLG6jRLXKC5orgXo6/+OPQ6A08zGrEhQVxcooxAhkU?=
 =?us-ascii?Q?duCzSQb4BiZWmMWl6R0acBbu/Cj21TKAMAshLrUbIWC5Gpo0a7g5h1SZ+B8d?=
 =?us-ascii?Q?kC6Cvwnu9/KpysGaOxQSG2RdzPqq0GLd/S9jxsfFOyYhJjsOyR+KjvGZ3isQ?=
 =?us-ascii?Q?U2plaHGzqddmhCBr0WKKuFRfqd2A0rSNjlPKe8A9nPQXn9tPmCjY6tNqBGlz?=
 =?us-ascii?Q?seBcMkMFPYLe5IzR6hQy3H6x34R+keE0/Ko1l7Gg9T907SSUvLSlLq6Ssd7Y?=
 =?us-ascii?Q?TmI0g3CH1WxfKlpz0t4p55lXLmG7kq000bXwvAt3TMre3uCWL51Od4vc3WFY?=
 =?us-ascii?Q?71aKjANFCSCpU/9r/gHcmYAwyerGoMLH+E+BXm7wAtgvu4qkRYB10tpA5jOR?=
 =?us-ascii?Q?3h1GArspkcIqAkv0xW211CeGxjMfyJAjiO+JTY0FMktI2hIO4m8Hn8pmcR4c?=
 =?us-ascii?Q?kHuTekF2fuQfQChZ88dvpZYeQKgQZYnspY2LLEiHNcfOcK/WHXHStbg523gO?=
 =?us-ascii?Q?15MOj74uMyUQ8OfBbV8fUo9NTMJFFMqhemH5/e2cWrMtV9a/Jc6oBo2ORbqp?=
 =?us-ascii?Q?YF9KWKTtYNjnBw+19x8xQ5Jx?=
X-OriginatorOrg: wdc.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ace50fac-07c1-4c88-d7df-08d98d66ff78
X-MS-Exchange-CrossTenant-AuthSource: CO6PR04MB7812.namprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2021 09:59:36.5122
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: tSeyfNKPXYVZf2Q+IKPaFDDRuyDk5vE7UVm2nW9pUNE0mkWNDQ4e0DKOmMC5e0NGc71kNFu9CzpuqW82riIlUw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR04MB8348
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The low-level relocate() function enables mmu and relocates
execution to link-time addresses. We rename relocate() function
to relocate_enable_mmu() function which is more informative.

Also, the relocate_enable_mmu() function will be used in the
resume path when a CPU wakes-up from a non-retentive suspend
so we make it global symbol.

Signed-off-by: Anup Patel <anup.patel@wdc.com>
---
 arch/riscv/kernel/head.S | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/riscv/kernel/head.S b/arch/riscv/kernel/head.S
index fce5184b22c3..8ff8412db99f 100644
--- a/arch/riscv/kernel/head.S
+++ b/arch/riscv/kernel/head.S
@@ -79,7 +79,8 @@ pe_head_start:
 
 .align 2
 #ifdef CONFIG_MMU
-relocate:
+	.global relocate_enable_mmu
+relocate_enable_mmu:
 	/* Relocate return address */
 	la a1, kernel_map
 	XIP_FIXUP_OFFSET a1
@@ -174,7 +175,7 @@ secondary_start_common:
 	/* Enable virtual memory and relocate to virtual address */
 	la a0, swapper_pg_dir
 	XIP_FIXUP_OFFSET a0
-	call relocate
+	call relocate_enable_mmu
 #endif
 	call setup_trap_vector
 	tail smp_callin
@@ -311,7 +312,7 @@ clear_bss_done:
 #ifdef CONFIG_MMU
 	la a0, early_pg_dir
 	XIP_FIXUP_OFFSET a0
-	call relocate
+	call relocate_enable_mmu
 #endif /* CONFIG_MMU */
 
 	call setup_trap_vector
-- 
2.25.1