Skip to contentSkip to conversation

lib: sbi: Refine the settings for switching to Virtual Supervisor Mode.

PATCH Superseded Pope B.Lei 2 participants 3 messages Apr 10, 2024 – May 7, 2024

lore
Share & tools
lore

Pope B.Lei

author
#0 lore raw

PATCH v3 1/1 lib: sbi: Refine the settings for switching to Virtual Supervisor Mode.

Although Mstatus.MPV is set, before executing mret, access to VS mode registers should use the actual register addresses, not the pseudonyms of S registers.

---
V1 -> V2: Simplify the if condition
V2 -> V3: Format indentation to tabs.

 lib/sbi/sbi_hart.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)
lib/sbi/sbi_hart.c +11 -4
index 3d13694..ea75e74 100644
@@ -1041,10 +1041,17 @@ sbi_hart_switch_mode(unsigned long arg0, unsigned long arg1,
 	csr_write(CSR_MEPC, next_addr);
 
 	if (next_mode == PRV_S) {
-		csr_write(CSR_STVEC, next_addr);
-		csr_write(CSR_SSCRATCH, 0);
-		csr_write(CSR_SIE, 0);
-		csr_write(CSR_SATP, 0);
+		if (next_virt) {
+			csr_write(CSR_VSTVEC, next_addr);
+			csr_write(CSR_VSSCRATCH, 0);
+			csr_write(CSR_VSIE, 0);
+			csr_write(CSR_VSATP, 0);
+		} else {
+			csr_write(CSR_STVEC, next_addr);
+			csr_write(CSR_SSCRATCH, 0);
+			csr_write(CSR_SIE, 0);
+			csr_write(CSR_SATP, 0);
+		}
 	} else if (next_mode == PRV_U) {
 		if (misa_extension('N')) {
 			csr_write(CSR_UTVEC, next_addr);
Signature · 1 line
2.35.2.windows.1
author
#1 lore raw

PATCH v3 1/1 lib: sbi: Refine the settings for switching to Virtual Supervisor Mode.

Dear all:

I apologize for starting a new topic, but I'm unsure how to
proceed without doing so. Below is the sequence of commands I've used. Could you please suggest any improvements?

Generating the Patch:

bashCopy code
git format-patch -v3 -M -s origin/master

Sending the Patch:

vbnetCopy code
git send-mail --to opensbi at lists.infradead.org v3-0001-lib-sbi-Refine-the-settings-for-switching-to-Virt.patch

Thank you for your guidance!

Quoted 41 lines · On Wed, Apr 10, 2024 at 10:05?AM Pope B.Lei <[email protected]> wrote:

Although Mstatus.MPV is set, before executing mret, access to VS mode registers should use the actual register addresses, not the pseudonyms of S registers.

---
V1 -> V2: Simplify the if condition
V2 -> V3: Format indentation to tabs.

 lib/sbi/sbi_hart.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)
lib/sbi/sbi_hart.c +11 -5
index 3d13694..ea75e74 100644
@@ -1041,10 +1041,17 @@ sbi_hart_switch_mode(unsigned long arg0, unsigned long arg1,
        csr_write(CSR_MEPC, next_addr);
 
        if (next_mode == PRV_S) {
-               csr_write(CSR_STVEC, next_addr);
-               csr_write(CSR_SSCRATCH, 0);
-               csr_write(CSR_SIE, 0);
-               csr_write(CSR_SATP, 0);
+               if (next_virt) {
+                       csr_write(CSR_VSTVEC, next_addr);
+                       csr_write(CSR_VSSCRATCH, 0);
+                       csr_write(CSR_VSIE, 0);
+                       csr_write(CSR_VSATP, 0);
+               } else {
+                       csr_write(CSR_STVEC, next_addr);
+                       csr_write(CSR_SSCRATCH, 0);
+                       csr_write(CSR_SIE, 0);
+                       csr_write(CSR_SATP, 0);
+               }
        } else if (next_mode == PRV_U) {
                if (misa_extension('N')) {
                        csr_write(CSR_UTVEC, next_addr);
--

2.35.2.windows.1

Applied
#2 lore raw

PATCH v3 1/1 lib: sbi: Refine the settings for switching to Virtual Supervisor Mode.

In reply to Pope B.Lei
Quoted 6 lines · On Wed, Apr 10, 2024 at 7:35?AM Pope B.Lei <[email protected]> wrote:

Although Mstatus.MPV is set, before executing mret, access to VS mode registers should use the actual register addresses, not the pseudonyms of S registers.

LGTM.

Applied this patch to the riscv/opensbi repo.

Thanks,
Anup

Quoted 40 lines

---
V1 -> V2: Simplify the if condition
V2 -> V3: Format indentation to tabs.

 lib/sbi/sbi_hart.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)
lib/sbi/sbi_hart.c +11 -5
index 3d13694..ea75e74 100644
@@ -1041,10 +1041,17 @@ sbi_hart_switch_mode(unsigned long arg0, unsigned long arg1,
        csr_write(CSR_MEPC, next_addr);
 
        if (next_mode == PRV_S) {
-               csr_write(CSR_STVEC, next_addr);
-               csr_write(CSR_SSCRATCH, 0);
-               csr_write(CSR_SIE, 0);
-               csr_write(CSR_SATP, 0);
+               if (next_virt) {
+                       csr_write(CSR_VSTVEC, next_addr);
+                       csr_write(CSR_VSSCRATCH, 0);
+                       csr_write(CSR_VSIE, 0);
+                       csr_write(CSR_VSATP, 0);
+               } else {
+                       csr_write(CSR_STVEC, next_addr);
+                       csr_write(CSR_SSCRATCH, 0);
+                       csr_write(CSR_SIE, 0);
+                       csr_write(CSR_SATP, 0);
+               }
        } else if (next_mode == PRV_U) {
                if (misa_extension('N')) {
                        csr_write(CSR_UTVEC, next_addr);
--

2.35.2.windows.1

--
opensbi mailing list
opensbi at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/opensbi