Commit e1de2c93 authored by Anup Patel's avatar Anup Patel Committed by Palmer Dabbelt

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: default avatarAnup Patel <anup.patel@wdc.com>
Signed-off-by: default avatarAnup Patel <apatel@ventanamicro.com>
Reviewed-by: default avatarGuo Ren <guoren@kernel.org>
Reviewed-by: default avatarAtish Patra <atishp@rivosinc.com>
Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent f6e64b66
...@@ -90,7 +90,8 @@ pe_head_start: ...@@ -90,7 +90,8 @@ pe_head_start:
.align 2 .align 2
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
relocate: .global relocate_enable_mmu
relocate_enable_mmu:
/* Relocate return address */ /* Relocate return address */
la a1, kernel_map la a1, kernel_map
XIP_FIXUP_OFFSET a1 XIP_FIXUP_OFFSET a1
...@@ -185,7 +186,7 @@ secondary_start_sbi: ...@@ -185,7 +186,7 @@ secondary_start_sbi:
/* Enable virtual memory and relocate to virtual address */ /* Enable virtual memory and relocate to virtual address */
la a0, swapper_pg_dir la a0, swapper_pg_dir
XIP_FIXUP_OFFSET a0 XIP_FIXUP_OFFSET a0
call relocate call relocate_enable_mmu
#endif #endif
call setup_trap_vector call setup_trap_vector
tail smp_callin tail smp_callin
...@@ -329,7 +330,7 @@ clear_bss_done: ...@@ -329,7 +330,7 @@ clear_bss_done:
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
la a0, early_pg_dir la a0, early_pg_dir
XIP_FIXUP_OFFSET a0 XIP_FIXUP_OFFSET a0
call relocate call relocate_enable_mmu
#endif /* CONFIG_MMU */ #endif /* CONFIG_MMU */
call setup_trap_vector call setup_trap_vector
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment