satp/vsatp/hgatp.MODE should reset to legal value (off)

chipsalliance · Dec 23, 2021 · 1714680 · 1714680
1 parent 0299687
commit 1714680
Showing 1 changed file with 23 additions and 3 deletions.
diff --git a/src/main/scala/rocket/CSR.scala b/src/main/scala/rocket/CSR.scala
@@ -1436,10 +1436,30 @@ class CSRFile(
     }
   }
 
-  reg_satp.asid := 0
+  when(reset.asBool) {
+    reg_satp.mode  := 0.U
+    reg_vsatp.mode := 0.U
+    reg_hgatp.mode := 0.U
+  }
   if (!usingVM) {
-    reg_satp.mode := 0
-    reg_satp.ppn := 0
+    reg_satp.mode := 0.U
+    reg_satp.ppn  := 0.U
+    reg_satp.asid := 0.U
+  }
+  if (!usingHypervisor) {
+    reg_vsatp.mode := 0.U
+    reg_vsatp.ppn  := 0.U
+    reg_vsatp.asid := 0.U
+    reg_hgatp.mode := 0.U
+    reg_hgatp.ppn  := 0.U
+    reg_hgatp.asid := 0.U
+  }
+  if (!(asIdBits > 0)) {
+    reg_satp.asid  := 0.U
+    reg_vsatp.asid := 0.U
+  }
+  if (!(vmIdBits > 0)) {
+    reg_hgatp.asid := 0.U
   }
 
   if (nBreakpoints <= 1) reg_tselect := 0