Commit 20d22927 authored by Greentime Hu's avatar Greentime Hu Committed by Paul Walmsley

riscv: make sure the cores stay looping in .Lsecondary_park

The code in secondary_park is currently placed in the .init section. The
kernel reclaims and clears this code when it finishes booting. That
causes the cores parked in it to go to somewhere unpredictable, so we
move this function out of init to make sure the cores stay looping there.

The instruction bgeu a0, t0, .Lsecondary_park may have "a relocation
truncated to fit" issue during linking time. It is because that sections
are too far to jump. Let's use tail to jump to the .Lsecondary_park.
Signed-off-by: default avatarGreentime Hu <greentime.hu@sifive.com>
Reviewed-by: default avatarAnup Patel <anup.patel@sifive.com>
Cc: Andreas Schwab <schwab@suse.de>
Cc: stable@vger.kernel.org
Fixes: 76d2a049 ("RISC-V: Init and Halt Code")
Signed-off-by: default avatarPaul Walmsley <paul.walmsley@sifive.com>
parent b3a987b0
...@@ -80,7 +80,9 @@ _start_kernel: ...@@ -80,7 +80,9 @@ _start_kernel:
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
li t0, CONFIG_NR_CPUS li t0, CONFIG_NR_CPUS
bgeu a0, t0, .Lsecondary_park blt a0, t0, .Lgood_cores
tail .Lsecondary_park
.Lgood_cores:
#endif #endif
/* Pick one hart to run the main boot sequence */ /* Pick one hart to run the main boot sequence */
...@@ -209,11 +211,6 @@ relocate: ...@@ -209,11 +211,6 @@ relocate:
tail smp_callin tail smp_callin
#endif #endif
.align 2
.Lsecondary_park:
/* We lack SMP support or have too many harts, so park this hart */
wfi
j .Lsecondary_park
END(_start) END(_start)
#ifdef CONFIG_RISCV_M_MODE #ifdef CONFIG_RISCV_M_MODE
...@@ -295,6 +292,13 @@ ENTRY(reset_regs) ...@@ -295,6 +292,13 @@ ENTRY(reset_regs)
END(reset_regs) END(reset_regs)
#endif /* CONFIG_RISCV_M_MODE */ #endif /* CONFIG_RISCV_M_MODE */
.section ".text", "ax",@progbits
.align 2
.Lsecondary_park:
/* We lack SMP support or have too many harts, so park this hart */
wfi
j .Lsecondary_park
__PAGE_ALIGNED_BSS __PAGE_ALIGNED_BSS
/* Empty zero page */ /* Empty zero page */
.balign PAGE_SIZE .balign PAGE_SIZE
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