[PATCH 5.10 75/77] riscv: fix misalgned trap vector base address

From: Greg Kroah-Hartman
Date: Mon Nov 01 2021 - 05:39:33 EST


From: Chen Lu <181250012@xxxxxxxxxxxxxxxx>

commit 64a19591a2938b170aa736443d5d3bf4c51e1388 upstream.

The trap vector marked by label .Lsecondary_park must align on a
4-byte boundary, as the {m,s}tvec is defined to require 4-byte
alignment.

Signed-off-by: Chen Lu <181250012@xxxxxxxxxxxxxxxx>
Reviewed-by: Anup Patel <anup.patel@xxxxxxx>
Fixes: e011995e826f ("RISC-V: Move relocate and few other functions out of __init")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Palmer Dabbelt <palmerdabbelt@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/riscv/kernel/head.S | 1 +
1 file changed, 1 insertion(+)

--- a/arch/riscv/kernel/head.S
+++ b/arch/riscv/kernel/head.S
@@ -175,6 +175,7 @@ setup_trap_vector:
csrw CSR_SCRATCH, zero
ret

+.align 2
.Lsecondary_park:
/* We lack SMP support or have too many harts, so park this hart */
wfi