Fix readout issue in Wishbone bridge (mentionned in #8)

diff --git a/gram/frontend/wishbone.py b/gram/frontend/wishbone.py
index bc9254196225238775ddf2df016c72cd4c49abf1..4756280c08ef0b1759e8353bbd0d2e885e0fd963 100644 (file)
--- a/gram/frontend/wishbone.py
+++ b/gram/frontend/wishbone.py
@@ -1,6 +1,8 @@
 # This file is Copyright (c) 2020 LambdaConcept <contact@lambdaconcept.com>
 # License: BSD
 
+from math import log2
+
 from nmigen import *
 from nmigen.utils import log2_int
 
@@ -10,17 +12,18 @@ from lambdasoc.periph import Peripheral
 
 
 class gramWishbone(Peripheral, Elaboratable):
-    def __init__(self, core):
+    def __init__(self, core, data_width = 32):
         super().__init__()
 
-        self._port = core.crossbar.get_port(data_width=32)
+        self.dw = data_width
+        self._port = core.crossbar.get_native_port()
 
         dram_size = core.size//4
         dram_addr_width = log2_int(dram_size)
         granularity = 8
 
         self.bus = wishbone.Interface(addr_width=dram_addr_width,
-                                      data_width=32, granularity=granularity)
+                                      data_width=self.dw, granularity=granularity)
 
         map = MemoryMap(addr_width=dram_addr_width +
                         log2_int(granularity)-1, data_width=granularity)
@@ -31,30 +34,35 @@ class gramWishbone(Peripheral, Elaboratable):
 
         # Write datapath
         m.d.comb += [
-            self._port.wdata.valid.eq(
-                self.bus.cyc & self.bus.stb & self.bus.we),
+            self._port.wdata.valid.eq(self.bus.cyc & self.bus.stb & self.bus.we),
             self._port.wdata.data.eq(self.bus.dat_w),
             self._port.wdata.we.eq(self.bus.sel),
         ]
 
         # Read datapath
         m.d.comb += [
-            self.bus.dat_r.eq(self._port.rdata),
+            self.bus.dat_r.eq(self._port.rdata.data),
             self._port.rdata.ready.eq(1),
         ]
 
+        adr_offset = 0
+        ratio = self.dw//2**int(log2(len(self._port.wdata.data)))
+        count = Signal(range(max(ratio, 2)))
         with m.FSM():
             with m.State("Send-Cmd"):
                 m.d.comb += [
                     self._port.cmd.valid.eq(self.bus.cyc & self.bus.stb),
                     self._port.cmd.we.eq(self.bus.we),
-                    self._port.cmd.addr.eq(self.bus.adr),
+                    self._port.cmd.addr.eq(self.bus.adr*ratio + count - adr_offset),
                 ]
                 with m.If(self._port.cmd.valid & self._port.cmd.ready):
-                    with m.If(self.bus.we):
-                        m.next = "Wait-Write"
-                    with m.Else():
-                        m.next = "Wait-Read"
+                    m.d.sync += count.eq(count+1)
+                    with m.If(count == (ratio-1)):
+                        m.d.sync += count.eq(0)
+                        with m.If(self.bus.we):
+                            m.next = "Wait-Write"
+                        with m.Else():
+                            m.next = "Wait-Read"
 
             with m.State("Wait-Read"):
                 with m.If(self._port.rdata.valid):