Skip to content

Commit

Permalink
Merge pull request #2314 from chipsalliance/mwachs5-patch-2
Browse files Browse the repository at this point in the history
APBToTL: Qualify address alignment assertion
  • Loading branch information
mwachs5 authored Mar 2, 2020
2 parents bbeb257 + f524598 commit 6d52981
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/main/scala/amba/apb/ToTL.scala
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,9 @@ class APBToTL()(implicit p: Parameters) extends LazyModule
out.a.bits.source := UInt(0)
// TL requires addresses be aligned to their size.
out.a.bits.address := aligned_addr
assert(in.paddr === out.a.bits.address, "Do not expect to have to perform alignment in APB2TL Conversion")
when (out.a.fire()) {
assert(in.paddr === out.a.bits.address, "Do not expect to have to perform alignment in APB2TL Conversion")
}
out.a.bits.data := in.pwdata
out.a.bits.mask := Mux(in.pwrite, in.pstrb, ~0.U(beatBytes.W))
out.a.bits.corrupt := Bool(false)
Expand Down

0 comments on commit 6d52981

Please sign in to comment.