[U-Boot] [PATCH 23/30] riscv: do not blindly modify the mstatus CSR
Lukas Auer
lukas.auer at aisec.fraunhofer.de
Fri Oct 19 22:07:36 UTC 2018
The mstatus CSR includes WPRI (writes preserve values, reads ignore
values) fields and must therefore not be set to zero without preserving
these fields. It is not apparent why mstatus is set to zero here since
it is not required for u-boot to run. Remove it.
This instruction and others encode zero as an immediate. RISC-V has the
zero register for this purpose. Replace the immediates with the zero
register.
Signed-off-by: Lukas Auer <lukas.auer at aisec.fraunhofer.de>
---
arch/riscv/cpu/start.S | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/riscv/cpu/start.S b/arch/riscv/cpu/start.S
index 851a1d0870..4fa663c6d6 100644
--- a/arch/riscv/cpu/start.S
+++ b/arch/riscv/cpu/start.S
@@ -36,9 +36,9 @@
_start:
la t0, trap_entry
csrw mtvec, t0
- csrwi mstatus, 0
- csrwi mie, 0
+ /* mask all interrupts */
+ csrw mie, zero
/*
* Set stackpointer in internal/ex RAM to call board_init_f
@@ -159,11 +159,10 @@ clear_bss:
add t0, t0, t6 /* t0 <- rel __bss_start in RAM */
la t1, __bss_end /* t1 <- rel __bss_end in FLASH */
add t1, t1, t6 /* t1 <- rel __bss_end in RAM */
- li t2, 0x00000000 /* clear */
beq t0, t1, call_board_init_r
clbss_l:
- SREG t2, 0(t0) /* clear loop... */
+ SREG zero, 0(t0) /* clear loop... */
addi t0, t0, REGBYTES
bne t0, t1, clbss_l
--
2.17.2
More information about the U-Boot
mailing list