Skip to contentSkip to conversation

RISC-V S-mode support

PATCH Superseded Anup Patel 4 participants 14 messages Nov 21, 2018 – Nov 22, 2018 RISC-V

v3 of 7 Superseded Latest is v7 →

lore
Share & tools
lore

Anup Patel

author
#0 lore raw

v3 cover RISC-V S-mode support

This patchset allows us runing u-boot in S-mode which is useful on platforms where M-mode runtime firmware is an independent firmware and u-boot is used as last stage OS bootloader.

The patchset based upon git://git.denx.de/u-boot-riscv.git
and is tested on QEMU in both M-mode and S-mode.

For S-mode testing, we have used u-boot.bin as payload of latest BBL (at commit 6ebd0f2a46255d0c76dad3c05b16c1d154795d26) applied with following changes:

machine/emulation.c +6 -0
index 132e977..def75e1 100644
@@ -162,6 +162,12 @@ static inline int emulate_read_csr(int num, uintptr_t mstatus, uintptr_t* result
 
   switch (num)
   {
+    case CSR_MISA:
+      *result = read_csr(misa);
+      return 0;
+    case CSR_MHARTID:
+      *result = read_csr(mhartid);
+      return 0;
     case CSR_CYCLE:
       if (!((counteren >> (CSR_CYCLE - CSR_CYCLE)) & 1))
         return -1;

Changes since v2:
- Dropped 'default n" from RISCV_SMODE kconfig option
- Replaced '-smode_' in defconfig names with '_smode_'

Changes since v1:
- Rebased upon latest git://git.denx.de/u-boot-riscv.git
- Add details in cover letter for running u-boot in S-mode using BBL

Anup Patel (3):
riscv: Add kconfig option to run u-boot in S-mode
riscv: qemu: Use different SYS_TEXT_BASE for S-mode
riscv: Add S-mode defconfigs for QEMU virt machine

 arch/riscv/Kconfig                     |  5 ++++
 arch/riscv/cpu/start.S                 | 33 ++++++++++++++++++++++++++
 board/emulation/qemu-riscv/Kconfig     |  3 ++-
 board/emulation/qemu-riscv/MAINTAINERS |  2 ++
 configs/qemu-riscv32_smode_defconfig   | 10 ++++++++
 configs/qemu-riscv64_smode_defconfig   | 11 +++++++++
 6 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 configs/qemu-riscv32_smode_defconfig
 create mode 100644 configs/qemu-riscv64_smode_defconfig
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH v3 1/3 riscv: Add kconfig option to run u-boot in S-mode

This patch adds kconfig option RISCV_SMODE to run u-boot in S-mode. When this opition is enabled we use s<xyz> CSRs instead of m<xyz> CSRs.

It is important to note that there is no equivalent S-mode CSR for misa and mhartid CSRs so we expect M-mode runtime firmware (BBL or equivalent) to emulate misa and mhartid CSR read.

In-future, we will have more patches to avoid accessing misa and mhartid CSRs from S-mode.

---
 arch/riscv/Kconfig     |  5 +++++
 arch/riscv/cpu/start.S | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)
arch/riscv/Kconfig +5 -0
index 3e0af55e71..8f2139ff60 100644
@@ -55,6 +55,11 @@ config RISCV_ISA_C
 config RISCV_ISA_A
 	def_bool y
 
+config RISCV_SMODE
+	bool "Run in S-Mode"
+	help
+	  Enable this option to build an U-Boot for RISC-V S-Mode
+
 config 32BIT
 	bool
 
arch/riscv/cpu/start.S +33 -0
index 5af189b338..e4276e8e19 100644
@@ -39,10 +39,18 @@ _start:
 	mv	s1, a1
 
 	la	t0, trap_entry
+#ifdef CONFIG_RISCV_SMODE
+	csrw	stvec, t0
+#else
 	csrw	mtvec, t0
+#endif
 
 	/* mask all interrupts */
+#ifdef CONFIG_RISCV_SMODE
+	csrw	sie, zero
+#else
 	csrw	mie, zero
+#endif
 
 	/* Enable cache */
 	jal	icache_enable
@@ -164,7 +172,11 @@ fix_rela_dyn:
 */
 	la	t0, trap_entry
 	add	t0, t0, t6
+#ifdef CONFIG_RISCV_SMODE
+	csrw	stvec, t0
+#else
 	csrw	mtvec, t0
+#endif
 
 clear_bss:
 	la	t0, __bss_start		/* t0 <- rel __bss_start in FLASH */
@@ -236,17 +248,34 @@ trap_entry:
 	SREG	x29, 29*REGBYTES(sp)
 	SREG	x30, 30*REGBYTES(sp)
 	SREG	x31, 31*REGBYTES(sp)
+#ifdef CONFIG_RISCV_SMODE
+	csrr	a0, scause
+	csrr	a1, sepc
+#else
 	csrr	a0, mcause
 	csrr	a1, mepc
+#endif
 	mv	a2, sp
 	jal	handle_trap
+#ifdef CONFIG_RISCV_SMODE
+	csrw	sepc, a0
+#else
 	csrw	mepc, a0
+#endif
 
+#ifdef CONFIG_RISCV_SMODE
+/*
+ * Remain in S-mode after sret
+ */
+	li	t0, SSTATUS_SPP
+	csrs	sstatus, t0
+#else
 /*
  * Remain in M-mode after mret
  */
 	li	t0, MSTATUS_MPP
 	csrs	mstatus, t0
+#endif
 	LREG	x1, 1*REGBYTES(sp)
 	LREG	x2, 2*REGBYTES(sp)
 	LREG	x3, 3*REGBYTES(sp)
@@ -279,4 +308,8 @@ trap_entry:
 	LREG	x30, 30*REGBYTES(sp)
 	LREG	x31, 31*REGBYTES(sp)
 	addi	sp, sp, 32*REGBYTES
+#ifdef CONFIG_RISCV_SMODE
+	sret
+#else
 	mret
+#endif
Signature · 1 line
2.17.1
#2 lore raw

PATCH v3 1/3 riscv: Add kconfig option to run u-boot in S-mode

Hi Anup,

Quoted 1 line · Anup Patel

This patch adds kconfig option RISCV_SMODE to run u-boot in

nit: U-Boot (also in the first line of the commit message)

Quoted 23 lines

S-mode. When this opition is enabled we use s<xyz> CSRs instead of m<xyz> CSRs.

It is important to note that there is no equivalent S-mode CSR for misa and mhartid CSRs so we expect M-mode runtime firmware (BBL or equivalent) to emulate misa and mhartid CSR read.

In-future, we will have more patches to avoid accessing misa and mhartid CSRs from S-mode.

---
 arch/riscv/Kconfig     |  5 +++++
 arch/riscv/cpu/start.S | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)
arch/riscv/Kconfig +0 -0
index 3e0af55e71..8f2139ff60 100644

arch/riscv/Kconfig config RISCV_ISA_C · line 61

Quoted 7 lines
arch/riscv/Kconfig +4 -0
@@ -55,6 +55,11 @@ config RISCV_ISA_C
 config RISCV_ISA_A
 	def_bool y
 
+config RISCV_SMODE
+	bool "Run in S-Mode"
+	help
+	  Enable this option to build an U-Boot for RISC-V S-Mode

nit: there should be no "an" here

arch/riscv/cpu/start.S _start: · line 42

Quoted 13 lines
arch/riscv/Kconfig +1 -0
+
 config 32BIT
 	bool
 
arch/riscv/cpu/start.S +1 -0
index 5af189b338..e4276e8e19 100644
@@ -39,10 +39,18 @@ _start:
 	mv	s1, a1
 
 	la	t0, trap_entry
+#ifdef CONFIG_RISCV_SMODE

It might make the code more readable by using defines for the CSRs, which are set to the correct values at the start of start.S depending on if CONFIG_RISCV_SMODE is set (similar to what we do for the load and store instructions).
This is just a thought, I think this way is perfectly fine as well. :)

Thanks,
Lukas

Quoted 71 lines
arch/riscv/cpu/start.S +11 -0
+	csrw	stvec, t0
+#else
 	csrw	mtvec, t0
+#endif
 
 	/* mask all interrupts */
+#ifdef CONFIG_RISCV_SMODE
+	csrw	sie, zero
+#else
 	csrw	mie, zero
+#endif
 
 	/* Enable cache */
 	jal	icache_enable
@@ -164,7 +172,11 @@ fix_rela_dyn:
 */
 	la	t0, trap_entry
 	add	t0, t0, t6
+#ifdef CONFIG_RISCV_SMODE
+	csrw	stvec, t0
+#else
 	csrw	mtvec, t0
+#endif
 
 clear_bss:
 	la	t0, __bss_start		/* t0 <- rel __bss_start in

FLASH */

arch/riscv/cpu/start.S +21 -0
@@ -236,17 +248,34 @@ trap_entry:
 	SREG	x29, 29*REGBYTES(sp)
 	SREG	x30, 30*REGBYTES(sp)
 	SREG	x31, 31*REGBYTES(sp)
+#ifdef CONFIG_RISCV_SMODE
+	csrr	a0, scause
+	csrr	a1, sepc
+#else
 	csrr	a0, mcause
 	csrr	a1, mepc
+#endif
 	mv	a2, sp
 	jal	handle_trap
+#ifdef CONFIG_RISCV_SMODE
+	csrw	sepc, a0
+#else
 	csrw	mepc, a0
+#endif
 
+#ifdef CONFIG_RISCV_SMODE
+/*
+ * Remain in S-mode after sret
+ */
+	li	t0, SSTATUS_SPP
+	csrs	sstatus, t0
+#else
 /*
  * Remain in M-mode after mret
  */
 	li	t0, MSTATUS_MPP
 	csrs	mstatus, t0
+#endif
 	LREG	x1, 1*REGBYTES(sp)
 	LREG	x2, 2*REGBYTES(sp)
 	LREG	x3, 3*REGBYTES(sp)
@@ -279,4 +308,8 @@ trap_entry:
 	LREG	x30, 30*REGBYTES(sp)
 	LREG	x31, 31*REGBYTES(sp)
 	addi	sp, sp, 32*REGBYTES
+#ifdef CONFIG_RISCV_SMODE
+	sret
+#else
 	mret
+#endif
#3 lore raw

PATCH v3 1/3 riscv: Add kconfig option to run u-boot in S-mode

Hi Anup,

Quoted 10 lines · Lukas

Hi Anup,

Quoted 1 line · Anup Patel

This patch adds kconfig option RISCV_SMODE to run u-boot in

nit: U-Boot (also in the first line of the commit message)

Quoted 3 lines

S-mode. When this opition is enabled we use s<xyz> CSRs instead of m<xyz> CSRs.

Can you also modify arch/riscv/lib/interrupts.c to test for the supervisor instead of the machine timer and external interrupts when CONFIG_RISCV_SMODE is set?

Thanks,
Lukas

Quoted 133 lines
Quoted 20 lines

It is important to note that there is no equivalent S-mode CSR for misa and mhartid CSRs so we expect M-mode runtime firmware (BBL or equivalent) to emulate misa and mhartid CSR read.

In-future, we will have more patches to avoid accessing misa and mhartid CSRs from S-mode.

---
 arch/riscv/Kconfig     |  5 +++++
 arch/riscv/cpu/start.S | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)
arch/riscv/Kconfig +0 -0
index 3e0af55e71..8f2139ff60 100644

arch/riscv/Kconfig config RISCV_ISA_C · line 61

Quoted 7 lines
arch/riscv/Kconfig +4 -0
@@ -55,6 +55,11 @@ config RISCV_ISA_C
 config RISCV_ISA_A
 	def_bool y
 
+config RISCV_SMODE
+	bool "Run in S-Mode"
+	help
+	  Enable this option to build an U-Boot for RISC-V S-Mode

nit: there should be no "an" here

arch/riscv/cpu/start.S _start: · line 42

Quoted 13 lines
arch/riscv/Kconfig +1 -0
+
 config 32BIT
 	bool
 
arch/riscv/cpu/start.S +1 -0
index 5af189b338..e4276e8e19 100644
@@ -39,10 +39,18 @@ _start:
 	mv	s1, a1
 
 	la	t0, trap_entry
+#ifdef CONFIG_RISCV_SMODE

It might make the code more readable by using defines for the CSRs, which are set to the correct values at the start of start.S depending on if CONFIG_RISCV_SMODE is set (similar to what we do for the load and
store instructions).
This is just a thought, I think this way is perfectly fine as well. :)

Thanks,
Lukas

Quoted 63 lines
arch/riscv/cpu/start.S +11 -0
+	csrw	stvec, t0
+#else
 	csrw	mtvec, t0
+#endif
 
 	/* mask all interrupts */
+#ifdef CONFIG_RISCV_SMODE
+	csrw	sie, zero
+#else
 	csrw	mie, zero
+#endif
 
 	/* Enable cache */
 	jal	icache_enable
@@ -164,7 +172,11 @@ fix_rela_dyn:
 */
 	la	t0, trap_entry
 	add	t0, t0, t6
+#ifdef CONFIG_RISCV_SMODE
+	csrw	stvec, t0
+#else
 	csrw	mtvec, t0
+#endif
 
 clear_bss:
 	la	t0, __bss_start		/* t0 <- rel __bss_start in

FLASH */

arch/riscv/cpu/start.S +17 -0
@@ -236,17 +248,34 @@ trap_entry:
 	SREG	x29, 29*REGBYTES(sp)
 	SREG	x30, 30*REGBYTES(sp)
 	SREG	x31, 31*REGBYTES(sp)
+#ifdef CONFIG_RISCV_SMODE
+	csrr	a0, scause
+	csrr	a1, sepc
+#else
 	csrr	a0, mcause
 	csrr	a1, mepc
+#endif
 	mv	a2, sp
 	jal	handle_trap
+#ifdef CONFIG_RISCV_SMODE
+	csrw	sepc, a0
+#else
 	csrw	mepc, a0
+#endif
 
+#ifdef CONFIG_RISCV_SMODE
+/*
+ * Remain in S-mode after sret
+ */
+	li	t0, SSTATUS_SPP
+	csrs	sstatus, t0
+#else
 /*
  * Remain in M-mode after mret
  */
 	li	t0, MSTATUS_MPP
 	csrs	mstatus, t0
+#endif
 	LREG	x1, 1*REGBYTES(sp)
 	LREG	x2, 2*REGBYTES(sp)
 	LREG	x3, 3*REGBYTES(sp)

arch/riscv/cpu/start.S trap_entry: · line 315

Quoted 8 lines
arch/riscv/cpu/start.S +4 -0
@@ -279,4 +308,8 @@ trap_entry:
 	LREG	x30, 30*REGBYTES(sp)
 	LREG	x31, 31*REGBYTES(sp)
 	addi	sp, sp, 32*REGBYTES
+#ifdef CONFIG_RISCV_SMODE
+	sret
+#else
 	mret
+#endif

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot

author
#4 lore raw

PATCH v3 1/3 riscv: Add kconfig option to run u-boot in S-mode

Quoted 11 lines · Lukas

Hi Anup,

Quoted 7 lines · Lukas

Hi Anup,

Quoted 1 line · Anup Patel

This patch adds kconfig option RISCV_SMODE to run u-boot in

nit: U-Boot (also in the first line of the commit message)

Quoted 8 lines
Quoted 3 lines
Quoted 3 lines

S-mode. When this opition is enabled we use s<xyz> CSRs instead of m<xyz> CSRs.

Can you also modify arch/riscv/lib/interrupts.c to test for the supervisor instead of the machine timer and external interrupts when CONFIG_RISCV_SMODE is set?

Sure, will do.

Regards,
Anup

#5 lore raw

PATCH v3 1/3 riscv: Add kconfig option to run u-boot in S-mode

In reply to Anup Patel
Quoted 10 lines · anup at brainfault.org

This patch adds kconfig option RISCV_SMODE to run u-boot in S-mode. When this opition is enabled we use s<xyz> CSRs instead of m<xyz> CSRs.

It is important to note that there is no equivalent S-mode CSR for misa and mhartid CSRs so we expect M-mode runtime firmware (BBL or equivalent) to emulate misa and mhartid CSR read.

In-future, we will have more patches to avoid accessing misa and mhartid CSRs from S-mode.

Ya, I don't like this. Our current boot protocol puts mhartid in a1 upon entering the supervisor, and allows the detection of misa via a device tree pointer provided in a0.

As long as everyone agrees this isn't what we're actually looking for then I'm fine with the patch, I just don't want to end up requiring this "M mode emulates some CSRs for S mode" interface. Since we don't have an actual platform spec we've got to be careful to avoid a bunch of defacto interfaces that we'll need to support later.

Quoted 104 lines
---
 arch/riscv/Kconfig     |  5 +++++
 arch/riscv/cpu/start.S | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)
arch/riscv/Kconfig +5 -0
index 3e0af55e71..8f2139ff60 100644
@@ -55,6 +55,11 @@ config RISCV_ISA_C
 config RISCV_ISA_A
 	def_bool y
 
+config RISCV_SMODE
+	bool "Run in S-Mode"
+	help
+	  Enable this option to build an U-Boot for RISC-V S-Mode
+
 config 32BIT
 	bool
 
arch/riscv/cpu/start.S +33 -0
index 5af189b338..e4276e8e19 100644
@@ -39,10 +39,18 @@ _start:
 	mv	s1, a1
 
 	la	t0, trap_entry
+#ifdef CONFIG_RISCV_SMODE
+	csrw	stvec, t0
+#else
 	csrw	mtvec, t0
+#endif
 
 	/* mask all interrupts */
+#ifdef CONFIG_RISCV_SMODE
+	csrw	sie, zero
+#else
 	csrw	mie, zero
+#endif
 
 	/* Enable cache */
 	jal	icache_enable
@@ -164,7 +172,11 @@ fix_rela_dyn:
 */
 	la	t0, trap_entry
 	add	t0, t0, t6
+#ifdef CONFIG_RISCV_SMODE
+	csrw	stvec, t0
+#else
 	csrw	mtvec, t0
+#endif
 
 clear_bss:
 	la	t0, __bss_start		/* t0 <- rel __bss_start in FLASH */
@@ -236,17 +248,34 @@ trap_entry:
 	SREG	x29, 29*REGBYTES(sp)
 	SREG	x30, 30*REGBYTES(sp)
 	SREG	x31, 31*REGBYTES(sp)
+#ifdef CONFIG_RISCV_SMODE
+	csrr	a0, scause
+	csrr	a1, sepc
+#else
 	csrr	a0, mcause
 	csrr	a1, mepc
+#endif
 	mv	a2, sp
 	jal	handle_trap
+#ifdef CONFIG_RISCV_SMODE
+	csrw	sepc, a0
+#else
 	csrw	mepc, a0
+#endif
 
+#ifdef CONFIG_RISCV_SMODE
+/*
+ * Remain in S-mode after sret
+ */
+	li	t0, SSTATUS_SPP
+	csrs	sstatus, t0
+#else
 /*
  * Remain in M-mode after mret
  */
 	li	t0, MSTATUS_MPP
 	csrs	mstatus, t0
+#endif
 	LREG	x1, 1*REGBYTES(sp)
 	LREG	x2, 2*REGBYTES(sp)
 	LREG	x3, 3*REGBYTES(sp)
@@ -279,4 +308,8 @@ trap_entry:
 	LREG	x30, 30*REGBYTES(sp)
 	LREG	x31, 31*REGBYTES(sp)
 	addi	sp, sp, 32*REGBYTES
+#ifdef CONFIG_RISCV_SMODE
+	sret
+#else
 	mret
+#endif
#6 lore raw

PATCH v3 1/3 riscv: Add kconfig option to run u-boot in S-mode

Hi Palmer,

Quoted 18 lines · Palmer Dabbelt
Quoted 10 lines · anup at brainfault.org

This patch adds kconfig option RISCV_SMODE to run u-boot in S-mode. When this opition is enabled we use s<xyz> CSRs instead of m<xyz> CSRs.

It is important to note that there is no equivalent S-mode CSR for misa and mhartid CSRs so we expect M-mode runtime firmware (BBL or equivalent) to emulate misa and mhartid CSR read.

In-future, we will have more patches to avoid accessing misa and mhartid CSRs from S-mode.

Ya, I don't like this. Our current boot protocol puts mhartid in a1 upon
entering the supervisor, and allows the detection of misa via a device tree
pointer provided in a0.

Quoted 10 lines

As long as everyone agrees this isn't what we're actually looking for then I'm
fine with the patch, I just don't want to end up requiring this "M mode
emulates some CSRs for S mode" interface. Since we don't have an actual
platform spec we've got to be careful to avoid a bunch of defacto interfaces
that we'll need to support later.

I agree with you. We actually won't need the CSR emulation of misa and mhartid for long. With Bin's recent patch series [1], the ISA string is read from the device tree, replacing the use of misa. mhartid is only used to pass the hart id to the kernel. I am going to replace it in a patch series I am working on.
So the interface should just be temporary.

Thanks,
Lukas

[1]: https://patchwork.ozlabs.org/project/uboot/list/?series=75644

Quoted 105 lines
Quoted 105 lines
---
 arch/riscv/Kconfig     |  5 +++++
 arch/riscv/cpu/start.S | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)
arch/riscv/Kconfig +5 -0
index 3e0af55e71..8f2139ff60 100644
@@ -55,6 +55,11 @@ config RISCV_ISA_C
 config RISCV_ISA_A
 	def_bool y
 
+config RISCV_SMODE
+	bool "Run in S-Mode"
+	help
+	  Enable this option to build an U-Boot for RISC-V S-Mode
+
 config 32BIT
 	bool
 
arch/riscv/cpu/start.S +12 -0
index 5af189b338..e4276e8e19 100644
@@ -39,10 +39,18 @@ _start:
 	mv	s1, a1
 
 	la	t0, trap_entry
+#ifdef CONFIG_RISCV_SMODE
+	csrw	stvec, t0
+#else
 	csrw	mtvec, t0
+#endif
 
 	/* mask all interrupts */
+#ifdef CONFIG_RISCV_SMODE
+	csrw	sie, zero
+#else
 	csrw	mie, zero
+#endif
 
 	/* Enable cache */
 	jal	icache_enable
@@ -164,7 +172,11 @@ fix_rela_dyn:
 */
 	la	t0, trap_entry
 	add	t0, t0, t6
+#ifdef CONFIG_RISCV_SMODE
+	csrw	stvec, t0
+#else
 	csrw	mtvec, t0
+#endif
 
 clear_bss:
 	la	t0, __bss_start		/* t0 <- rel __bss_start in FLASH

*/

arch/riscv/cpu/start.S +21 -0
@@ -236,17 +248,34 @@ trap_entry:
 	SREG	x29, 29*REGBYTES(sp)
 	SREG	x30, 30*REGBYTES(sp)
 	SREG	x31, 31*REGBYTES(sp)
+#ifdef CONFIG_RISCV_SMODE
+	csrr	a0, scause
+	csrr	a1, sepc
+#else
 	csrr	a0, mcause
 	csrr	a1, mepc
+#endif
 	mv	a2, sp
 	jal	handle_trap
+#ifdef CONFIG_RISCV_SMODE
+	csrw	sepc, a0
+#else
 	csrw	mepc, a0
+#endif
 
+#ifdef CONFIG_RISCV_SMODE
+/*
+ * Remain in S-mode after sret
+ */
+	li	t0, SSTATUS_SPP
+	csrs	sstatus, t0
+#else
 /*
  * Remain in M-mode after mret
  */
 	li	t0, MSTATUS_MPP
 	csrs	mstatus, t0
+#endif
 	LREG	x1, 1*REGBYTES(sp)
 	LREG	x2, 2*REGBYTES(sp)
 	LREG	x3, 3*REGBYTES(sp)
@@ -279,4 +308,8 @@ trap_entry:
 	LREG	x30, 30*REGBYTES(sp)
 	LREG	x31, 31*REGBYTES(sp)
 	addi	sp, sp, 32*REGBYTES
+#ifdef CONFIG_RISCV_SMODE
+	sret
+#else
 	mret
+#endif
#7 lore raw

PATCH v3 1/3 riscv: Add kconfig option to run u-boot in S-mode

Quoted 32 lines · lukas.auer at aisec.fraunhofer.de

Hi Palmer,

Quoted 18 lines · Palmer Dabbelt
Quoted 10 lines · anup at brainfault.org

This patch adds kconfig option RISCV_SMODE to run u-boot in S-mode. When this opition is enabled we use s<xyz> CSRs instead of m<xyz> CSRs.

It is important to note that there is no equivalent S-mode CSR for misa and mhartid CSRs so we expect M-mode runtime firmware (BBL or equivalent) to emulate misa and mhartid CSR read.

In-future, we will have more patches to avoid accessing misa and mhartid CSRs from S-mode.

Ya, I don't like this. Our current boot protocol puts mhartid in a1 upon
entering the supervisor, and allows the detection of misa via a device tree
pointer provided in a0.

Quoted 10 lines

As long as everyone agrees this isn't what we're actually looking for then I'm
fine with the patch, I just don't want to end up requiring this "M mode
emulates some CSRs for S mode" interface. Since we don't have an actual
platform spec we've got to be careful to avoid a bunch of defacto interfaces
that we'll need to support later.

Quoted 6 lines

I agree with you. We actually won't need the CSR emulation of misa and mhartid for long. With Bin's recent patch series [1], the ISA string is read from the device tree, replacing the use of misa. mhartid is only used to pass the hart id to the kernel. I am going to replace it in a patch series I am working on.
So the interface should just be temporary.

Great, thanks!

Quoted 111 lines

Thanks,
Lukas

[1]: https://patchwork.ozlabs.org/project/uboot/list/?series=75644

Quoted 105 lines
Quoted 105 lines
---
 arch/riscv/Kconfig     |  5 +++++
 arch/riscv/cpu/start.S | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)
arch/riscv/Kconfig +5 -0
index 3e0af55e71..8f2139ff60 100644
@@ -55,6 +55,11 @@ config RISCV_ISA_C
 config RISCV_ISA_A
 	def_bool y
 
+config RISCV_SMODE
+	bool "Run in S-Mode"
+	help
+	  Enable this option to build an U-Boot for RISC-V S-Mode
+
 config 32BIT
 	bool
 
arch/riscv/cpu/start.S +12 -0
index 5af189b338..e4276e8e19 100644
@@ -39,10 +39,18 @@ _start:
 	mv	s1, a1
 
 	la	t0, trap_entry
+#ifdef CONFIG_RISCV_SMODE
+	csrw	stvec, t0
+#else
 	csrw	mtvec, t0
+#endif
 
 	/* mask all interrupts */
+#ifdef CONFIG_RISCV_SMODE
+	csrw	sie, zero
+#else
 	csrw	mie, zero
+#endif
 
 	/* Enable cache */
 	jal	icache_enable
@@ -164,7 +172,11 @@ fix_rela_dyn:
 */
 	la	t0, trap_entry
 	add	t0, t0, t6
+#ifdef CONFIG_RISCV_SMODE
+	csrw	stvec, t0
+#else
 	csrw	mtvec, t0
+#endif
 
 clear_bss:
 	la	t0, __bss_start		/* t0 <- rel __bss_start in FLASH

*/

arch/riscv/cpu/start.S +21 -0
@@ -236,17 +248,34 @@ trap_entry:
 	SREG	x29, 29*REGBYTES(sp)
 	SREG	x30, 30*REGBYTES(sp)
 	SREG	x31, 31*REGBYTES(sp)
+#ifdef CONFIG_RISCV_SMODE
+	csrr	a0, scause
+	csrr	a1, sepc
+#else
 	csrr	a0, mcause
 	csrr	a1, mepc
+#endif
 	mv	a2, sp
 	jal	handle_trap
+#ifdef CONFIG_RISCV_SMODE
+	csrw	sepc, a0
+#else
 	csrw	mepc, a0
+#endif
 
+#ifdef CONFIG_RISCV_SMODE
+/*
+ * Remain in S-mode after sret
+ */
+	li	t0, SSTATUS_SPP
+	csrs	sstatus, t0
+#else
 /*
  * Remain in M-mode after mret
  */
 	li	t0, MSTATUS_MPP
 	csrs	mstatus, t0
+#endif
 	LREG	x1, 1*REGBYTES(sp)
 	LREG	x2, 2*REGBYTES(sp)
 	LREG	x3, 3*REGBYTES(sp)
@@ -279,4 +308,8 @@ trap_entry:
 	LREG	x30, 30*REGBYTES(sp)
 	LREG	x31, 31*REGBYTES(sp)
 	addi	sp, sp, 32*REGBYTES
+#ifdef CONFIG_RISCV_SMODE
+	sret
+#else
 	mret
+#endif
author
#8 lore raw

PATCH v3 1/3 riscv: Add kconfig option to run u-boot in S-mode

In reply to Palmer Dabbelt
Quoted 17 lines · Palmer Dabbelt
Quoted 10 lines · anup at brainfault.org

This patch adds kconfig option RISCV_SMODE to run u-boot in S-mode. When this opition is enabled we use s<xyz> CSRs instead of m<xyz> CSRs.

It is important to note that there is no equivalent S-mode CSR for misa and mhartid CSRs so we expect M-mode runtime firmware (BBL or equivalent) to emulate misa and mhartid CSR read.

In-future, we will have more patches to avoid accessing misa and mhartid CSRs from S-mode.

Ya, I don't like this. Our current boot protocol puts mhartid in a1 upon entering the supervisor, and allows the detection of misa via a device tree pointer provided in a0.

Quoted 5 lines

As long as everyone agrees this isn't what we're actually looking for then I'm fine with the patch, I just don't want to end up requiring this "M mode emulates some CSRs for S mode" interface. Since we don't have an actual platform spec we've got to be careful to avoid a bunch of defacto interfaces that we'll need to support later.

Yes, it's a temporary thingy to emulate misa and mhartid in BBL.

Eventually, U-Boot will be fixed to avoid direct access of misa and mhartid.

Regards,
Anup

#9 lore raw

PATCH v3 1/3 riscv: Add kconfig option to run u-boot in S-mode

In reply to Palmer Dabbelt

Hi Palmer,

Quoted 10 lines · Palmer Dabbelt
Quoted 8 lines · anup at brainfault.org

This patch adds kconfig option RISCV_SMODE to run u-boot in S-mode. When this opition is enabled we use s<xyz> CSRs instead of m<xyz> CSRs.

It is important to note that there is no equivalent S-mode CSR for misa and mhartid CSRs so we expect M-mode runtime firmware (BBL or equivalent) to emulate misa and mhartid CSR read.

Quoted 7 lines
Quoted 2 lines

In-future, we will have more patches to avoid accessing misa and mhartid CSRs from S-mode.

Ya, I don't like this. Our current boot protocol puts mhartid in a1 upon entering the supervisor, and allows the detection of misa via a device tree pointer provided in a0.

As Anup mentioned in the commit message, the read of mhartid in *S-mode* should be fixed in future patches. We still need it for M-mode.

Quoted 6 lines

As long as everyone agrees this isn't what we're actually looking for then I'm fine with the patch, I just don't want to end up requiring this "M mode emulates some CSRs for S mode" interface. Since we don't have an actual platform spec we've got to be careful to avoid a bunch of defacto interfaces that we'll need to support later.

Agreed.

Regards,
Bin

author
#10 lore raw

PATCH v3 2/3 riscv: qemu: Use different SYS_TEXT_BASE for S-mode

In reply to Anup Patel

When u-boot runs in S-mode, the M-mode runtime firmware (BBL or equivalent) uses memory range in 0x80000000 to 0x80200000. Due to this, we cannot use 0x80000000 as SYS_TEXT_BASE when running in S-mode. Instead for S-mode, we use 0x80200000 as SYS_TEXT_BASE.

Even Linux RISC-V kernel ignores/reserves memory range 0x80000000 to 0x80200000 because it runs in S-mode.

---
 board/emulation/qemu-riscv/Kconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
board/emulation/qemu-riscv/Kconfig +2 -1
index 33ca253432..56bb5337d4 100644
@@ -13,7 +13,8 @@ config SYS_CONFIG_NAME
 	default "qemu-riscv"
 
 config SYS_TEXT_BASE
-	default 0x80000000
+	default 0x80000000 if !RISCV_SMODE
+	default 0x80200000 if RISCV_SMODE
 
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
Signature · 1 line
2.17.1
#11 lore raw

PATCH v3 2/3 riscv: qemu: Use different SYS_TEXT_BASE for S-mode

Quoted 9 lines · Anup Patel

When u-boot runs in S-mode, the M-mode runtime firmware (BBL or equivalent) uses memory range in 0x80000000 to 0x80200000. Due to this, we cannot use 0x80000000 as SYS_TEXT_BASE when running in S-mode. Instead for S-mode, we use 0x80200000 as SYS_TEXT_BASE.

Even Linux RISC-V kernel ignores/reserves memory range 0x80000000 to 0x80200000 because it runs in S-mode.

Quoted 7 lines
---
 board/emulation/qemu-riscv/Kconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
author
#12 lore raw

PATCH v3 3/3 riscv: Add S-mode defconfigs for QEMU virt machine

In reply to Anup Patel

This patch adds S-mode defconfigs for QEMU virt machine so that we can run u-boot in S-mode on QEMU using M-mode runtime firmware (BBL or equivalent).

---
 board/emulation/qemu-riscv/MAINTAINERS |  2 ++
 configs/qemu-riscv32_smode_defconfig   | 10 ++++++++++
 configs/qemu-riscv64_smode_defconfig   | 11 +++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 configs/qemu-riscv32_smode_defconfig
 create mode 100644 configs/qemu-riscv64_smode_defconfig
board/emulation/qemu-riscv/MAINTAINERS +2 -0
index 3c6eb4f844..c701c83d77 100644
@@ -4,4 +4,6 @@ S:	Maintained
 F:	board/emulation/qemu-riscv/
 F:	include/configs/qemu-riscv.h
 F:	configs/qemu-riscv32_defconfig
+F:	configs/qemu-riscv32_smode_defconfig
 F:	configs/qemu-riscv64_defconfig
+F:	configs/qemu-riscv64_smode_defconfig
configs/qemu-riscv32_smode_defconfig new file +10 -0
new file mode 100644
index 0000000000..0a84ec1874
@@ -0,0 +1,10 @@
+CONFIG_RISCV=y
+CONFIG_TARGET_QEMU_VIRT=y
+CONFIG_RISCV_SMODE=y
+CONFIG_DISTRO_DEFAULTS=y
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_FIT=y
+CONFIG_DISPLAY_CPUINFO=y
+CONFIG_DISPLAY_BOARDINFO=y
+# CONFIG_CMD_MII is not set
+CONFIG_OF_PRIOR_STAGE=y
configs/qemu-riscv64_smode_defconfig new file +11 -0
new file mode 100644
index 0000000000..b012443370
@@ -0,0 +1,11 @@
+CONFIG_RISCV=y
+CONFIG_TARGET_QEMU_VIRT=y
+CONFIG_ARCH_RV64I=y
+CONFIG_RISCV_SMODE=y
+CONFIG_DISTRO_DEFAULTS=y
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_FIT=y
+CONFIG_DISPLAY_CPUINFO=y
+CONFIG_DISPLAY_BOARDINFO=y
+# CONFIG_CMD_MII is not set
+CONFIG_OF_PRIOR_STAGE=y
Signature · 1 line
2.17.1
#13 lore raw

PATCH v3 3/3 riscv: Add S-mode defconfigs for QEMU virt machine

Quoted 7 lines · Anup Patel

This patch adds S-mode defconfigs for QEMU virt machine so that we can run u-boot in S-mode on QEMU using M-mode runtime firmware (BBL or equivalent).

Quoted 8 lines
---
 board/emulation/qemu-riscv/MAINTAINERS |  2 ++
 configs/qemu-riscv32_smode_defconfig   | 10 ++++++++++
 configs/qemu-riscv64_smode_defconfig   | 11 +++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 configs/qemu-riscv32_smode_defconfig
 create mode 100644 configs/qemu-riscv64_smode_defconfig