forked from M-Labs/artiq
1
0
Fork 0

rtio: decouple PHY reset from logic reset

This commit is contained in:
Sebastien Bourdeauducq 2015-05-02 11:47:11 +08:00
parent 65b4b7bb12
commit a61d701d47
6 changed files with 14 additions and 8 deletions

View File

@ -257,6 +257,7 @@ class _KernelCSRs(AutoCSR):
def __init__(self, chan_sel_width, def __init__(self, chan_sel_width,
data_width, address_width, full_ts_width): data_width, address_width, full_ts_width):
self.reset = CSRStorage(reset=1) self.reset = CSRStorage(reset=1)
self.reset_phy = CSRStorage(reset=1)
self.chan_sel = CSRStorage(chan_sel_width) self.chan_sel = CSRStorage(chan_sel_width)
if data_width: if data_width:
@ -296,10 +297,11 @@ class RTIO(Module):
full_ts_width) full_ts_width)
# Clocking/Reset # Clocking/Reset
# Create rsys and rio domains based on sys and rio # Create rsys, rio and rio_phy domains based on sys and rtio
# with reset controlled by CSR. # with reset controlled by CSR.
self.clock_domains.cd_rsys = ClockDomain() self.clock_domains.cd_rsys = ClockDomain()
self.clock_domains.cd_rio = ClockDomain() self.clock_domains.cd_rio = 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(self.kcsrs.reset.storage) self.cd_rsys.rst.eq(self.kcsrs.reset.storage)
@ -307,6 +309,9 @@ class RTIO(Module):
self.comb += self.cd_rio.clk.eq(ClockSignal("rtio")) self.comb += self.cd_rio.clk.eq(ClockSignal("rtio"))
self.specials += AsyncResetSynchronizer(self.cd_rio, self.specials += AsyncResetSynchronizer(self.cd_rio,
self.kcsrs.reset.storage) self.kcsrs.reset.storage)
self.comb += self.cd_rio_phy.clk.eq(ClockSignal("rtio"))
self.specials += AsyncResetSynchronizer(self.cd_rio_phy,
self.kcsrs.reset_phy.storage)
# Managers # Managers
self.submodules.counter = _RTIOCounter(full_ts_width - fine_ts_width) self.submodules.counter = _RTIOCounter(full_ts_width - fine_ts_width)

View File

@ -10,7 +10,7 @@ class Output(Module):
# # # # # #
self.sync.rio += If(self.rtlink.o.stb, pad.eq(self.rtlink.o.data)) self.sync.rio_phy += If(self.rtlink.o.stb, pad.eq(self.rtlink.o.data))
class Inout(Module): class Inout(Module):
@ -25,7 +25,7 @@ class Inout(Module):
self.specials += ts.get_tristate(pad) self.specials += ts.get_tristate(pad)
sensitivity = Signal(2) sensitivity = Signal(2)
self.sync.rio += If(self.rtlink.o.stb, self.sync.rio_phy += If(self.rtlink.o.stb,
Case(self.rtlink.o.address, { Case(self.rtlink.o.address, {
0: ts.o.eq(self.rtlink.o.data[0]), 0: ts.o.eq(self.rtlink.o.data[0]),
1: ts.oe.eq(self.rtlink.o.data[0]), 1: ts.oe.eq(self.rtlink.o.data[0]),
@ -35,8 +35,8 @@ class Inout(Module):
i = Signal() i = Signal()
i_d = Signal() i_d = Signal()
self.specials += MultiReg(ts.i, i, "rio") self.specials += MultiReg(ts.i, i, "rio_phy")
self.sync.rio += i_d.eq(i) self.sync.rio_phy += i_d.eq(i)
self.comb += [ self.comb += [
self.rtlink.i.stb.eq( self.rtlink.i.stb.eq(
(sensitivity[0] & ( i & ~i_d)) | (sensitivity[0] & ( i & ~i_d)) |

View File

@ -18,7 +18,7 @@ class RT2WB(Module):
# # # # # #
active = Signal() active = Signal()
self.sync.rio += [ self.sync.rio_phy += [
If(self.rtlink.o.stb, If(self.rtlink.o.stb,
active.eq(1), active.eq(1),
wb.adr.eq(self.rtlink.o.address[:address_width]), wb.adr.eq(self.rtlink.o.address[:address_width]),

View File

@ -16,6 +16,7 @@ void rtio_init(void)
previous_fud_end_time = 0; previous_fud_end_time = 0;
rtio_reset_write(1); rtio_reset_write(1);
rtio_reset_write(0); rtio_reset_write(0);
rtio_reset_phy_write(0);
} }
static void write_and_process_status(long long int timestamp, int channel) static void write_and_process_status(long long int timestamp, int channel)

View File

@ -17,7 +17,7 @@ from artiq.gateware.rtio.phy import ttl_simple
class _RTIOCRG(Module, AutoCSR): class _RTIOCRG(Module, AutoCSR):
def __init__(self, platform, rtio_internal_clk): def __init__(self, platform, rtio_internal_clk):
self._clock_sel = CSRStorage() self._clock_sel = CSRStorage()
self.clock_domains.cd_rtio = ClockDomain() self.clock_domains.cd_rtio = ClockDomain(reset_less=True)
rtio_external_clk = Signal() rtio_external_clk = Signal()
user_sma_clock = platform.request("user_sma_clock") user_sma_clock = platform.request("user_sma_clock")

View File

@ -14,7 +14,7 @@ from artiq.gateware.rtio.phy import ttl_simple
class _RTIOCRG(Module, AutoCSR): class _RTIOCRG(Module, AutoCSR):
def __init__(self, platform): def __init__(self, platform):
self._clock_sel = CSRStorage() self._clock_sel = CSRStorage()
self.clock_domains.cd_rtio = ClockDomain() self.clock_domains.cd_rtio = ClockDomain(reset_less=True)
# 75MHz -> 125MHz # 75MHz -> 125MHz
rtio_internal_clk = Signal() rtio_internal_clk = Signal()