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.
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 -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 (true == 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