lib: sbi: Refine the settings for switching to Virtual Supervisor Mode.
PATCH 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.
--- lib/sbi/sbi_hart.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
lib/sbi/sbi_hart.c +11 -4
@@ -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 (true == next_virt){ +csr_write (CSR_VSTVEC , next_addr); +csr_write (CSR_VSSCRATCH ,0 ); +csr_write (CSR_VSIE ,0 ); +csr_write (CSR_VSATP ,0 ); + }else if (false == next_virt){ +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
PATCH 1/1 lib: sbi: Refine the settings for switching to Virtual Supervisor Mode.
Dear All:
I discovered a subtle bug during the process of switching to VS
mode. The issue arises because, even though Mstatus.MPV is set, before executing mret, one should access the VS mode registers using their actual addresses, rather than using the pseudonyms of the S registers.
Best Regards!
Boswell Lei
Quoted 39 lines · On Tue, Apr 9, 2024 at 10:24?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.
Signed-off-by Pope B.Lei <[email protected]>--- lib/sbi/sbi_hart.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)lib/sbi/sbi_hart.c +11
-5@@ -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 (true == next_virt){ +csr_write (CSR_VSTVEC , next_addr); +csr_write (CSR_VSSCRATCH ,0 ); +csr_write (CSR_VSIE ,0 ); +csr_write (CSR_VSATP ,0 ); + }else if (false == next_virt){ +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
PATCH 1/1 lib: sbi: Refine the settings for switching to Virtual Supervisor Mode.
In reply to Pope B.Leilib/sbi/sbi_hart.c sbi_hart_switch_mode(unsigned long arg0, unsigned long arg1, · line 1044
Quoted 13 lines · Pope B.Lei
lib/sbi/sbi_hart.c +1
-4@@ -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 (true == next_virt){
Never compare a boolean with a constant.
lib/sbi/sbi_hart.c sbi_hart_switch_mode(unsigned long arg0, unsigned long arg1, · line 1049
Quoted 5 lines
lib/sbi/sbi_hart.c +5
-0+csr_write (CSR_VSTVEC , next_addr); +csr_write (CSR_VSSCRATCH ,0 ); +csr_write (CSR_VSIE ,0 ); +csr_write (CSR_VSATP ,0 ); + }else if (false == next_virt){
This condition is obviously redundant.
Signature · 3 lines
Andreas Schwab, SUSE Labs, schwab at suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."