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

gtx: Always enable IBUFDS_GTE2, add clk_path_ready 

- Set clk_path_ready to High to start Initialization of GTP TX and RX
This commit is contained in:
linuswck 2023-11-06 16:19:04 +08:00 committed by Sébastien Bourdeauducq
parent bbe6ff8cac
commit 8f7d138dbd
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -279,14 +279,13 @@ class GTX(Module, TransceiverInterface):
self.nchannels = nchannels = len(pads) self.nchannels = nchannels = len(pads)
self.gtxs = [] self.gtxs = []
self.rtio_clk_freq = clk_freq self.rtio_clk_freq = clk_freq
self.clk_path_ready = Signal()
# # # # # #
refclk = Signal() refclk = Signal()
clk_enable = Signal()
self.specials += Instance("IBUFDS_GTE2", self.specials += Instance("IBUFDS_GTE2",
i_CEB=~clk_enable, i_CEB=0,
i_I=clock_pads.p, i_I=clock_pads.p,
i_IB=clock_pads.n, i_IB=clock_pads.n,
o_O=refclk, o_O=refclk,
@ -315,14 +314,10 @@ class GTX(Module, TransceiverInterface):
for n, gtx in enumerate(self.gtxs): for n, gtx in enumerate(self.gtxs):
self.comb += [ self.comb += [
gtx.txenable.eq(self.txenable.storage[n]), gtx.txenable.eq(self.txenable.storage[n]),
gtx.tx_init.stable_clkin.eq(clk_enable) gtx.tx_init.clk_path_ready.eq(self.clk_path_ready)
] ]
# rx_init is in SYS domain, rather than bootstrap # rx_init is in SYS domain, rather than bootstrap
self.specials += MultiReg(clk_enable, gtx.rx_init.stable_clkin) self.specials += MultiReg(self.clk_path_ready, gtx.rx_init.clk_path_ready)
# stable_clkin resets after reboot since it's in SYS domain
# still need to keep clk_enable high after this
self.sync.bootstrap += clk_enable.eq(self.stable_clkin.storage | self.gtxs[0].tx_init.cplllock)
# Connect slave i's `rtio_rx` clock to `rtio_rxi` clock # Connect slave i's `rtio_rx` clock to `rtio_rxi` clock
for i in range(nchannels): for i in range(nchannels):

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

@ -16,7 +16,7 @@ class GTXInit(Module):
assert mode in ["single", "master", "slave"] assert mode in ["single", "master", "slave"]
self.mode = mode self.mode = mode
self.stable_clkin = Signal() self.clk_path_ready = Signal()
self.done = Signal() self.done = Signal()
self.restart = Signal() self.restart = Signal()
@ -110,7 +110,7 @@ class GTXInit(Module):
startup_fsm.act("INITIAL", startup_fsm.act("INITIAL",
startup_timer.wait.eq(1), startup_timer.wait.eq(1),
If(startup_timer.done & self.stable_clkin, NextState("RESET_PLL")) If(startup_timer.done & self.clk_path_ready, NextState("RESET_PLL"))
) )
startup_fsm.act("RESET_PLL", startup_fsm.act("RESET_PLL",
gtXxreset.eq(1), gtXxreset.eq(1),