From 4b61020b276f5fa70585cc6de645267146afdf4b Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Mon, 12 Dec 2016 18:48:10 +0800
Subject: [PATCH] drtio: reset more local state

---
 artiq/gateware/drtio/rt_controller.py        | 23 ++++++++++++++------
 artiq/gateware/drtio/rt_packets.py           |  2 +-
 artiq/test/gateware/drtio/test_full_stack.py |  3 ++-
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/artiq/gateware/drtio/rt_controller.py b/artiq/gateware/drtio/rt_controller.py
index 6e29b2ab0..7c8183e44 100644
--- a/artiq/gateware/drtio/rt_controller.py
+++ b/artiq/gateware/drtio/rt_controller.py
@@ -1,6 +1,7 @@
 from migen import *
 from migen.genlib.cdc import MultiReg
 from migen.genlib.misc import WaitTimer
+from migen.genlib.resetsync import AsyncResetSynchronizer
 
 from misoc.interconnect.csr import *
 
@@ -70,6 +71,18 @@ class RTController(Module):
             ),
         ]
 
+        local_reset = Signal(reset=1)
+        self.sync += local_reset.eq(self.csrs.reset.re)
+        local_reset.attr.add("no_retiming")
+        self.clock_domains.cd_rsys = ClockDomain()
+        self.clock_domains.cd_rio = ClockDomain()
+        self.comb += [
+            self.cd_rsys.clk.eq(ClockSignal()),
+            self.cd_rsys.rst.eq(local_reset)
+        ]
+        self.comb += self.cd_rio.clk.eq(ClockSignal("rtio"))
+        self.specials += AsyncResetSynchronizer(self.cd_rio, local_reset)
+
         # remote channel status cache
         fifo_spaces_mem = Memory(16, channel_count)
         fifo_spaces = fifo_spaces_mem.get_port(write_capable=True)
@@ -94,7 +107,7 @@ class RTController(Module):
             )
         ]
 
-        fsm = FSM()
+        fsm = ClockDomainsRenamer("rsys")(FSM())
         self.submodules += fsm
 
         status_wait = Signal()
@@ -107,15 +120,11 @@ class RTController(Module):
         ]
         sequence_error_set = Signal()
         underflow_set = Signal()
-        self.sync += [
+        self.sync.rio += [
             If(self.cri.cmd == cri.commands["o_underflow_reset"], status_underflow.eq(0)),
             If(self.cri.cmd == cri.commands["o_sequence_error_reset"], status_sequence_error.eq(0)),
             If(underflow_set, status_underflow.eq(1)),
-            If(sequence_error_set, status_sequence_error.eq(1)),
-            If(self.csrs.reset.re,
-                status_underflow.eq(0),
-                status_sequence_error.eq(0)
-            )
+            If(sequence_error_set, status_sequence_error.eq(1))
         ]
 
         signal_fifo_space_timeout = Signal()
diff --git a/artiq/gateware/drtio/rt_packets.py b/artiq/gateware/drtio/rt_packets.py
index ccdd0124c..52c4261ed 100644
--- a/artiq/gateware/drtio/rt_packets.py
+++ b/artiq/gateware/drtio/rt_packets.py
@@ -487,7 +487,7 @@ class RTPacketMaster(Module):
         self.submodules += rx_dp
 
         # Write FIFO and extra data count
-        wfifo = ClockDomainsRenamer({"write": "sys", "read": "rtio"})(
+        wfifo = ClockDomainsRenamer({"write": "rsys", "read": "rio"})(
             AsyncFIFO(64+16+16+512, write_fifo_depth))
         self.submodules += wfifo
         write_timestamp_d = Signal(64)
diff --git a/artiq/test/gateware/drtio/test_full_stack.py b/artiq/test/gateware/drtio/test_full_stack.py
index 79833256e..73ff378ca 100644
--- a/artiq/test/gateware/drtio/test_full_stack.py
+++ b/artiq/test/gateware/drtio/test_full_stack.py
@@ -66,7 +66,8 @@ class DUT(Module):
         
 
 class TestFullStack(unittest.TestCase):
-    clocks = {"sys": 8, "rtio": 5, "rtio_rx": 5, "rio": 5, "rio_phy": 5}
+    clocks = {"sys": 8, "rtio": 5, "rtio_rx": 5,
+              "rsys": 8, "rio": 5, "rio_phy": 5}
 
     def test_controller(self):
         dut = DUT(2)