Skip to content

Commit

Permalink
riscv: make sure the cores stay looping in .Lsecondary_park
Browse files Browse the repository at this point in the history
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: Greentime Hu <greentime.hu@sifive.com>
Reviewed-by: Anup Patel <anup.patel@sifive.com>
Cc: Andreas Schwab <schwab@suse.de>
Cc: stable@vger.kernel.org
Fixes: 76d2a04 ("RISC-V: Init and Halt Code")
Signed-off-by: Paul Walmsley <paul.walmsley@sifive.com>
  • Loading branch information
Greentime Hu authored and Paul Walmsley committed Jan 16, 2020
1 parent b3a987b commit 20d2292
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions arch/riscv/kernel/head.S
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,9 @@ _start_kernel:

#ifdef CONFIG_SMP
li t0, CONFIG_NR_CPUS
bgeu a0, t0, .Lsecondary_park
blt a0, t0, .Lgood_cores
tail .Lsecondary_park
.Lgood_cores:
#endif

/* Pick one hart to run the main boot sequence */
Expand Down Expand Up @@ -209,11 +211,6 @@ relocate:
tail smp_callin
#endif

.align 2
.Lsecondary_park:
/* We lack SMP support or have too many harts, so park this hart */
wfi
j .Lsecondary_park
END(_start)

#ifdef CONFIG_RISCV_M_MODE
Expand Down Expand Up @@ -295,6 +292,13 @@ ENTRY(reset_regs)
END(reset_regs)
#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
/* Empty zero page */
.balign PAGE_SIZE

0 comments on commit 20d2292

Please sign in to comment.