M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 1
Code Issues Projects Releases Wiki Activity

rtio: refactor RelaxedAsyncResetSynchronizer

This commit is contained in:
Robert Jördens 2017-06-18 14:37:08 +02:00
parent 8399f8893d
commit 0d8067256b
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
artiq/gateware/rtio/core.py
View File

@ -284,6 +284,18 @@ class LogChannel:
self.overrides = [] self.overrides = []
class _RelaxedAsyncResetSynchronizer(Module):
def __init__(self, cd, async_reset):
self.clock_domains.cd_rst = ClockDomain()
self.clock_domains.cd_no_rst = ClockDomain(reset_less=True)
self.specials += AsyncResetSynchronizer(self.cd_rst, async_reset)
self.comb += [
self.cd_rst.clk.eq(cd.clk),
self.cd_no_rst.clk.eq(cd.clk),
]
self.sync.no_rst += cd.rst.eq(self.cd_rst.rst)
class Core(Module, AutoCSR): class Core(Module, AutoCSR):
def __init__(self, channels, fine_ts_width=None, guard_io_cycles=20): def __init__(self, channels, fine_ts_width=None, guard_io_cycles=20):
if fine_ts_width is None: if fine_ts_width is None:
@ -316,28 +328,18 @@ class Core(Module, AutoCSR):
cmd_reset_phy.attr.add("no_retiming") cmd_reset_phy.attr.add("no_retiming")
self.clock_domains.cd_rsys = ClockDomain() self.clock_domains.cd_rsys = ClockDomain()
self.clock_domains.cd_rio_rst = ClockDomain()
self.clock_domains.cd_rio_phy_rst = ClockDomain()
self.clock_domains.cd_rio_no_rst = ClockDomain()
self.clock_domains.cd_rio = ClockDomain() self.clock_domains.cd_rio = ClockDomain()
self.clock_domains.cd_rio_phy = ClockDomain() self.clock_domains.cd_rio_phy = ClockDomain()
self.comb += [ self.comb += [
self.cd_rsys.clk.eq(ClockSignal()), self.cd_rsys.clk.eq(ClockSignal()),
self.cd_rsys.rst.eq(cmd_reset), self.cd_rsys.rst.eq(cmd_reset),
self.cd_rio_rst.clk.eq(ClockSignal("rtio")),
self.cd_rio_phy_rst.clk.eq(ClockSignal("rtio")),
self.cd_rio_no_rst.clk.eq(ClockSignal("rtio")),
self.cd_rio.clk.eq(ClockSignal("rtio")), self.cd_rio.clk.eq(ClockSignal("rtio")),
self.cd_rio_phy.clk.eq(ClockSignal("rtio")) self.cd_rio_phy.clk.eq(ClockSignal("rtio"))
] ]
self.specials += [ self.submodules.rars_rio = _RelaxedAsyncResetSynchronizer(
AsyncResetSynchronizer(self.cd_rio_rst, cmd_reset), self.cd_rio, cmd_reset)
AsyncResetSynchronizer(self.cd_rio_phy_rst, cmd_reset_phy), self.submodules.rars_rio_phy = _RelaxedAsyncResetSynchronizer(
] self.cd_rio_phy, cmd_reset_phy)
self.sync.rio_no_rst += [
self.cd_rio.rst.eq(self.cd_rio_rst.rst),
self.cd_rio_phy.rst.eq(self.cd_rio_phy_rst.rst),
]
# Managers # Managers
self.submodules.counter = RTIOCounter(len(self.cri.timestamp) - fine_ts_width) self.submodules.counter = RTIOCounter(len(self.cri.timestamp) - fine_ts_width)