[U-Boot] [PATCH 14/19] riscv: Fix context restore before returning from trap handler
Bin Meng
bmeng.cn at gmail.com
Tue Nov 13 08:22:02 UTC 2018
sp cannot be loaded before restoring other registers.
Signed-off-by: Bin Meng <bmeng.cn at gmail.com>
---
arch/riscv/cpu/mtrap.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/riscv/cpu/mtrap.S b/arch/riscv/cpu/mtrap.S
index ba6462f..6c0eac6 100644
--- a/arch/riscv/cpu/mtrap.S
+++ b/arch/riscv/cpu/mtrap.S
@@ -72,7 +72,6 @@ trap_entry:
li t0, MSTATUS_MPP
csrs mstatus, t0
LREG x1, 1 * REGBYTES(sp)
- LREG x2, 2 * REGBYTES(sp)
LREG x3, 3 * REGBYTES(sp)
LREG x4, 4 * REGBYTES(sp)
LREG x5, 5 * REGBYTES(sp)
@@ -102,5 +101,6 @@ trap_entry:
LREG x29, 29 * REGBYTES(sp)
LREG x30, 30 * REGBYTES(sp)
LREG x31, 31 * REGBYTES(sp)
+ LREG x2, 2 * REGBYTES(sp)
addi sp, sp, 32 * REGBYTES
mret
--
2.7.4
More information about the U-Boot
mailing list