From 9f8e3d8879fd6fdd4caf2ed7ee60e6579f70311b Mon Sep 17 00:00:00 2001 From: Henry Cook Date: Wed, 11 Oct 2017 12:45:36 -0700 Subject: [PATCH] tilelink: BusBypass can be sent to DeadlockDevice --- src/main/scala/devices/tilelink/BusBypass.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/scala/devices/tilelink/BusBypass.scala b/src/main/scala/devices/tilelink/BusBypass.scala index 4621074c..38c378a3 100644 --- a/src/main/scala/devices/tilelink/BusBypass.scala +++ b/src/main/scala/devices/tilelink/BusBypass.scala @@ -10,7 +10,7 @@ import freechips.rocketchip.tilelink._ import freechips.rocketchip.util._ import scala.math.min -abstract class TLBusBypassBase(beatBytes: Int)(implicit p: Parameters) extends LazyModule +abstract class TLBusBypassBase(beatBytes: Int, deadlock: Boolean = false)(implicit p: Parameters) extends LazyModule { protected val nodeIn = TLIdentityNode() protected val nodeOut = TLIdentityNode() @@ -18,7 +18,8 @@ abstract class TLBusBypassBase(beatBytes: Int)(implicit p: Parameters) extends L protected val bar = LazyModule(new TLBusBypassBar) protected val everything = Seq(AddressSet(0, BigInt("ffffffffffffffffffffffffffffffff", 16))) // 128-bit - protected val error = LazyModule(new TLError(ErrorParams(everything), beatBytes)) + protected val error = if (deadlock) LazyModule(new DeadlockDevice(ErrorParams(everything), beatBytes)) + else LazyModule(new TLError(ErrorParams(everything), beatBytes)) // order matters bar.node := nodeIn