Unverified Commit e1de2c93 authored Feb 10, 2022 by Anup Patel Committed by Palmer Dabbelt Mar 10, 2022

RISC-V: Rename relocate() and make it global



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>
Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Reviewed-by: Guo Ren <guoren@kernel.org>
Reviewed-by: Atish Patra <atishp@rivosinc.com>
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>

parent f6e64b66

arch/riscv/kernel/head.S

+4 −3

Original line number	Diff line number	Diff line
		@@ -90,7 +90,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
		@@ -185,7 +186,7 @@ secondary_start_sbi:
		/* 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
		@@ -329,7 +330,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