Make support for menvcfg.CBIE == 01 optional (#191)

* Make support for menvcfg.CBIE == 01 optional * Added new parameter to generic_rv64 params.yaml * Fix typo
riscv-software-src · Oct 25, 2024 · a5dce13 · a5dce13
1 parent 1227ca2
commit a5dce13
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/arch/csr/menvcfg.yaml b/arch/csr/menvcfg.yaml
@@ -246,7 +246,9 @@ menvcfg:
       definedBy: Zicbom
       type: RW-R
       sw_write(csr_value): |
-        if (csr_value.CBIE == 0 || csr_value.CBIE == 1 || csr_value.CBIE == 3) {
+        if ((csr_value.CBIE == 0) ||
+            (ALLOW_CBO_INVAL_UPGRADE_TO_FLUSH && (csr_value.CBIE == 1)) ||
+            (csr_value.CBIE == 3)) {
           return csr_value.CBIE;
         } else {
           return CSR[menvcfg].CBIE;

diff --git a/arch/ext/Zicbom.yaml b/arch/ext/Zicbom.yaml
@@ -14,4 +14,13 @@ Zicbom:
         The observable size of a cache block, in bytes
       also_defined_in: [Zicboz, Zicbop]
       schema:
-        type: integer
+        type: integer
+    ALLOW_CBO_INVAL_UPGRADE_TO_FLUSH:
+      description: |
+        When true, an implementation can (when `menvcfg.CBIE` == `01`) upgrade a `cbo.inval`
+        instruction to a `cbo.flush`.
+
+        When false, an implementation does not support the upgrade, and the value '01' cannot be
+        written to `menvcfg.CBIE`.
+      schema:
+        type: boolean
diff --git a/cfgs/generic_rv64/params.yaml b/cfgs/generic_rv64/params.yaml
@@ -514,3 +514,4 @@ params:
   MSTATUS_FS_WRITEABLE: true
   MSTATUS_TVM_IMPLEMENTED: true
   HW_MSTATUS_FS_DIRTY_UPDATE: precise
+  ALLOW_CBO_INVAL_UPGRADE_TO_FLUSH: true