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

drtio/gateware/transceiver/gtp_7series: add power down state before reset on rx (seems to make restart reliable)

This commit is contained in:
Florent Kermarrec 2018-02-09 20:17:02 +01:00
parent 2d4a1340ea
commit 180c28551d
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
artiq/gateware/drtio/transceiver/gtp_7series.py
View File

@ -111,6 +111,7 @@ class GTPSingle(Module):
# RX Startup/Reset # RX Startup/Reset
i_GTRXRESET=rx_init.gtrxreset, i_GTRXRESET=rx_init.gtrxreset,
i_RXPD=Cat(rx_init.gtrxpd, rx_init.gtrxpd),
o_RXRESETDONE=rx_init.rxresetdone, o_RXRESETDONE=rx_init.rxresetdone,
i_RXDLYSRESET=rx_init.rxdlysreset, i_RXDLYSRESET=rx_init.rxdlysreset,
o_RXDLYSRESETDONE=rx_init.rxdlysresetdone, o_RXDLYSRESETDONE=rx_init.rxdlysresetdone,

12
artiq/gateware/drtio/transceiver/gtp_7series_init.py
View File

@ -146,6 +146,7 @@ class GTPRXInit(Module):
# GTP signals # GTP signals
self.plllock = Signal() self.plllock = Signal()
self.gtrxreset = Signal() self.gtrxreset = Signal()
self.gtrxpd = Signal()
self.rxresetdone = Signal() self.rxresetdone = Signal()
self.rxdlysreset = Signal() self.rxdlysreset = Signal()
self.rxdlysresetdone = Signal() self.rxdlysresetdone = Signal()
@ -194,12 +195,14 @@ class GTPRXInit(Module):
# Deglitch FSM outputs driving transceiver asynch inputs # Deglitch FSM outputs driving transceiver asynch inputs
gtrxreset = Signal() gtrxreset = Signal()
gtrxpd = Signal()
rxdlysreset = Signal() rxdlysreset = Signal()
rxphalign = Signal() rxphalign = Signal()
rxdlyen = Signal() rxdlyen = Signal()
rxuserrdy = Signal() rxuserrdy = Signal()
self.sync += [ self.sync += [
self.gtrxreset.eq(gtrxreset), self.gtrxreset.eq(gtrxreset),
self.gtrxpd.eq(gtrxpd),
self.rxdlysreset.eq(rxdlysreset), self.rxdlysreset.eq(rxdlysreset),
self.rxphalign.eq(rxphalign), self.rxphalign.eq(rxphalign),
self.rxdlyen.eq(rxdlyen), self.rxdlyen.eq(rxdlyen),
@ -212,7 +215,7 @@ class GTPRXInit(Module):
pll_reset_timer = WaitTimer(pll_reset_cycles) pll_reset_timer = WaitTimer(pll_reset_cycles)
self.submodules += pll_reset_timer self.submodules += pll_reset_timer
startup_fsm = ResetInserter()(FSM(reset_state="GTP_RESET")) startup_fsm = ResetInserter()(FSM(reset_state="GTP_PD"))
self.submodules += startup_fsm self.submodules += startup_fsm
ready_timer = WaitTimer(int(4e-3*sys_clk_freq)) ready_timer = WaitTimer(int(4e-3*sys_clk_freq))
@ -225,6 +228,11 @@ class GTPRXInit(Module):
cdr_stable_timer = WaitTimer(1024) cdr_stable_timer = WaitTimer(1024)
self.submodules += cdr_stable_timer self.submodules += cdr_stable_timer
startup_fsm.act("GTP_PD",
gtrxreset.eq(1),
gtrxpd.eq(1),
NextState("GTP_RESET")
)
startup_fsm.act("GTP_RESET", startup_fsm.act("GTP_RESET",
gtrxreset.eq(1), gtrxreset.eq(1),
NextState("DRP_READ_ISSUE") NextState("DRP_READ_ISSUE")
@ -300,6 +308,6 @@ class GTPRXInit(Module):
startup_fsm.act("READY", startup_fsm.act("READY",
rxuserrdy.eq(1), rxuserrdy.eq(1),
self.done.eq(1), self.done.eq(1),
If(self.restart, NextState("GTP_RESET") If(self.restart, NextState("GTP_PD")
) )
) )