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

debug: Make DMI NOPs really NOPs.

Browse Source 
This simplifies SW design and CDC issues.
This commit is contained in:
Megan Wachs
2017-04-19 13:17:22 -07:00
parent 67404a665b
commit 0c013a56c0
2 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1097,19 +1097,13 @@ class DMIToTL(implicit p: Parameters) extends LazyModule {
val (_, gbits) = edge.Get(src, addr, size)
val (_, pfbits) = edge.Put(src, addr, size, io.dmi.req.bits.data)
// Note we force DMI NOPs to go to CONTROL register because
// Inner may be in reset / not have a clock,
// so we force address to be the one that goes to Outer.
// Besides, for a NOP we don't really need to pay the penalty to go
// across the CDC.
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
when (io.dmi.req.fire()) {
assert (io.dmi.req.bits.op === DMIConsts.dmi_OP_WRITE || io.dmi.req.bits.op === DMIConsts.dmi_OP_READ,
"Invalid DMI Request Type.");
}
tl.a.bits := Mux(io.dmi.req.bits.op === DMIConsts.dmi_OP_WRITE, pfbits, gbits);
tl.a.valid := io.dmi.req.valid
io.dmi.req.ready := tl.a.ready