riscv/rocket-chip
1
0
Fork 0
Code Releases Activity

debug: Debug Module needs to handle DMI NOPs even if DTM won't send them.

Browse Source
This commit is contained in:
Megan Wachs 2017-04-20 09:18:39 -07:00
parent cc7f0a5b7a
commit 9002e7e532
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/scala/uncore/devices/debug/Debug.scala
View File

@ -1097,12 +1097,18 @@ class DMIToTL(implicit p: Parameters) extends LazyModule {
val (_, gbits) = edge.Get(src, addr, size) val (_, gbits) = edge.Get(src, addr, size)
val (_, pfbits) = edge.Put(src, addr, size, io.dmi.req.bits.data) val (_, pfbits) = edge.Put(src, addr, size, io.dmi.req.bits.data)
when (io.dmi.req.fire()) { // We force DMI NOPs to go to CONTROL register because
assert (io.dmi.req.bits.op === DMIConsts.dmi_OP_WRITE || io.dmi.req.bits.op === DMIConsts.dmi_OP_READ, // Inner may be in reset / not have a clock,
"Invalid DMI Request Type."); // so we force address to be the one that goes to Outer.
} // Therefore for a NOP we don't really need to pay the penalty to go
// across the CDC.
tl.a.bits := Mux(io.dmi.req.bits.op === DMIConsts.dmi_OP_WRITE, pfbits, gbits); val (_, nbits) = edge.Put(src, toAddress = (DMI_RegAddrs.DMI_DMCONTROL << 2).U, size, data=0.U, mask = 0.U)
when (io.dmi.req.bits.op === DMIConsts.dmi_OP_WRITE) { tl.a.bits := pfbits
}.elsewhen (io.dmi.req.bits.op === DMIConsts.dmi_OP_READ) { tl.a.bits := gbits
}.otherwise { tl.a.bits := nbits
}
tl.a.valid := io.dmi.req.valid tl.a.valid := io.dmi.req.valid
io.dmi.req.ready := tl.a.ready io.dmi.req.ready := tl.a.ready