From 5c3c3c26b55728c511ff190198bcf19238220daa Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Mon, 13 Jul 2020 18:51:55 +0800 Subject: [PATCH] dma: fix inflight_cnt and eop generation --- src/gateware/dma.py | 11 +++++++++-- src/gateware/test_dma.py | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/gateware/dma.py b/src/gateware/dma.py index 7483079..44e185b 100644 --- a/src/gateware/dma.py +++ b/src/gateware/dma.py @@ -42,13 +42,20 @@ class AXIReader(Module): # UG585: "Large slave interface read acceptance capability in the range of 14 to 70 commands" inflight_cnt = Signal(max=128) - self.sync += inflight_cnt.eq(inflight_cnt + (ar.valid & ar.ready) - (r.valid & r.ready)) + request_done = Signal() + reply_done = Signal() + self.comb += [ + request_done.eq(ar.valid & ar.ready), + reply_done.eq(r.valid & r.ready & r.last) + ] + self.sync += inflight_cnt.eq(inflight_cnt + request_done - reply_done) self.comb += [ self.source.stb.eq(r.valid), r.ready.eq(self.source.ack), self.source.data.eq(r.data), - self.source.eop.eq(eop_pending & r.last & (inflight_cnt == 0)) + # Note that when eop_pending=1, no new transactions are made and inflight_cnt is no longer incremented + self.source.eop.eq(eop_pending & r.last & (inflight_cnt == 1)) ] diff --git a/src/gateware/test_dma.py b/src/gateware/test_dma.py index cf3f126..4613753 100644 --- a/src/gateware/test_dma.py +++ b/src/gateware/test_dma.py @@ -45,7 +45,7 @@ class AXIMemorySim: raise ValueError addr = request.addr//self.align + i if addr < len(self.queue): - data = self.queue[addr] + data = self.data[addr] else: data = 0 yield from self.bus.write_r(request.id, data, last=i == request_len-1)