Merge pull request #3625 from chipsalliance/ptw_gf

PTW: traverse check GPA bits higher than HGATP mode only if valid
chipsalliance · Apr 23, 2024 · 0c510ec · 0c510ec
2 parents d8de943 + 1a7a96c
commit 0c510ec
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/scala/rocket/PTW.scala b/src/main/scala/rocket/PTW.scala
@@ -695,7 +695,7 @@ class PTW(n: Int)(implicit edge: TLEdgeOut, p: Parameters) extends CoreModule()(
       when (do_both_stages && !stage2) { do_switch := true.B }
       count := count + 1.U
     }.otherwise {
-      val gf = stage2 && !stage2_final && !pte.ur()
+      val gf = (stage2 && !stage2_final && !pte.ur()) || (pte.v && pte.reserved_for_future === 0.U && invalid_gpa)
       val ae = pte.v && invalid_paddr
       val pf = pte.v && pte.reserved_for_future =/= 0.U
       val success = pte.v && !ae && !pf && !gf