Skip to contentSkip to conversation

target/riscv: Support RISC-V privilege 1.13 spec

PATCH Superseded Fea.Wang 3 participants 17 messages May 10, 2024 – May 15, 2024 RISC-V

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Fea.Wang

author
#0 lore raw

cover target/riscv: Support RISC-V privilege 1.13 spec

Based on the change log for the RISC-V privilege 1.13 spec, add the support for ss1p13.

Ref:https://github.com/riscv/riscv-isa-manual/blob/a7d93c9/src/priv-preface.adoc?plain=1#L40-L72

Lists what to do without clarification or document format.
* Redefined misa.MXL to be read-only, making MXLEN a constant.(Skip, implementation ignored)
* Added the constraint that SXLEN≥UXLEN.(Skip, implementation ignored)
* Defined the misa.V field to reflect that the V extension has been implemented.(Skip, existed)
* Defined the RV32-only medelegh and hedelegh CSRs.(Done in these patches)
* Defined the misaligned atomicity granule PMA, superseding the proposed Zam extension..(Skip, implementation ignored)
* Allocated interrupt 13 for Sscofpmf LCOFI interrupt.(Skip, existed)
* Defined hardware error and software check exception codes.(Done in these patches)
* Specified synchronization requirements when changing the PBMTE fields in menvcfg and henvcfg.(Skip, implementation ignored)
* Incorporated Svade and Svadu extension specifications.(Skip, existed)

Fea.Wang (4):
target/riscv: Support the version for ss1p13 target/riscv: Add 'P1P13' bit in SMSTATEEN0 target/riscv: Add MEDELEGH, HEDELEGH csrs for RV32 target/riscv: Reserve exception codes for sw-check and hw-err

Jim Shu (1):
target/riscv: Reuse the conversion function of priv_spec and string

 target/riscv/cpu.c         | 10 +++++++---
 target/riscv/cpu.h         |  7 ++++++-
 target/riscv/cpu_bits.h    |  5 +++++
 target/riscv/cpu_cfg.h     |  1 +
 target/riscv/csr.c         | 41 ++++++++++++++++++++++++++++++++++++++
 target/riscv/tcg/tcg-cpu.c | 17 ++++++++--------
 6 files changed, 69 insertions(+), 12 deletions(-)
Signature · 1 line
2.34.1
author
#1 lore raw

PATCH 1/5 target/riscv: Reuse the conversion function of priv_spec and string

From: Jim Shu <[email protected]>

Public the conversion function of priv_spec and string in cpu.h, so that tcg-cpu.c could also use it.

---
 target/riscv/cpu.c         |  4 ++--
 target/riscv/cpu.h         |  3 +++
 target/riscv/tcg/tcg-cpu.c | 13 +++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)
target/riscv/cpu.c +2 -2
index a74f0eb29c..b6b48e5620 100644
@@ -1769,7 +1769,7 @@ static const PropertyInfo prop_pmp = {
     .set = prop_pmp_set,
 };
 
-static int priv_spec_from_str(const char *priv_spec_str)
+int priv_spec_from_str(const char *priv_spec_str)
 {
     int priv_version = -1;
 
@@ -1784,7 +1784,7 @@ static int priv_spec_from_str(const char *priv_spec_str)
     return priv_version;
 }
 
-static const char *priv_spec_to_str(int priv_version)
+const char *priv_spec_to_str(int priv_version)
 {
     switch (priv_version) {
     case PRIV_VERSION_1_10_0:
target/riscv/cpu.h +3 -0
index e0dd1828b5..7696102697 100644
@@ -829,4 +829,7 @@ target_ulong riscv_new_csr_seed(target_ulong new_value,
 uint8_t satp_mode_max_from_map(uint32_t map);
 const char *satp_mode_str(uint8_t satp_mode, bool is_32_bit);
 
+const char *priv_spec_to_str(int priv_version);
+int priv_spec_from_str(const char *priv_spec_str);
+
 #endif /* RISCV_CPU_H */
target/riscv/tcg/tcg-cpu.c +5 -8
index 4ebebebe09..faa8de9b83 100644
@@ -76,16 +76,13 @@ static void riscv_cpu_write_misa_bit(RISCVCPU *cpu, uint32_t bit,
 
 static const char *cpu_priv_ver_to_str(int priv_ver)
 {
-    switch (priv_ver) {
-    case PRIV_VERSION_1_10_0:
-        return "v1.10.0";
-    case PRIV_VERSION_1_11_0:
-        return "v1.11.0";
-    case PRIV_VERSION_1_12_0:
-        return "v1.12.0";
+    const char *priv_spec_str = priv_spec_to_str(priv_ver);
+
+    if (priv_spec_str == NULL) {
+        g_assert_not_reached();
     }
 
-    g_assert_not_reached();
+    return priv_spec_str;
 }
 
 static void riscv_cpu_synchronize_from_tb(CPUState *cs,
Signature · 1 line
2.34.1
#2 lore raw

Re: [PATCH 1/5] target/riscv: Reuse the conversion function of priv_spec and string

Quoted 19 lines · Fea.Wang

From: Jim Shu <[email protected]>

Public the conversion function of priv_spec and string in cpu.h, so that tcg-cpu.c could also use it.

---
  target/riscv/cpu.c         |  4 ++--
  target/riscv/cpu.h         |  3 +++
  target/riscv/tcg/tcg-cpu.c | 13 +++++--------
  3 files changed, 10 insertions(+), 10 deletions(-)
target/riscv/cpu.c +0 -0
index a74f0eb29c..b6b48e5620 100644

target/riscv/cpu.c static const PropertyInfo prop_pmp = { · line 1772

Quoted 5 lines
target/riscv/cpu.c +1 -1
@@ -1769,7 +1769,7 @@ static const PropertyInfo prop_pmp = {
      .set = prop_pmp_set,
  };
 
-static int priv_spec_from_str(const char *priv_spec_str)
+int priv_spec_from_str(const char *priv_spec_str)

This change seems unnecessary in this patch.

Regards,

Weiwei Li

Quoted 50 lines
target/riscv/cpu.c +1 -1
  {
      int priv_version = -1;
 
@@ -1784,7 +1784,7 @@ static int priv_spec_from_str(const char *priv_spec_str)
      return priv_version;
  }
 
-static const char *priv_spec_to_str(int priv_version)
+const char *priv_spec_to_str(int priv_version)
  {
      switch (priv_version) {
      case PRIV_VERSION_1_10_0:
target/riscv/cpu.h +3 -0
index e0dd1828b5..7696102697 100644
@@ -829,4 +829,7 @@ target_ulong riscv_new_csr_seed(target_ulong new_value,
  uint8_t satp_mode_max_from_map(uint32_t map);
  const char *satp_mode_str(uint8_t satp_mode, bool is_32_bit);
 
+const char *priv_spec_to_str(int priv_version);
+int priv_spec_from_str(const char *priv_spec_str);
+
  #endif /* RISCV_CPU_H */
target/riscv/tcg/tcg-cpu.c +5 -8
index 4ebebebe09..faa8de9b83 100644
@@ -76,16 +76,13 @@ static void riscv_cpu_write_misa_bit(RISCVCPU *cpu, uint32_t bit,
 
  static const char *cpu_priv_ver_to_str(int priv_ver)
  {
-    switch (priv_ver) {
-    case PRIV_VERSION_1_10_0:
-        return "v1.10.0";
-    case PRIV_VERSION_1_11_0:
-        return "v1.11.0";
-    case PRIV_VERSION_1_12_0:
-        return "v1.12.0";
+    const char *priv_spec_str = priv_spec_to_str(priv_ver);
+
+    if (priv_spec_str == NULL) {
+        g_assert_not_reached();
      }
 
-    g_assert_not_reached();
+    return priv_spec_str;
  }
 
  static void riscv_cpu_synchronize_from_tb(CPUState *cs,
Reviewed-by on v1 1/5
#3 lore raw

Re: [PATCH 1/5] target/riscv: Reuse the conversion function of priv_spec and string

In reply to Fea.Wang
Quoted 58 lines · Fea.Wang

From: Jim Shu <[email protected]>

Public the conversion function of priv_spec and string in cpu.h, so that tcg-cpu.c could also use it.

---
  target/riscv/cpu.c         |  4 ++--
  target/riscv/cpu.h         |  3 +++
  target/riscv/tcg/tcg-cpu.c | 13 +++++--------
  3 files changed, 10 insertions(+), 10 deletions(-)
target/riscv/cpu.c +2 -2
index a74f0eb29c..b6b48e5620 100644
@@ -1769,7 +1769,7 @@ static const PropertyInfo prop_pmp = {
      .set = prop_pmp_set,
  };
 
-static int priv_spec_from_str(const char *priv_spec_str)
+int priv_spec_from_str(const char *priv_spec_str)
  {
      int priv_version = -1;
 
@@ -1784,7 +1784,7 @@ static int priv_spec_from_str(const char *priv_spec_str)
      return priv_version;
  }
 
-static const char *priv_spec_to_str(int priv_version)
+const char *priv_spec_to_str(int priv_version)
  {
      switch (priv_version) {
      case PRIV_VERSION_1_10_0:
target/riscv/cpu.h +3 -0
index e0dd1828b5..7696102697 100644
@@ -829,4 +829,7 @@ target_ulong riscv_new_csr_seed(target_ulong new_value,
  uint8_t satp_mode_max_from_map(uint32_t map);
  const char *satp_mode_str(uint8_t satp_mode, bool is_32_bit);
 
+const char *priv_spec_to_str(int priv_version);
+int priv_spec_from_str(const char *priv_spec_str);
+
  #endif /* RISCV_CPU_H */
target/riscv/tcg/tcg-cpu.c +0 -2
index 4ebebebe09..faa8de9b83 100644
@@ -76,16 +76,13 @@ static void riscv_cpu_write_misa_bit(RISCVCPU *cpu, uint32_t bit,
 
  static const char *cpu_priv_ver_to_str(int priv_ver)
  {
-    switch (priv_ver) {
-    case PRIV_VERSION_1_10_0:

target/riscv/tcg/tcg-cpu.c static void riscv_cpu_write_misa_bit(RISCVCPU *cpu, uint32_t bit, · line 83

Quoted 10 lines
target/riscv/tcg/tcg-cpu.c +4 -5
-        return "v1.10.0";
-    case PRIV_VERSION_1_11_0:
-        return "v1.11.0";
-    case PRIV_VERSION_1_12_0:
-        return "v1.12.0";
+    const char *priv_spec_str = priv_spec_to_str(priv_ver);
+
+    if (priv_spec_str == NULL) {
+        g_assert_not_reached();
      }

g_assert(priv_spec_str != NULL) or g_assert(priv_spec_str)

Otherwise,

Zhiwei

Quoted 6 lines
target/riscv/tcg/tcg-cpu.c +1 -1
-    g_assert_not_reached();
+    return priv_spec_str;
  }
 
  static void riscv_cpu_synchronize_from_tb(CPUState *cs,
author
#4 lore raw

Re: [PATCH 1/5] target/riscv: Reuse the conversion function of priv_spec and string

Thank you, I will correct it in the patch v2.

Sincerely,
Fea

LIU Zhiwei <[email protected]> 於 2024年5月13日 週一 上午10:55寫道:

Quoted 89 lines · Fea.Wang

target/riscv/cpu.c static int priv_spec_from_str(const char

Quoted 28 lines

From: Jim Shu <[email protected]>

Public the conversion function of priv_spec and string in cpu.h, so that tcg-cpu.c could also use it.

---
  target/riscv/cpu.c         |  4 ++--
  target/riscv/cpu.h         |  3 +++
  target/riscv/tcg/tcg-cpu.c | 13 +++++--------
  3 files changed, 10 insertions(+), 10 deletions(-)
target/riscv/cpu.c +1 -1
index a74f0eb29c..b6b48e5620 100644
@@ -1769,7 +1769,7 @@ static const PropertyInfo prop_pmp = {
      .set = prop_pmp_set,
  };
 
-static int priv_spec_from_str(const char *priv_spec_str)
+int priv_spec_from_str(const char *priv_spec_str)
  {
      int priv_version = -1;
 
@@ -1784,7 +1784,7 @@ static int priv_spec_from_str(const char

*priv_spec_str)

target/riscv/cpu.h target_ulong riscv_new_csr_seed(target_ulong

Quoted 13 lines
target/riscv/cpu.c +1 -1
      return priv_version;
  }
 
-static const char *priv_spec_to_str(int priv_version)
+const char *priv_spec_to_str(int priv_version)
  {
      switch (priv_version) {
      case PRIV_VERSION_1_10_0:
target/riscv/cpu.h +0 -0
index e0dd1828b5..7696102697 100644
@@ -829,4 +829,7 @@ target_ulong riscv_new_csr_seed(target_ulong

new_value,

target/riscv/tcg/tcg-cpu.c static void riscv_cpu_write_misa_bit(RISCVCPU *cpu,

Quoted 12 lines
target/riscv/cpu.h +3 -0
  uint8_t satp_mode_max_from_map(uint32_t map);
  const char *satp_mode_str(uint8_t satp_mode, bool is_32_bit);
 
+const char *priv_spec_to_str(int priv_version);
+int priv_spec_from_str(const char *priv_spec_str);
+
  #endif /* RISCV_CPU_H */
target/riscv/tcg/tcg-cpu.c +0 -0
index 4ebebebe09..faa8de9b83 100644
@@ -76,16 +76,13 @@ static void riscv_cpu_write_misa_bit(RISCVCPU *cpu,

uint32_t bit,

Quoted 5 lines
target/riscv/tcg/tcg-cpu.c +0 -2
  static const char *cpu_priv_ver_to_str(int priv_ver)
  {
-    switch (priv_ver) {
-    case PRIV_VERSION_1_10_0:

target/riscv/tcg/tcg-cpu.c static void riscv_cpu_write_misa_bit(RISCVCPU *cpu, uint32_t bit, · line 83

Quoted 10 lines
target/riscv/tcg/tcg-cpu.c +4 -5
-        return "v1.10.0";
-    case PRIV_VERSION_1_11_0:
-        return "v1.11.0";
-    case PRIV_VERSION_1_12_0:
-        return "v1.12.0";
+    const char *priv_spec_str = priv_spec_to_str(priv_ver);
+
+    if (priv_spec_str == NULL) {
+        g_assert_not_reached();
      }

g_assert(priv_spec_str != NULL) or g_assert(priv_spec_str)

Otherwise,

Zhiwei

Quoted 6 lines
target/riscv/tcg/tcg-cpu.c +1 -1
-    g_assert_not_reached();
+    return priv_spec_str;
  }
 
  static void riscv_cpu_synchronize_from_tb(CPUState *cs,
author
#5 lore raw

PATCH 2/5 target/riscv: Support the version for ss1p13

In reply to Fea.Wang

Add RISC-V privilege 1.13 support.

---
 target/riscv/cpu.c         | 6 +++++-
 target/riscv/cpu.h         | 4 +++-
 target/riscv/cpu_cfg.h     | 1 +
 target/riscv/tcg/tcg-cpu.c | 4 ++++
 4 files changed, 13 insertions(+), 2 deletions(-)
target/riscv/cpu.c +5 -1
index b6b48e5620..a6298c3298 100644
@@ -1773,7 +1773,9 @@ int priv_spec_from_str(const char *priv_spec_str)
 {
     int priv_version = -1;
 
-    if (!g_strcmp0(priv_spec_str, PRIV_VER_1_12_0_STR)) {
+    if (!g_strcmp0(priv_spec_str, PRIV_VER_1_13_0_STR)) {
+        priv_version = PRIV_VERSION_1_13_0;
+    } else if (!g_strcmp0(priv_spec_str, PRIV_VER_1_12_0_STR)) {
         priv_version = PRIV_VERSION_1_12_0;
     } else if (!g_strcmp0(priv_spec_str, PRIV_VER_1_11_0_STR)) {
         priv_version = PRIV_VERSION_1_11_0;
@@ -1793,6 +1795,8 @@ const char *priv_spec_to_str(int priv_version)
         return PRIV_VER_1_11_0_STR;
     case PRIV_VERSION_1_12_0:
         return PRIV_VER_1_12_0_STR;
+    case PRIV_VERSION_1_13_0:
+        return PRIV_VER_1_13_0_STR;
     default:
         return NULL;
     }
target/riscv/cpu.h +3 -1
index 7696102697..776939b56b 100644
@@ -96,12 +96,14 @@ extern RISCVCPUProfile *riscv_profiles[];
 #define PRIV_VER_1_10_0_STR "v1.10.0"
 #define PRIV_VER_1_11_0_STR "v1.11.0"
 #define PRIV_VER_1_12_0_STR "v1.12.0"
+#define PRIV_VER_1_13_0_STR "v1.13.0"
 enum {
     PRIV_VERSION_1_10_0 = 0,
     PRIV_VERSION_1_11_0,
     PRIV_VERSION_1_12_0,
+    PRIV_VERSION_1_13_0,
 
-    PRIV_VERSION_LATEST = PRIV_VERSION_1_12_0,
+    PRIV_VERSION_LATEST = PRIV_VERSION_1_13_0,
 };
 
 #define VEXT_VERSION_1_00_0 0x00010000
target/riscv/cpu_cfg.h +1 -0
index e1e4f32698..fb7eebde52 100644
@@ -136,6 +136,7 @@ struct RISCVCPUConfig {
      * TCG always implement/can't be user disabled,
      * based on spec version.
      */
+    bool has_priv_1_13;
     bool has_priv_1_12;
     bool has_priv_1_11;
 
target/riscv/tcg/tcg-cpu.c +4 -0
index faa8de9b83..a9d188a9fd 100644
@@ -320,6 +320,10 @@ static void riscv_cpu_update_named_features(RISCVCPU *cpu)
         cpu->cfg.has_priv_1_12 = true;
     }
 
+    if (cpu->env.priv_ver >= PRIV_VERSION_1_13_0) {
+        cpu->cfg.has_priv_1_13 = true;
+    }
+
     /* zic64b is 1.12 or later */
     cpu->cfg.ext_zic64b = cpu->cfg.cbom_blocksize == 64 &&
                           cpu->cfg.cbop_blocksize == 64 &&
Signature · 1 line
2.34.1
Reviewed-by on v1 2/5
#6 lore raw

Re: [PATCH 2/5] target/riscv: Support the version for ss1p13

Quoted 10 lines · Fea.Wang

Add RISC-V privilege 1.13 support.

---
  target/riscv/cpu.c         | 6 +++++-
  target/riscv/cpu.h         | 4 +++-
  target/riscv/cpu_cfg.h     | 1 +
  target/riscv/tcg/tcg-cpu.c | 4 ++++
  4 files changed, 13 insertions(+), 2 deletions(-)

Weiwei Li

Quoted 72 lines
target/riscv/cpu.c +5 -1
index b6b48e5620..a6298c3298 100644
@@ -1773,7 +1773,9 @@ int priv_spec_from_str(const char *priv_spec_str)
  {
      int priv_version = -1;
 
-    if (!g_strcmp0(priv_spec_str, PRIV_VER_1_12_0_STR)) {
+    if (!g_strcmp0(priv_spec_str, PRIV_VER_1_13_0_STR)) {
+        priv_version = PRIV_VERSION_1_13_0;
+    } else if (!g_strcmp0(priv_spec_str, PRIV_VER_1_12_0_STR)) {
          priv_version = PRIV_VERSION_1_12_0;
      } else if (!g_strcmp0(priv_spec_str, PRIV_VER_1_11_0_STR)) {
          priv_version = PRIV_VERSION_1_11_0;
@@ -1793,6 +1795,8 @@ const char *priv_spec_to_str(int priv_version)
          return PRIV_VER_1_11_0_STR;
      case PRIV_VERSION_1_12_0:
          return PRIV_VER_1_12_0_STR;
+    case PRIV_VERSION_1_13_0:
+        return PRIV_VER_1_13_0_STR;
      default:
          return NULL;
      }
target/riscv/cpu.h +3 -1
index 7696102697..776939b56b 100644
@@ -96,12 +96,14 @@ extern RISCVCPUProfile *riscv_profiles[];
  #define PRIV_VER_1_10_0_STR "v1.10.0"
  #define PRIV_VER_1_11_0_STR "v1.11.0"
  #define PRIV_VER_1_12_0_STR "v1.12.0"
+#define PRIV_VER_1_13_0_STR "v1.13.0"
  enum {
      PRIV_VERSION_1_10_0 = 0,
      PRIV_VERSION_1_11_0,
      PRIV_VERSION_1_12_0,
+    PRIV_VERSION_1_13_0,
 
-    PRIV_VERSION_LATEST = PRIV_VERSION_1_12_0,
+    PRIV_VERSION_LATEST = PRIV_VERSION_1_13_0,
  };
 
  #define VEXT_VERSION_1_00_0 0x00010000
target/riscv/cpu_cfg.h +1 -0
index e1e4f32698..fb7eebde52 100644
@@ -136,6 +136,7 @@ struct RISCVCPUConfig {
       * TCG always implement/can't be user disabled,
       * based on spec version.
       */
+    bool has_priv_1_13;
      bool has_priv_1_12;
      bool has_priv_1_11;
 
target/riscv/tcg/tcg-cpu.c +4 -0
index faa8de9b83..a9d188a9fd 100644
@@ -320,6 +320,10 @@ static void riscv_cpu_update_named_features(RISCVCPU *cpu)
          cpu->cfg.has_priv_1_12 = true;
      }
 
+    if (cpu->env.priv_ver >= PRIV_VERSION_1_13_0) {
+        cpu->cfg.has_priv_1_13 = true;
+    }
+
      /* zic64b is 1.12 or later */
      cpu->cfg.ext_zic64b = cpu->cfg.cbom_blocksize == 64 &&
                            cpu->cfg.cbop_blocksize == 64 &&
Reviewed-by on v1 2/5
#7 lore raw

Re: [PATCH 2/5] target/riscv: Support the version for ss1p13

In reply to Fea.Wang
Quoted 4 lines · Fea.Wang

Add RISC-V privilege 1.13 support.

Zhiwei

Quoted 78 lines
---
  target/riscv/cpu.c         | 6 +++++-
  target/riscv/cpu.h         | 4 +++-
  target/riscv/cpu_cfg.h     | 1 +
  target/riscv/tcg/tcg-cpu.c | 4 ++++
  4 files changed, 13 insertions(+), 2 deletions(-)
target/riscv/cpu.c +5 -1
index b6b48e5620..a6298c3298 100644
@@ -1773,7 +1773,9 @@ int priv_spec_from_str(const char *priv_spec_str)
  {
      int priv_version = -1;
 
-    if (!g_strcmp0(priv_spec_str, PRIV_VER_1_12_0_STR)) {
+    if (!g_strcmp0(priv_spec_str, PRIV_VER_1_13_0_STR)) {
+        priv_version = PRIV_VERSION_1_13_0;
+    } else if (!g_strcmp0(priv_spec_str, PRIV_VER_1_12_0_STR)) {
          priv_version = PRIV_VERSION_1_12_0;
      } else if (!g_strcmp0(priv_spec_str, PRIV_VER_1_11_0_STR)) {
          priv_version = PRIV_VERSION_1_11_0;
@@ -1793,6 +1795,8 @@ const char *priv_spec_to_str(int priv_version)
          return PRIV_VER_1_11_0_STR;
      case PRIV_VERSION_1_12_0:
          return PRIV_VER_1_12_0_STR;
+    case PRIV_VERSION_1_13_0:
+        return PRIV_VER_1_13_0_STR;
      default:
          return NULL;
      }
target/riscv/cpu.h +3 -1
index 7696102697..776939b56b 100644
@@ -96,12 +96,14 @@ extern RISCVCPUProfile *riscv_profiles[];
  #define PRIV_VER_1_10_0_STR "v1.10.0"
  #define PRIV_VER_1_11_0_STR "v1.11.0"
  #define PRIV_VER_1_12_0_STR "v1.12.0"
+#define PRIV_VER_1_13_0_STR "v1.13.0"
  enum {
      PRIV_VERSION_1_10_0 = 0,
      PRIV_VERSION_1_11_0,
      PRIV_VERSION_1_12_0,
+    PRIV_VERSION_1_13_0,
 
-    PRIV_VERSION_LATEST = PRIV_VERSION_1_12_0,
+    PRIV_VERSION_LATEST = PRIV_VERSION_1_13_0,
  };
 
  #define VEXT_VERSION_1_00_0 0x00010000
target/riscv/cpu_cfg.h +1 -0
index e1e4f32698..fb7eebde52 100644
@@ -136,6 +136,7 @@ struct RISCVCPUConfig {
       * TCG always implement/can't be user disabled,
       * based on spec version.
       */
+    bool has_priv_1_13;
      bool has_priv_1_12;
      bool has_priv_1_11;
 
target/riscv/tcg/tcg-cpu.c +4 -0
index faa8de9b83..a9d188a9fd 100644
@@ -320,6 +320,10 @@ static void riscv_cpu_update_named_features(RISCVCPU *cpu)
          cpu->cfg.has_priv_1_12 = true;
      }
 
+    if (cpu->env.priv_ver >= PRIV_VERSION_1_13_0) {
+        cpu->cfg.has_priv_1_13 = true;
+    }
+
      /* zic64b is 1.12 or later */
      cpu->cfg.ext_zic64b = cpu->cfg.cbom_blocksize == 64 &&
                            cpu->cfg.cbop_blocksize == 64 &&
author
#8 lore raw

PATCH 3/5 target/riscv: Add 'P1P13' bit in SMSTATEEN0

In reply to Fea.Wang

Based on privilege 1.13 spec, there should be a bit56 for 'P1P13' in SMSTATEEN0 that controls access to the hedeleg.

---
 target/riscv/cpu_bits.h |  1 +
 target/riscv/csr.c      | 10 ++++++++++
 2 files changed, 11 insertions(+)
target/riscv/cpu_bits.h +1 -0
index 74318a925c..28bd3fb0b4 100644
@@ -315,6 +315,7 @@
 #define SMSTATEEN0_CS       (1ULL << 0)
 #define SMSTATEEN0_FCSR     (1ULL << 1)
 #define SMSTATEEN0_JVT      (1ULL << 2)
+#define SMSTATEEN0_P1P13    (1ULL << 56)
 #define SMSTATEEN0_HSCONTXT (1ULL << 57)
 #define SMSTATEEN0_IMSIC    (1ULL << 58)
 #define SMSTATEEN0_AIA      (1ULL << 59)
target/riscv/csr.c +10 -0
index 6b460ee0e8..d844ce770e 100644
@@ -2248,6 +2248,11 @@ static RISCVException write_mstateen0(CPURISCVState *env, int csrno,
         wr_mask |= SMSTATEEN0_FCSR;
     }
 
+    RISCVCPU *cpu = env_archcpu(env);
+    if (cpu->env.priv_ver >= PRIV_VERSION_1_13_0) {
+        wr_mask |= SMSTATEEN0_P1P13;
+    }
+
     return write_mstateen(env, csrno, wr_mask, new_val);
 }
 
@@ -2283,6 +2288,11 @@ static RISCVException write_mstateen0h(CPURISCVState *env, int csrno,
 {
     uint64_t wr_mask = SMSTATEEN_STATEEN | SMSTATEEN0_HSENVCFG;
 
+    RISCVCPU *cpu = env_archcpu(env);
+    if (cpu->env.priv_ver >= PRIV_VERSION_1_13_0) {
+            wr_mask |= SMSTATEEN0_P1P13;
+    }
+
     return write_mstateenh(env, csrno, wr_mask, new_val);
 }
 
Signature · 1 line
2.34.1
Reviewed-by on v1 3/5
#9 lore raw

Re: [PATCH 3/5] target/riscv: Add 'P1P13' bit in SMSTATEEN0

Quoted 9 lines · Fea.Wang

Based on privilege 1.13 spec, there should be a bit56 for 'P1P13' in SMSTATEEN0 that controls access to the hedeleg.

---
  target/riscv/cpu_bits.h |  1 +
  target/riscv/csr.c      | 10 ++++++++++
  2 files changed, 11 insertions(+)

Weiwei Li

Quoted 41 lines
target/riscv/cpu_bits.h +1 -0
index 74318a925c..28bd3fb0b4 100644
@@ -315,6 +315,7 @@
  #define SMSTATEEN0_CS       (1ULL << 0)
  #define SMSTATEEN0_FCSR     (1ULL << 1)
  #define SMSTATEEN0_JVT      (1ULL << 2)
+#define SMSTATEEN0_P1P13    (1ULL << 56)
  #define SMSTATEEN0_HSCONTXT (1ULL << 57)
  #define SMSTATEEN0_IMSIC    (1ULL << 58)
  #define SMSTATEEN0_AIA      (1ULL << 59)
target/riscv/csr.c +10 -0
index 6b460ee0e8..d844ce770e 100644
@@ -2248,6 +2248,11 @@ static RISCVException write_mstateen0(CPURISCVState *env, int csrno,
          wr_mask |= SMSTATEEN0_FCSR;
      }
 
+    RISCVCPU *cpu = env_archcpu(env);
+    if (cpu->env.priv_ver >= PRIV_VERSION_1_13_0) {
+        wr_mask |= SMSTATEEN0_P1P13;
+    }
+
      return write_mstateen(env, csrno, wr_mask, new_val);
  }
 
@@ -2283,6 +2288,11 @@ static RISCVException write_mstateen0h(CPURISCVState *env, int csrno,
  {
      uint64_t wr_mask = SMSTATEEN_STATEEN | SMSTATEEN0_HSENVCFG;
 
+    RISCVCPU *cpu = env_archcpu(env);
+    if (cpu->env.priv_ver >= PRIV_VERSION_1_13_0) {
+            wr_mask |= SMSTATEEN0_P1P13;
+    }
+
      return write_mstateenh(env, csrno, wr_mask, new_val);
  }
 
#10 lore raw

Re: [PATCH 3/5] target/riscv: Add 'P1P13' bit in SMSTATEEN0

In reply to Fea.Wang
Quoted 27 lines · Fea.Wang

Based on privilege 1.13 spec, there should be a bit56 for 'P1P13' in SMSTATEEN0 that controls access to the hedeleg.

---
  target/riscv/cpu_bits.h |  1 +
  target/riscv/csr.c      | 10 ++++++++++
  2 files changed, 11 insertions(+)
target/riscv/cpu_bits.h +1 -0
index 74318a925c..28bd3fb0b4 100644
@@ -315,6 +315,7 @@
  #define SMSTATEEN0_CS       (1ULL << 0)
  #define SMSTATEEN0_FCSR     (1ULL << 1)
  #define SMSTATEEN0_JVT      (1ULL << 2)
+#define SMSTATEEN0_P1P13    (1ULL << 56)
  #define SMSTATEEN0_HSCONTXT (1ULL << 57)
  #define SMSTATEEN0_IMSIC    (1ULL << 58)
  #define SMSTATEEN0_AIA      (1ULL << 59)
target/riscv/csr.c +0 -0
index 6b460ee0e8..d844ce770e 100644

target/riscv/csr.c static RISCVException write_mstateen0(CPURISCVState *env, int csrno, · line 2252

Quoted 5 lines
target/riscv/csr.c +2 -0
@@ -2248,6 +2248,11 @@ static RISCVException write_mstateen0(CPURISCVState *env, int csrno,
          wr_mask |= SMSTATEEN0_FCSR;
      }
 
+    RISCVCPU *cpu = env_archcpu(env);
+    if (cpu->env.priv_ver >= PRIV_VERSION_1_13_0) {

Why not use env directly?

target/riscv/csr.c static RISCVException write_mstateen0h(CPURISCVState *env, int csrno, · line 2292

Quoted 12 lines
target/riscv/csr.c +5 -0
+        wr_mask |= SMSTATEEN0_P1P13;
+    }
+
      return write_mstateen(env, csrno, wr_mask, new_val);
  }
 
@@ -2283,6 +2288,11 @@ static RISCVException write_mstateen0h(CPURISCVState *env, int csrno,
  {
      uint64_t wr_mask = SMSTATEEN_STATEEN | SMSTATEEN0_HSENVCFG;
 
+    RISCVCPU *cpu = env_archcpu(env);
+    if (cpu->env.priv_ver >= PRIV_VERSION_1_13_0) {

Same here.

target/riscv/csr.c static RISCVException write_mstateen0h(CPURISCVState *env, int csrno, · line 2293

Quoted 1 line
target/riscv/csr.c +1 -0
+            wr_mask |= SMSTATEEN0_P1P13;

Indent.

Zhiwei

Quoted 5 lines
target/riscv/csr.c +2 -0
+    }
+
      return write_mstateenh(env, csrno, wr_mask, new_val);
  }
 
author
#11 lore raw

Re: [PATCH 3/5] target/riscv: Add 'P1P13' bit in SMSTATEEN0

Thank you, I will correct it in the patch v2.

Sincerely,
Fea

LIU Zhiwei <[email protected]> 於 2024年5月13日 週一 上午10:51寫道:

Quoted 62 lines · Fea.Wang

target/riscv/csr.c static RISCVException

Quoted 27 lines

Based on privilege 1.13 spec, there should be a bit56 for 'P1P13' in SMSTATEEN0 that controls access to the hedeleg.

---
  target/riscv/cpu_bits.h |  1 +
  target/riscv/csr.c      | 10 ++++++++++
  2 files changed, 11 insertions(+)
target/riscv/cpu_bits.h +1 -0
index 74318a925c..28bd3fb0b4 100644
@@ -315,6 +315,7 @@
  #define SMSTATEEN0_CS       (1ULL << 0)
  #define SMSTATEEN0_FCSR     (1ULL << 1)
  #define SMSTATEEN0_JVT      (1ULL << 2)
+#define SMSTATEEN0_P1P13    (1ULL << 56)
  #define SMSTATEEN0_HSCONTXT (1ULL << 57)
  #define SMSTATEEN0_IMSIC    (1ULL << 58)
  #define SMSTATEEN0_AIA      (1ULL << 59)
target/riscv/csr.c +0 -0
index 6b460ee0e8..d844ce770e 100644
@@ -2248,6 +2248,11 @@ static RISCVException

write_mstateen0(CPURISCVState *env, int csrno,

target/riscv/csr.c static RISCVException write_mstateen0(CPURISCVState *env, int csrno, · line 2252

Quoted 5 lines
target/riscv/csr.c +2 -0
          wr_mask |= SMSTATEEN0_FCSR;
      }
 
+    RISCVCPU *cpu = env_archcpu(env);
+    if (cpu->env.priv_ver >= PRIV_VERSION_1_13_0) {

Why not use env directly?

target/riscv/csr.c static RISCVException

Quoted 7 lines
target/riscv/csr.c +3 -0
+        wr_mask |= SMSTATEEN0_P1P13;
+    }
+
      return write_mstateen(env, csrno, wr_mask, new_val);
  }
 
@@ -2283,6 +2288,11 @@ static RISCVException

write_mstateen0h(CPURISCVState *env, int csrno,

target/riscv/csr.c static RISCVException write_mstateen0h(CPURISCVState *env, int csrno, · line 2292

Quoted 5 lines
target/riscv/csr.c +2 -0
  {
      uint64_t wr_mask = SMSTATEEN_STATEEN | SMSTATEEN0_HSENVCFG;
 
+    RISCVCPU *cpu = env_archcpu(env);
+    if (cpu->env.priv_ver >= PRIV_VERSION_1_13_0) {

Same here.

target/riscv/csr.c static RISCVException · line 2293

Quoted 1 line
target/riscv/csr.c +1 -0
+            wr_mask |= SMSTATEEN0_P1P13;

Indent.

Zhiwei

Quoted 5 lines
target/riscv/csr.c +2 -0
+    }
+
      return write_mstateenh(env, csrno, wr_mask, new_val);
  }
 
author
#12 lore raw

PATCH 4/5 target/riscv: Add MEDELEGH, HEDELEGH csrs for RV32

In reply to Fea.Wang

Based on privileged spec 1.13, the RV32 needs to implement MEDELEGH and HEDELEGH for exception codes 32-47 for reserving and exception codes 48-63 for custom use. Add the CSR number though the implementation is just reading zero and writing ignore. Besides, for accessing HEDELEGH, it should be controlled by mstateen0 'P1P13' bit.

---
 target/riscv/cpu_bits.h |  2 ++
 target/riscv/csr.c      | 31 +++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)
target/riscv/cpu_bits.h +2 -0
index 28bd3fb0b4..f888025c59 100644
@@ -156,6 +156,8 @@
 
 /* 32-bit only */
 #define CSR_MSTATUSH        0x310
+#define CSR_MEDELEGH        0x312
+#define CSR_HEDELEGH        0x612
 
 /* Machine Trap Handling */
 #define CSR_MSCRATCH        0x340
target/riscv/csr.c +31 -0
index d844ce770e..4d7313f456 100644
@@ -3227,6 +3227,33 @@ static RISCVException write_hedeleg(CPURISCVState *env, int csrno,
     return RISCV_EXCP_NONE;
 }
 
+static RISCVException read_hedelegh(CPURISCVState *env, int csrno,
+                                   target_ulong *val)
+{
+    RISCVException ret;
+    ret = smstateen_acc_ok(env, 0, SMSTATEEN0_P1P13);
+    if (ret != RISCV_EXCP_NONE) {
+        return ret;
+    }
+
+    /* Reserved, now read zero */
+    *val = 0;
+    return RISCV_EXCP_NONE;
+}
+
+static RISCVException write_hedelegh(CPURISCVState *env, int csrno,
+                                    target_ulong val)
+{
+    RISCVException ret;
+    ret = smstateen_acc_ok(env, 0, SMSTATEEN0_P1P13);
+    if (ret != RISCV_EXCP_NONE) {
+        return ret;
+    }
+
+    /* Reserved, now write ignore */
+    return RISCV_EXCP_NONE;
+}
+
 static RISCVException rmw_hvien64(CPURISCVState *env, int csrno,
                                     uint64_t *ret_val,
                                     uint64_t new_val, uint64_t wr_mask)
@@ -4674,6 +4701,10 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = {
 
     [CSR_MSTATUSH]    = { "mstatush",   any32, read_mstatush,
                           write_mstatush                                   },
+    [CSR_MEDELEGH]    = { "medelegh",   any32, read_zero, write_ignore,
+                          .min_priv_ver = PRIV_VERSION_1_13_0              },
+    [CSR_HEDELEGH]    = { "hedelegh",   any32, read_hedelegh, write_hedelegh,
+                          .min_priv_ver = PRIV_VERSION_1_13_0              },
 
     /* Machine Trap Handling */
     [CSR_MSCRATCH] = { "mscratch", any,  read_mscratch, write_mscratch,
Signature · 1 line
2.34.1
Reviewed-by on v1 4/5
#13 lore raw

Re: [PATCH 4/5] target/riscv: Add MEDELEGH, HEDELEGH csrs for RV32

Quoted 65 lines · Fea.Wang

Based on privileged spec 1.13, the RV32 needs to implement MEDELEGH and HEDELEGH for exception codes 32-47 for reserving and exception codes 48-63 for custom use. Add the CSR number though the implementation is just reading zero and writing ignore. Besides, for accessing HEDELEGH, it should be controlled by mstateen0 'P1P13' bit.

---
  target/riscv/cpu_bits.h |  2 ++
  target/riscv/csr.c      | 31 +++++++++++++++++++++++++++++++
  2 files changed, 33 insertions(+)
target/riscv/cpu_bits.h +2 -0
index 28bd3fb0b4..f888025c59 100644
@@ -156,6 +156,8 @@
 
  /* 32-bit only */
  #define CSR_MSTATUSH        0x310
+#define CSR_MEDELEGH        0x312
+#define CSR_HEDELEGH        0x612
 
  /* Machine Trap Handling */
  #define CSR_MSCRATCH        0x340
target/riscv/csr.c +27 -0
index d844ce770e..4d7313f456 100644
@@ -3227,6 +3227,33 @@ static RISCVException write_hedeleg(CPURISCVState *env, int csrno,
      return RISCV_EXCP_NONE;
  }
 
+static RISCVException read_hedelegh(CPURISCVState *env, int csrno,
+                                   target_ulong *val)
+{
+    RISCVException ret;
+    ret = smstateen_acc_ok(env, 0, SMSTATEEN0_P1P13);
+    if (ret != RISCV_EXCP_NONE) {
+        return ret;
+    }
+
+    /* Reserved, now read zero */
+    *val = 0;
+    return RISCV_EXCP_NONE;
+}
+
+static RISCVException write_hedelegh(CPURISCVState *env, int csrno,
+                                    target_ulong val)
+{
+    RISCVException ret;
+    ret = smstateen_acc_ok(env, 0, SMSTATEEN0_P1P13);
+    if (ret != RISCV_EXCP_NONE) {
+        return ret;
+    }
+
+    /* Reserved, now write ignore */
+    return RISCV_EXCP_NONE;
+}
+
  static RISCVException rmw_hvien64(CPURISCVState *env, int csrno,
                                      uint64_t *ret_val,
                                      uint64_t new_val, uint64_t wr_mask)

target/riscv/csr.c riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { · line 4706

Quoted 6 lines
target/riscv/csr.c +3 -0
@@ -4674,6 +4701,10 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = {
 
      [CSR_MSTATUSH]    = { "mstatush",   any32, read_mstatush,
                            write_mstatush                                   },
+    [CSR_MEDELEGH]    = { "medelegh",   any32, read_zero, write_ignore,
+                          .min_priv_ver = PRIV_VERSION_1_13_0              },
+    [CSR_HEDELEGH]    = { "hedelegh",   any32, read_hedelegh, write_hedelegh,

Using hmode32 instead of any32.

Otherwise,

Quoted 4 lines
target/riscv/csr.c +1 -0
+                          .min_priv_ver = PRIV_VERSION_1_13_0              },
 
      /* Machine Trap Handling */
      [CSR_MSCRATCH] = { "mscratch", any,  read_mscratch, write_mscratch,
author
#14 lore raw

Re: [PATCH 4/5] target/riscv: Add MEDELEGH, HEDELEGH csrs for RV32

OK, I will correct it in the patch v2. Thank you.

Sincerely,
Fea

LIU Zhiwei <[email protected]> 於 2024年5月13日 週一 上午10:49寫道:

Quoted 90 lines · Fea.Wang

target/riscv/csr.c static RISCVException write_hedeleg(CPURISCVState

Quoted 31 lines

Based on privileged spec 1.13, the RV32 needs to implement MEDELEGH and HEDELEGH for exception codes 32-47 for reserving and exception codes 48-63 for custom use. Add the CSR number though the implementation is just reading zero and writing ignore. Besides, for accessing HEDELEGH, it should be controlled by mstateen0 'P1P13' bit.

---
  target/riscv/cpu_bits.h |  2 ++
  target/riscv/csr.c      | 31 +++++++++++++++++++++++++++++++
  2 files changed, 33 insertions(+)
target/riscv/cpu_bits.h +2 -0
index 28bd3fb0b4..f888025c59 100644
@@ -156,6 +156,8 @@
 
  /* 32-bit only */
  #define CSR_MSTATUSH        0x310
+#define CSR_MEDELEGH        0x312
+#define CSR_HEDELEGH        0x612
 
  /* Machine Trap Handling */
  #define CSR_MSCRATCH        0x340
target/riscv/csr.c +0 -0
index d844ce770e..4d7313f456 100644
@@ -3227,6 +3227,33 @@ static RISCVException write_hedeleg(CPURISCVState

*env, int csrno,

Quoted 34 lines
target/riscv/csr.c +27 -0
      return RISCV_EXCP_NONE;
  }
 
+static RISCVException read_hedelegh(CPURISCVState *env, int csrno,
+                                   target_ulong *val)
+{
+    RISCVException ret;
+    ret = smstateen_acc_ok(env, 0, SMSTATEEN0_P1P13);
+    if (ret != RISCV_EXCP_NONE) {
+        return ret;
+    }
+
+    /* Reserved, now read zero */
+    *val = 0;
+    return RISCV_EXCP_NONE;
+}
+
+static RISCVException write_hedelegh(CPURISCVState *env, int csrno,
+                                    target_ulong val)
+{
+    RISCVException ret;
+    ret = smstateen_acc_ok(env, 0, SMSTATEEN0_P1P13);
+    if (ret != RISCV_EXCP_NONE) {
+        return ret;
+    }
+
+    /* Reserved, now write ignore */
+    return RISCV_EXCP_NONE;
+}
+
  static RISCVException rmw_hvien64(CPURISCVState *env, int csrno,
                                      uint64_t *ret_val,
                                      uint64_t new_val, uint64_t wr_mask)

target/riscv/csr.c riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { · line 4703

Quoted 3 lines
target/riscv/csr.c +0 -0
@@ -4674,6 +4701,10 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = {
 
      [CSR_MSTATUSH]    = { "mstatush",   any32, read_mstatush,
                            write_mstatush
     },

target/riscv/csr.c riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { · line 4705

Quoted 2 lines
target/riscv/csr.c +2 -0
+    [CSR_MEDELEGH]    = { "medelegh",   any32, read_zero, write_ignore,
+                          .min_priv_ver = PRIV_VERSION_1_13_0
    },

target/riscv/csr.c riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { · line 4706

Quoted 1 line
target/riscv/csr.c +1 -0
+    [CSR_HEDELEGH]    = { "hedelegh",   any32, read_hedelegh,

write_hedelegh,

Using hmode32 instead of any32.

Otherwise,

target/riscv/csr.c riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { · line 4707

Quoted 1 line
target/riscv/csr.c +1 -0
+                          .min_priv_ver = PRIV_VERSION_1_13_0
    },
Quoted 3 lines
target/riscv/csr.c +0 -0
      /* Machine Trap Handling */
      [CSR_MSCRATCH] = { "mscratch", any,  read_mscratch, write_mscratch,
author
#15 lore raw

PATCH 5/5 target/riscv: Reserve exception codes for sw-check and hw-err

In reply to Fea.Wang

Based on the priv-1.13.0, add the exception codes for Software-check and Hardware-error.

---
 target/riscv/cpu_bits.h | 2 ++
 1 file changed, 2 insertions(+)
target/riscv/cpu_bits.h +2 -0
index f888025c59..f037f727d9 100644
@@ -673,6 +673,8 @@ typedef enum RISCVException {
     RISCV_EXCP_INST_PAGE_FAULT = 0xc, /* since: priv-1.10.0 */
     RISCV_EXCP_LOAD_PAGE_FAULT = 0xd, /* since: priv-1.10.0 */
     RISCV_EXCP_STORE_PAGE_FAULT = 0xf, /* since: priv-1.10.0 */
+    RISCV_EXCP_SW_CHECK = 0x12, /* since: priv-1.13.0 */
+    RISCV_EXCP_HW_ERR = 0x13, /* since: priv-1.13.0 */
     RISCV_EXCP_INST_GUEST_PAGE_FAULT = 0x14,
     RISCV_EXCP_LOAD_GUEST_ACCESS_FAULT = 0x15,
     RISCV_EXCP_VIRT_INSTRUCTION_FAULT = 0x16,
Signature · 1 line
2.34.1
Reviewed-by on v1 5/5
#16 lore raw

Re: [PATCH 5/5] target/riscv: Reserve exception codes for sw-check and hw-err

Quoted 14 lines · Fea.Wang

Based on the priv-1.13.0, add the exception codes for Software-check and Hardware-error.

---
  target/riscv/cpu_bits.h | 2 ++
  1 file changed, 2 insertions(+)
target/riscv/cpu_bits.h +0 -0
index f888025c59..f037f727d9 100644

target/riscv/cpu_bits.h typedef enum RISCVException { · line 677

Quoted 5 lines
target/riscv/cpu_bits.h +2 -0
@@ -673,6 +673,8 @@ typedef enum RISCVException {
      RISCV_EXCP_INST_PAGE_FAULT = 0xc, /* since: priv-1.10.0 */
      RISCV_EXCP_LOAD_PAGE_FAULT = 0xd, /* since: priv-1.10.0 */
      RISCV_EXCP_STORE_PAGE_FAULT = 0xf, /* since: priv-1.10.0 */
+    RISCV_EXCP_SW_CHECK = 0x12, /* since: priv-1.13.0 */
+    RISCV_EXCP_HW_ERR = 0x13, /* since: priv-1.13.0 */

Zhiwei

Quoted 3 lines
target/riscv/cpu_bits.h +0 -0
      RISCV_EXCP_INST_GUEST_PAGE_FAULT = 0x14,
      RISCV_EXCP_LOAD_GUEST_ACCESS_FAULT = 0x15,
      RISCV_EXCP_VIRT_INSTRUCTION_FAULT = 0x16,