diff --git a/src/main/scala/tile/RocketTile.scala b/src/main/scala/tile/RocketTile.scala index 81e16b63..79b565bf 100644 --- a/src/main/scala/tile/RocketTile.scala +++ b/src/main/scala/tile/RocketTile.scala @@ -105,8 +105,6 @@ class RocketTileModuleImp(outer: RocketTile) extends BaseTileModuleImp(outer) val uncorrectable = RegInit(Bool(false)) val halt_and_catch_fire = outer.rocketParams.hcfOnUncorrectable.option(IO(Bool(OUTPUT))) - outer.dtim_adapter.foreach { lm => dcachePorts += lm.module.io.dmem } - outer.bus_error_unit.foreach { lm => lm.module.io.errors.dcache := outer.dcache.module.io.errors lm.module.io.errors.icache := outer.frontend.module.io.errors @@ -130,6 +128,9 @@ class RocketTileModuleImp(outer: RocketTile) extends BaseTileModuleImp(outer) core.io.rocc.busy := roccCore.busy core.io.rocc.interrupt := roccCore.interrupt + // Rocket has higher priority to DTIM than other TileLink clients + outer.dtim_adapter.foreach { lm => dcachePorts += lm.module.io.dmem } + when(!uncorrectable) { uncorrectable := List(outer.frontend.module.io.errors, outer.dcache.module.io.errors) .flatMap { e => e.uncorrectable.map(_.valid) }