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

make sure Nasti write channel id is set correctly

Browse Source
This commit is contained in:
Howard Mao 2016-07-07 12:14:02 -07:00
parent 8ccc50a8f0
commit 1c5e7be75b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
uncore/src/main/scala/converters/Nasti.scala
View File

@ -166,6 +166,7 @@ class NastiIOTileLinkIOConverter(implicit p: Parameters) extends TLModule()(p)
get_id_ready) get_id_ready)
val w_inflight = Reg(init = Bool(false)) val w_inflight = Reg(init = Bool(false))
val w_id = Reg(init = UInt(0, nastiXIdBits))
// For Put/PutBlock, make sure aw and w channel are both ready before // For Put/PutBlock, make sure aw and w channel are both ready before
// we send the first beat // we send the first beat
@ -233,7 +234,7 @@ class NastiIOTileLinkIOConverter(implicit p: Parameters) extends TLModule()(p)
put_buffer.io.in.w.valid := put_helper.fire(put_buffer.io.in.w.ready) put_buffer.io.in.w.valid := put_helper.fire(put_buffer.io.in.w.ready)
put_buffer.io.in.w.bits := NastiWriteDataChannel( put_buffer.io.in.w.bits := NastiWriteDataChannel(
id = put_id_mapper.io.req.out_id, id = w_id,
data = io.tl.acquire.bits.data, data = io.tl.acquire.bits.data,
strb = Some(io.tl.acquire.bits.wmask()), strb = Some(io.tl.acquire.bits.wmask()),
last = Mux(w_inflight, last = Mux(w_inflight,
@ -245,6 +246,7 @@ class NastiIOTileLinkIOConverter(implicit p: Parameters) extends TLModule()(p)
when (!w_inflight && io.tl.acquire.fire() && is_multibeat) { when (!w_inflight && io.tl.acquire.fire() && is_multibeat) {
w_inflight := Bool(true) w_inflight := Bool(true)
w_id := put_id_mapper.io.req.out_id
} }
when (w_inflight) { when (w_inflight) {