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

gateware/rtio: keep counter clock domain transfer active during CSR reset

This commit is contained in:
Sebastien Bourdeauducq 2015-12-20 22:12:34 +08:00
parent b96e0d241e
commit 5769107936
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,46 +11,47 @@ from misoc.interconnect.csr import *
from artiq.gateware.rtio import rtlink from artiq.gateware.rtio import rtlink
# note: transfer is in rtio/sys domains and not affected by the reset CSRs
class _GrayCodeTransfer(Module): class _GrayCodeTransfer(Module):
def __init__(self, width): def __init__(self, width):
self.i = Signal(width) # in rio domain self.i = Signal(width) # in rtio domain
self.o = Signal(width) # in rsys domain self.o = Signal(width) # in sys domain
# # # # # #
# convert to Gray code # convert to Gray code
value_gray_rio = Signal(width) value_gray_rtio = Signal(width)
self.sync.rio += value_gray_rio.eq(self.i ^ self.i[1:]) self.sync.rtio += value_gray_rtio.eq(self.i ^ self.i[1:])
# transfer to system clock domain # transfer to system clock domain
value_gray_sys = Signal(width) value_gray_sys = Signal(width)
self.specials += [ self.specials += [
NoRetiming(value_gray_rio), NoRetiming(value_gray_rtio),
MultiReg(value_gray_rio, value_gray_sys, "rsys") MultiReg(value_gray_rtio, value_gray_sys)
] ]
# convert back to binary # convert back to binary
value_sys = Signal(width) value_sys = Signal(width)
self.comb += value_sys[-1].eq(value_gray_sys[-1]) self.comb += value_sys[-1].eq(value_gray_sys[-1])
for i in reversed(range(width-1)): for i in reversed(range(width-1)):
self.comb += value_sys[i].eq(value_sys[i+1] ^ value_gray_sys[i]) self.comb += value_sys[i].eq(value_sys[i+1] ^ value_gray_sys[i])
self.sync.rsys += self.o.eq(value_sys) self.sync += self.o.eq(value_sys)
class _RTIOCounter(Module): class _RTIOCounter(Module):
def __init__(self, width): def __init__(self, width):
self.width = width self.width = width
# Timestamp counter in RTIO domain # Timestamp counter in RTIO domain
self.value_rio = Signal(width) self.value_rtio = Signal(width)
# Timestamp counter resynchronized to sys domain # Timestamp counter resynchronized to sys domain
# Lags behind value_rio, monotonic and glitch-free # Lags behind value_rtio, monotonic and glitch-free
self.value_sys = Signal(width) self.value_sys = Signal(width)
# # # # # #
# note: counter is in rtio domain and never affected by the reset CSRs # note: counter is in rtio domain and never affected by the reset CSRs
self.sync.rtio += self.value_rio.eq(self.value_rio + 1) self.sync.rtio += self.value_rtio.eq(self.value_rtio + 1)
gt = _GrayCodeTransfer(width) gt = _GrayCodeTransfer(width)
self.submodules += gt self.submodules += gt
self.comb += gt.i.eq(self.value_rio), self.value_sys.eq(gt.o) self.comb += gt.i.eq(self.value_rtio), self.value_sys.eq(gt.o)
# CHOOSING A GUARD TIME # CHOOSING A GUARD TIME
@ -215,7 +216,7 @@ class _OutputManager(Module):
# TODO: report error on stb & busy # TODO: report error on stb & busy
self.comb += [ self.comb += [
dout_ack.eq( dout_ack.eq(
dout.timestamp[fine_ts_width:] == counter.value_rio), dout.timestamp[fine_ts_width:] == counter.value_rtio),
interface.stb.eq(dout_stb & dout_ack) interface.stb.eq(dout_stb & dout_ack)
] ]
if data_width: if data_width:
@ -260,9 +261,9 @@ class _InputManager(Module):
self.comb += fifo_in.data.eq(interface.data) self.comb += fifo_in.data.eq(interface.data)
if interface.timestamped: if interface.timestamped:
if fine_ts_width: if fine_ts_width:
full_ts = Cat(interface.fine_ts, counter.value_rio) full_ts = Cat(interface.fine_ts, counter.value_rtio)
else: else:
full_ts = counter.value_rio full_ts = counter.value_rtio
self.comb += fifo_in.timestamp.eq(full_ts) self.comb += fifo_in.timestamp.eq(full_ts)
self.comb += fifo.we.eq(interface.stb) self.comb += fifo.we.eq(interface.stb)