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

tilelink2 ToAXI4: must create irrevocable D for now

Browse Source
This commit is contained in:
Wesley W. Terpstra 2016-10-12 14:13:26 -07:00
parent 8e92ac32b7
commit 673cf1fdb5
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/scala/uncore/tilelink2/ToAXI4.scala
View File

@ -217,9 +217,12 @@ class TLToAXI4(idBits: Int, combinational: Boolean = true) extends LazyModule
// Give R higher priority than B // Give R higher priority than B
val r_wins = out.r.valid || r_holds_d val r_wins = out.r.valid || r_holds_d
out.r.ready := in.d.ready val in_d = Wire(in.d)
out_b.ready := in.d.ready && !r_wins in.d <> Queue.irrevocable(in_d, entries=1, flow=combinational)
in.d.valid := Mux(r_wins, out.r.valid, out_b.valid)
out.r.ready := in_d.ready
out_b.ready := in_d.ready && !r_wins
in_d.valid := Mux(r_wins, out.r.valid, out_b.valid)
val r_error = out.r.bits.resp =/= AXI4Parameters.RESP_OKAY val r_error = out.r.bits.resp =/= AXI4Parameters.RESP_OKAY
val b_error = out_b.bits.resp =/= AXI4Parameters.RESP_OKAY val b_error = out_b.bits.resp =/= AXI4Parameters.RESP_OKAY
@ -227,8 +230,8 @@ class TLToAXI4(idBits: Int, combinational: Boolean = true) extends LazyModule
val r_d = edgeIn.AccessAck(r_addr_lo, r_sink, r_source, r_size, UInt(0), r_error) val r_d = edgeIn.AccessAck(r_addr_lo, r_sink, r_source, r_size, UInt(0), r_error)
val b_d = edgeIn.AccessAck(b_addr_lo, b_sink, b_source, b_size, b_error) val b_d = edgeIn.AccessAck(b_addr_lo, b_sink, b_source, b_size, b_error)
in.d.bits := Mux(r_wins, r_d, b_d) in_d.bits := Mux(r_wins, r_d, b_d)
in.d.bits.data := out.r.bits.data // avoid a costly Mux in_d.bits.data := out.r.bits.data // avoid a costly Mux
// Tie off unused channels // Tie off unused channels
in.b.valid := Bool(false) in.b.valid := Bool(false)