srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

drtio: fix gtx_7series comma alignment

This commit is contained in:
Sebastien Bourdeauducq 2016-11-03 20:13:50 +08:00
parent a4ba34bb2c
commit 1d027ffa95
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq/gateware/drtio/transceiver/gtx_7series.py
View File

@ -185,7 +185,7 @@ class GTX_1000BASE_BX10(Module):
self.decoders[1].input.eq(rxdata[10:]) self.decoders[1].input.eq(rxdata[10:])
] ]
clock_aligner = BruteforceClockAligner(0b0011111000, self.rtio_clk_freq) clock_aligner = BruteforceClockAligner(0b0001111100, self.rtio_clk_freq)
self.submodules += clock_aligner self.submodules += clock_aligner
self.comb += [ self.comb += [
clock_aligner.rxdata.eq(rxdata), clock_aligner.rxdata.eq(rxdata),

6
artiq/gateware/drtio/transceiver/gtx_7series_init.py
View File

@ -118,7 +118,7 @@ class GTXInit(Module):
# Changes the phase of the transceiver RX clock to align the comma to # Changes the phase of the transceiver RX clock to align the comma to
# the MSBs of RXDATA, fixing the latency. # the LSBs of RXDATA, fixing the latency.
# #
# This is implemented by repeatedly resetting the transceiver until it # This is implemented by repeatedly resetting the transceiver until it
# gives out the correct phase. Each reset gives a random phase. # gives out the correct phase. Each reset gives a random phase.
@ -130,6 +130,9 @@ class GTXInit(Module):
# * RXSLIDE_MODE=PMA cannot be used with the RX buffer bypassed. # * RXSLIDE_MODE=PMA cannot be used with the RX buffer bypassed.
# Those design flaws make RXSLIDE_MODE=PMA yet another broken and useless # Those design flaws make RXSLIDE_MODE=PMA yet another broken and useless
# transceiver "feature". # transceiver "feature".
#
# Warning: Xilinx transceivers are LSB first, and comma needs to be flipped
# compared to the usual 8b10b binary representation.
class BruteforceClockAligner(Module): class BruteforceClockAligner(Module):
def __init__(self, comma, rtio_clk_freq, check_period=6e-3, ready_time=50e-3): def __init__(self, comma, rtio_clk_freq, check_period=6e-3, ready_time=50e-3):
self.rxdata = Signal(20) self.rxdata = Signal(20)
@ -156,6 +159,7 @@ class BruteforceClockAligner(Module):
comma_n = ~comma & 0b1111111111 comma_n = ~comma & 0b1111111111
comma_seen_rxclk = Signal() comma_seen_rxclk = Signal()
comma_seen = Signal() comma_seen = Signal()
comma_seen_rxclk.attr.add("no_retiming")
self.specials += MultiReg(comma_seen_rxclk, comma_seen) self.specials += MultiReg(comma_seen_rxclk, comma_seen)
comma_seen_reset = PulseSynchronizer("rtio", "rtio_rx") comma_seen_reset = PulseSynchronizer("rtio", "rtio_rx")
self.submodules += comma_seen_reset self.submodules += comma_seen_reset