summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Kotheimer <[email protected]>2020-08-14 23:01:29 +0200
committerAnup Patel <[email protected]>2020-08-17 18:17:42 +0530
commit9d56961b2314f31f9d66e53204c02e01fada7c32 (patch)
treea1a44ae477e36fd0a59e043adcc7eb775325abeb
parent4b18a2acc2f4568746efc82ec25705f33c4ae31e (diff)
lib: sbi_trap: Fix hstatus.SPVP update in sbi_trap_redirect()
When redirecting from VS/VU-mode to HS-mode, hstatus.SPVP was set to the value of mstatus.SPP, as according to the specification both flags should be set to the same value. However, the assignment of SPVP takes place before SPP itself is updated, which results in SPVP having an outdated value. Signed-off-by: Georg Kotheimer <[email protected]> Reviewed-by: Anup Patel <[email protected]>
-rw-r--r--lib/sbi/sbi_trap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sbi/sbi_trap.c b/lib/sbi/sbi_trap.c
index 930119d2..c2bd061a 100644
--- a/lib/sbi/sbi_trap.c
+++ b/lib/sbi/sbi_trap.c
@@ -123,7 +123,7 @@ int sbi_trap_redirect(struct sbi_trap_regs *regs,
/* Update HSTATUS SPVP and SPV bits */
hstatus = csr_read(CSR_HSTATUS);
hstatus &= ~HSTATUS_SPVP;
- hstatus |= (regs->mstatus & MSTATUS_SPP) ? HSTATUS_SPVP : 0;
+ hstatus |= (prev_mode == PRV_S) ? HSTATUS_SPVP : 0;
hstatus &= ~HSTATUS_SPV;
hstatus |= (prev_virt) ? HSTATUS_SPV : 0;
csr_write(CSR_HSTATUS, hstatus);