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

axi4 ToTL: fix decode error arbitration (#417)

Browse Source 
When selecting between error generation on R and real data on R,
correctly calculate the R backpressure.

This bug manifests when a valid request is immediately followed by
an invalid request, wedging the R channel.
This commit is contained in:
Wesley W. Terpstra 2016-10-24 22:15:19 -07:00 committed by GitHub
parent 4c815f7958
commit a5ac106bb8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/uncore/axi4/ToTL.scala
View File

@ -130,8 +130,8 @@ class AXI4ToTL extends LazyModule
// Prioritize err over ok (b/c err_r.valid comes from a register) // Prioritize err over ok (b/c err_r.valid comes from a register)
mux_r.valid := (!mux_lock_err && ok_r.valid) || (!mux_lock_ok && err_r.valid) mux_r.valid := (!mux_lock_err && ok_r.valid) || (!mux_lock_ok && err_r.valid)
mux_r.bits := Mux(!mux_lock_ok && err_r.valid, err_r.bits, ok_r.bits) mux_r.bits := Mux(!mux_lock_ok && err_r.valid, err_r.bits, ok_r.bits)
ok_r.ready := !mux_lock_err && mux_r.ready && !err_r.valid ok_r.ready := mux_r.ready && (mux_lock_ok || !err_r.valid)
err_r.ready := !mux_lock_ok && mux_r.ready err_r.ready := mux_r.ready && !mux_lock_ok
// AXI4 needs irrevocable behaviour // AXI4 needs irrevocable behaviour
in.r <> Queue.irrevocable(mux_r, 1, flow=true) in.r <> Queue.irrevocable(mux_r, 1, flow=true)