1
0

put locking arbiter back into converter

This commit is contained in:
Howard Mao 2016-07-07 18:57:38 -07:00
parent a50ba39ea7
commit 8aa73915a1

View File

@ -212,7 +212,8 @@ class NastiIOTileLinkIOConverter(implicit p: Parameters) extends TLModule()(p)
// Aggregate incoming NASTI responses into TL Grants // Aggregate incoming NASTI responses into TL Grants
val (tl_cnt_in, tl_wrap_in) = Counter( val (tl_cnt_in, tl_wrap_in) = Counter(
io.tl.grant.fire() && io.tl.grant.bits.hasMultibeatData(), tlDataBeats) io.tl.grant.fire() && io.tl.grant.bits.hasMultibeatData(), tlDataBeats)
val gnt_arb = Module(new Arbiter(new GrantToDst, 2)) val gnt_arb = Module(new LockingArbiter(new GrantToDst, 2,
tlDataBeats, Some((gnt: GrantToDst) => gnt.hasMultibeatData())))
io.tl.grant <> gnt_arb.io.out io.tl.grant <> gnt_arb.io.out
gnt_arb.io.in(0).valid := io.nasti.r.valid gnt_arb.io.in(0).valid := io.nasti.r.valid