Skip to contentSkip to conversation

target/riscv: use SXL instead of MXL for read_sstatus

PATCH Superseded Abhigyan Kumar 2 participants 2 messages Jul 20 – Jul 23 RISC-V

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 target/riscv: use SXL instead of MXL for read_sstatus

According to the RISC-V spec, a 64-bit system can have M-mode in 64-bit with S-mode being 32-bit (SXL bits or mstatus[35:34] being 1). In this case, read_sstatus should use SXL.

QEMU doesn't allow changing the SXL bits in mstatus in M-mode. This was because of the missing MSTATUS64_SXL mask in write_mstatus. Now, both the SXL field in mstatus can be safely modified in M-mode and read_sstatus correctly uses SXL not MXL.

---
 target/riscv/tcg/csr.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
target/riscv/tcg/csr.c +7 -2
index 36f2004bc..b67a5a301 100644
@@ -2067,6 +2067,11 @@ static RISCVException write_mstatus(CPURISCVState *env, int csrno,
     }
 
     if (xl != MXL_RV32 || env->debugger) {
+        if ((val & MSTATUS64_SXL) != 0) {
+            mask |= MSTATUS64_SXL;
+            val = riscv_write_uxl(env, val, MSTATUS64_SXL);
+        }
+    
         if ((val & MSTATUS64_UXL) != 0) {
             mask |= MSTATUS64_UXL;
             val = riscv_write_uxl(env, val, MSTATUS64_UXL);
@@ -4014,8 +4019,8 @@ static RISCVException read_sstatus(CPURISCVState *env, int csrno,
     if (riscv_cpu_cfg(env)->ext_ssdbltrp) {
         mask |= SSTATUS_SDT;
     }
-    /* TODO: Use SXL not MXL. */
-    *val = add_status_sd(riscv_cpu_mxl(env), env->mstatus & mask);
+
+    *val = add_status_sd(riscv_cpu_sxl(env), env->mstatus & mask);
     return RISCV_EXCP_NONE;
 }
 
Signature · 1 line
2.55.0
#1 lore raw

Hi,

Quoted 9 lines · Abhigyan Kumar

According to the RISC-V spec, a 64-bit system can have M-mode in 64-bit with S-mode being 32-bit (SXL bits or mstatus[35:34] being 1). In this case, read_sstatus should use SXL.

QEMU doesn't allow changing the SXL bits in mstatus in M-mode. This was because of the missing MSTATUS64_SXL mask in write_mstatus. Now, both the SXL field in mstatus can be safely modified in M-mode and read_sstatus correctly uses SXL not MXL.

Please add:

Fixes b550f89457 ("target/riscv: Compute mstatus.sd on demand")
Quoted 2 lines

---

There's a style nit that checkpatch detected:

$ ./scripts/checkpatch.pl 0001-target-riscv-use-SXL-instead-of-MXL-for-read_sstatus.patch
ERROR: trailing whitespace
#32: FILE: target/riscv/tcg/csr.c:2074:
+    $

total: 1 errors, 0 warnings, 21 lines checked

0001-target-riscv-use-SXL-instead-of-MXL-for-read_sstatus.patch has style problems, please review. If any of these errors are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

Other than that LGTM. Thanks,
Daniel

Quoted 30 lines
  target/riscv/tcg/csr.c | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
target/riscv/tcg/csr.c +7 -2
index 36f2004bc..b67a5a301 100644
@@ -2067,6 +2067,11 @@ static RISCVException write_mstatus(CPURISCVState *env, int csrno,
      }
 
      if (xl != MXL_RV32 || env->debugger) {
+        if ((val & MSTATUS64_SXL) != 0) {
+            mask |= MSTATUS64_SXL;
+            val = riscv_write_uxl(env, val, MSTATUS64_SXL);
+        }
+
          if ((val & MSTATUS64_UXL) != 0) {
              mask |= MSTATUS64_UXL;
              val = riscv_write_uxl(env, val, MSTATUS64_UXL);
@@ -4014,8 +4019,8 @@ static RISCVException read_sstatus(CPURISCVState *env, int csrno,
      if (riscv_cpu_cfg(env)->ext_ssdbltrp) {
          mask |= SSTATUS_SDT;
      }
-    /* TODO: Use SXL not MXL. */
-    *val = add_status_sd(riscv_cpu_mxl(env), env->mstatus & mask);
+
+    *val = add_status_sd(riscv_cpu_sxl(env), env->mstatus & mask);
      return RISCV_EXCP_NONE;
  }