From f524598d511c36d4c6711631ec1dc73b1cdbf04c Mon Sep 17 00:00:00 2001 From: Megan Wachs Date: Sun, 1 Mar 2020 12:12:07 -0800 Subject: [PATCH] APBToTL: Qualify address alignment assertion --- src/main/scala/amba/apb/ToTL.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/scala/amba/apb/ToTL.scala b/src/main/scala/amba/apb/ToTL.scala index b293568b9e..b0f4fcab87 100644 --- a/src/main/scala/amba/apb/ToTL.scala +++ b/src/main/scala/amba/apb/ToTL.scala @@ -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)