Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move beu interrupt crossing source register into Tile #2623

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/main/scala/tile/BaseTile.scala
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ trait HasNonDiplomaticTileParameters {
// Core PTW DTIM coprocessors
def dcacheArbPorts = 1 + usingVM.toInt + usingDataScratchpad.toInt + p(BuildRoCC).size + tileParams.core.useVector.toInt

def intOutwardNodeAlreadyRegistered: Boolean = false

// TODO merge with isaString in CSR.scala
def isaDTS: String = {
val ie = if (tileParams.core.useRVE) "e" else "i"
Expand Down
13 changes: 12 additions & 1 deletion src/main/scala/tile/RocketTile.scala
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ class RocketTile private(
this(params, crossing.crossingType, lookup, p)

val intOutwardNode = IntIdentityNode()
override def intOutwardNodeAlreadyRegistered: Boolean = true
val slaveNode = TLIdentityNode()
val masterNode = visibilityNode

Expand All @@ -63,11 +64,16 @@ class RocketTile private(

val bus_error_unit = rocketParams.beuAddr map { a =>
val beu = LazyModule(new BusErrorUnit(new L1BusErrors, BusErrorUnitParams(a), logicalTreeNode))
intOutwardNode := beu.intNode
connectTLSlave(beu.node, xBytes)
beu
}

val beuIntNode = bus_error_unit.map { beu =>
val node = IntAdapterNode()
intOutwardNode := node := beu.intNode
node
}

val tile_master_blocker =
tileParams.blockerCtrlAddr
.map(BasicBusBlockerParams(_, xBytes, masterPortBeatBytes, deadlock = true))
Expand Down Expand Up @@ -162,6 +168,11 @@ class RocketTileModuleImp(outer: RocketTile) extends BaseTileModuleImp(outer)
core.io.interrupts.buserror.get := beu.module.io.interrupt
beu.module.io.errors.dcache := outer.dcache.module.io.errors
beu.module.io.errors.icache := outer.frontend.module.io.errors

// register beu interrupt with rawReset async reset flop
val (int_in, _) = outer.beuIntNode.get.in(0)
val (int_out, _) = outer.beuIntNode.get.out(0)
int_out(0) := withReset(outer.rawReset.asAsyncReset)(RegNext(int_in(0), false.B))
}

// Pass through various external constants and reports that were bundle-bridged into the tile
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/tile/TilePRCIDomain.scala
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ abstract class TilePRCIDomain[T <: BaseTile](id: Int)(implicit p: Parameters)
/** External code looking to connect and clock-cross the interrupts raised by devices inside this tile can call this. */
def crossIntOut(crossing: ClockCrossingType): IntOutwardNode = {
val intOutXing = this.crossOut(tile.intOutwardNode)
intOutXing(crossing)
intOutXing(crossing, tile.intOutwardNodeAlreadyRegistered)
}

/** External code looking to connect the ports where this tile is slaved to an interconnect
Expand Down