From: Raptor Engineering Development Team <support@raptorengineering.com>
Date: Thu, 7 Apr 2022 18:38:53 +0000 (-0500)
Subject: Partially revert GIT hash 180026c72f0e1d3ef365b2214288d4a543a238dd
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=03e79da11c95b3fa3a2e55a4c08af8521c4d2283;p=gram.git

Partially revert GIT hash 180026c72f0e1d3ef365b2214288d4a543a238dd

UART bridge now gives a valid memtest
---

diff --git a/gram/core/multiplexer.py b/gram/core/multiplexer.py
index 87ea8a9..fe5fc6f 100644
--- a/gram/core/multiplexer.py
+++ b/gram/core/multiplexer.py
@@ -173,9 +173,9 @@ class _Steerer(Elaboratable):
                     with m.If(sel == STEER_REFRESH):
                         m.d.sync += phase.cs_n.eq(0)
                     with m.Else():
-                        m.d.sync += phase.cs_n.eq(~rank_decoder.o)
+                        m.d.sync += phase.cs_n.eq(rank_decoder.o)
                 else:
-                    m.d.sync += phase.cs_n.eq(~rank_decoder.o)
+                    m.d.sync += phase.cs_n.eq(rank_decoder.o)
                 m.d.sync += phase.bank.eq(Array(cmd.ba[:-rankbits] for cmd in self.commands)[sel])
             else:
                 m.d.sync += [
diff --git a/gram/phy/ecp5ddrphy.py b/gram/phy/ecp5ddrphy.py
index 62b42a5..513582e 100644
--- a/gram/phy/ecp5ddrphy.py
+++ b/gram/phy/ecp5ddrphy.py
@@ -175,7 +175,6 @@ class ECP5DDRPHY(Peripheral, Elaboratable):
 
     def elaborate(self, platform):
         m = Module()
-        comb, sync = m.d.comb, m.d.sync
 
         m.submodules.bridge = self._bridge
 
@@ -425,12 +424,12 @@ class ECP5DDRPHY(Peripheral, Elaboratable):
             ]
 
             for j in range(8*i, 8*(i+1)):
-                dq_o = Signal(name="dq_o_%d" % j)
-                dq_i = Signal(name="dq_i_%d" % j)
-                dq_oe_n = Signal(name="dq_oe_n_%d" % j)
-                dq_i_delayed = Signal(name="dq_i_delayed_%d" % j)
-                dq_i_data = Signal(4, name="dq_i_data_%d" % j)
-                dq_o_data = Signal(8, name="dq_o_data_%d" % j)
+                dq_o = Signal()
+                dq_i = Signal()
+                dq_oe_n = Signal()
+                dq_i_delayed = Signal()
+                dq_i_data = Signal(4)
+                dq_o_data = Signal(8)
                 dq_o_data_d = Signal(8, reset_less=True)
                 dq_o_data_muxed = Signal(4, reset_less=True)
                 m.d.comb += dq_o_data.eq(Cat(
@@ -498,28 +497,20 @@ class ECP5DDRPHY(Peripheral, Elaboratable):
                         o_O=dq_i,
                         io_B=self.pads.dq.io[j])
                 ]
-                # shift-register delay on the incoming read data
-                dq_i_bs = BitSlip(4, Const(0), cycles=1)
-                m.submodules['dq_i_bitslip_%d' % j] = dq_i_bs
-                dq_i_bs_o = Signal(4, name="dq_i_bs_o_%d" % j)
-                dq_i_bs_o_d = Signal(4, name="dq_i_bs_o_d_%d" % j)
-                comb += dq_i_bs.i.eq(dq_i_data)
-                comb += dq_i_bs_o.eq(dq_i_bs.o)
-                sync += dq_i_bs_o_d.eq(dq_i_bs_o) # delay by 1 clock
-                #with m.If(~datavalid_prev & datavalid):
-                comb += [
-                    dfi.phases[0].rddata[0*databits+j].eq(dq_i_bs_o_d[0]),
-                    dfi.phases[0].rddata[1*databits+j].eq(dq_i_bs_o_d[1]),
-                    dfi.phases[0].rddata[2*databits+j].eq(dq_i_bs_o_d[2]),
-                    dfi.phases[0].rddata[3*databits+j].eq(dq_i_bs_o_d[3]),
-                ]
-                #with m.Elif(datavalid):
-                comb += [
-                    dfi.phases[1].rddata[0*databits+j].eq(dq_i_bs_o[0]),
-                    dfi.phases[1].rddata[1*databits+j].eq(dq_i_bs_o[1]),
-                    dfi.phases[1].rddata[2*databits+j].eq(dq_i_bs_o[2]),
-                    dfi.phases[1].rddata[3*databits+j].eq(dq_i_bs_o[3]),
-                ]
+                with m.If(~datavalid_prev & datavalid):
+                    m.d.sync += [
+                        dfi.phases[0].rddata[0*databits+j].eq(dq_i_data[0]),
+                        dfi.phases[0].rddata[1*databits+j].eq(dq_i_data[1]),
+                        dfi.phases[0].rddata[2*databits+j].eq(dq_i_data[2]),
+                        dfi.phases[0].rddata[3*databits+j].eq(dq_i_data[3]),
+                    ]
+                with m.Elif(datavalid):
+                    m.d.sync += [
+                        dfi.phases[1].rddata[0*databits+j].eq(dq_i_data[0]),
+                        dfi.phases[1].rddata[1*databits+j].eq(dq_i_data[1]),
+                        dfi.phases[1].rddata[2*databits+j].eq(dq_i_data[2]),
+                        dfi.phases[1].rddata[3*databits+j].eq(dq_i_data[3]),
+                    ]
 
         # Read Control Path ------------------------------------------------------------------------
         # Creates a shift register of read commands coming from the DFI interface. This shift register
@@ -535,10 +526,12 @@ class ECP5DDRPHY(Peripheral, Elaboratable):
         rddata_en_last = Signal.like(rddata_en)
         m.d.comb += rddata_en.eq(Cat(dfi.phases[self.settings.rdphase].rddata_en, rddata_en_last))
         m.d.sync += rddata_en_last.eq(rddata_en)
-        for phase in dfi.phases:
-            m.d.sync += phase.rddata_valid.eq(rddata_en[-1])
         m.d.comb += dqs_re.eq(rddata_en[cl_sys_latency + 1] | rddata_en[cl_sys_latency + 2])
 
+        rddata_valid = Signal()
+        m.d.sync += rddata_valid.eq(datavalid_prev & ~datavalid)
+        for phase in dfi.phases:
+            m.d.comb += phase.rddata_valid.eq(rddata_valid)
 
         # Write Control Path -----------------------------------------------------------------------
         # Creates a shift register of write commands coming from the DFI interface. This shift register