M-Labs/artiq
2
0
Fork 2
mirror of https://github.com/m-labs/artiq.git synced 2024-12-26 03:38:25 +08:00
Code Issues Projects Releases Wiki Activity

made kc705/gtx interface more similar to kasli/gtp

Browse Source
This commit is contained in:
mwojcik 2021-08-09 15:55:28 +02:00 committed by Sébastien Bourdeauducq
parent 242dfae38e
commit 7879d3630b
2 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@ class GTX_20X(Module):
# * GTX PLL frequency @ 2.5GHz # * GTX PLL frequency @ 2.5GHz
# * GTX line rate (TX & RX) @ 2.5Gb/s # * GTX line rate (TX & RX) @ 2.5Gb/s
# * GTX TX/RX USRCLK @ 125MHz == coarse RTIO frequency # * GTX TX/RX USRCLK @ 125MHz == coarse RTIO frequency
def __init__(self, refclk, tx_pads, rx_pads, sys_clk_freq, rtio_clk_freq=125e6, tx_mode="single", rx_mode="single"): def __init__(self, refclk, pads, sys_clk_freq, rtio_clk_freq=125e6, tx_mode="single", rx_mode="single"):
assert tx_mode in ["single", "master", "slave"] assert tx_mode in ["single", "master", "slave"]
assert rx_mode in ["single", "master", "slave"] assert rx_mode in ["single", "master", "slave"]
@ -229,10 +229,10 @@ class GTX_20X(Module):
p_RXCDR_LOCK_CFG=0b010101, p_RXCDR_LOCK_CFG=0b010101,
# Pads # Pads
i_GTXRXP=rx_pads.p, i_GTXRXP=pads.rxp,
i_GTXRXN=rx_pads.n, i_GTXRXN=pads.rxn,
o_GTXTXP=tx_pads.p, o_GTXTXP=pads.txp,
o_GTXTXN=tx_pads.n, o_GTXTXN=pads.txn,
# Other parameters # Other parameters
p_PCS_RSVD_ATTR=( p_PCS_RSVD_ATTR=(
@ -282,9 +282,8 @@ class GTX_20X(Module):
class GTX(Module, TransceiverInterface): class GTX(Module, TransceiverInterface):
def __init__(self, clock_pads, tx_pads, rx_pads, sys_clk_freq, rtio_clk_freq=125e6, master=0): def __init__(self, clock_pads, pads, sys_clk_freq, rtio_clk_freq=125e6, master=0):
assert len(tx_pads) == len(rx_pads) self.nchannels = nchannels = len(pads)
self.nchannels = nchannels = len(tx_pads)
self.gtxs = [] self.gtxs = []
self.rtio_clk_freq = rtio_clk_freq self.rtio_clk_freq = rtio_clk_freq
@ -307,7 +306,7 @@ class GTX(Module, TransceiverInterface):
else: else:
mode = "master" if i == master else "slave" mode = "master" if i == master else "slave"
# Note: RX phase alignment is to be done on individual lanes, not multi-lane. # Note: RX phase alignment is to be done on individual lanes, not multi-lane.
gtx = GTX_20X(refclk, tx_pads[i], rx_pads[i], sys_clk_freq, rtio_clk_freq=rtio_clk_freq, tx_mode=mode, rx_mode="single") gtx = GTX_20X(refclk, pads[i], sys_clk_freq, rtio_clk_freq=rtio_clk_freq, tx_mode=mode, rx_mode="single")
# Fan-out (to slave) / Fan-in (from master) of the TXUSRCLK # Fan-out (to slave) / Fan-in (from master) of the TXUSRCLK
if mode == "slave": if mode == "slave":
self.comb += gtx.cd_rtio_tx.clk.eq(rtio_tx_clk) self.comb += gtx.cd_rtio_tx.clk.eq(rtio_tx_clk)

23
artiq/gateware/targets/kc705.py
View File

@ -271,18 +271,14 @@ class _MasterBase(MiniSoC, AMPSoC):
platform.add_extension(_ams101_dac) platform.add_extension(_ams101_dac)
self.comb += platform.request("sfp_tx_disable_n_33").eq(1) self.comb += platform.request("sfp_tx_disable_n_33").eq(1)
tx_pads = [ data_pads = [
platform.request("sfp_tx"), platform.request("user_sma_mgt_tx") platform.request("sfp"), platform.request("user_sma_mgt")
]
rx_pads = [
platform.request("sfp_rx"), platform.request("user_sma_mgt_rx")
] ]
# 1000BASE_BX10 Ethernet compatible, 125MHz RTIO clock # 1000BASE_BX10 Ethernet compatible, 125MHz RTIO clock
self.submodules.drtio_transceiver = gtx_7series.GTX( self.submodules.drtio_transceiver = gtx_7series.GTX(
clock_pads=platform.request("si5324_clkout"), clock_pads=platform.request("si5324_clkout"),
tx_pads=tx_pads, pads=data_pads,
rx_pads=rx_pads,
sys_clk_freq=self.clk_freq) sys_clk_freq=self.clk_freq)
self.csr_devices.append("drtio_transceiver") self.csr_devices.append("drtio_transceiver")
@ -405,21 +401,16 @@ class _SatelliteBase(BaseSoC):
platform.add_extension(_ams101_dac) platform.add_extension(_ams101_dac)
self.comb += platform.request("sfp_tx_disable_n_33").eq(1) self.comb += platform.request("sfp_tx_disable_n_33").eq(1)
tx_pads = [ data_pads = [
platform.request("sfp_tx"), platform.request("user_sma_mgt_tx") platform.request("sfp"), platform.request("user_sma_mgt")
]
rx_pads = [
platform.request("sfp_rx"), platform.request("user_sma_mgt_rx")
] ]
if sma_as_sat: if sma_as_sat:
tx_pads = tx_pads[::-1] data_pads = data_pads[::-1]
rx_pads = rx_pads[::-1]
# 1000BASE_BX10 Ethernet compatible, 125MHz RTIO clock # 1000BASE_BX10 Ethernet compatible, 125MHz RTIO clock
self.submodules.drtio_transceiver = gtx_7series.GTX( self.submodules.drtio_transceiver = gtx_7series.GTX(
clock_pads=platform.request("si5324_clkout"), clock_pads=platform.request("si5324_clkout"),
tx_pads=tx_pads, pads=data_pads,
rx_pads=rx_pads,
sys_clk_freq=self.clk_freq) sys_clk_freq=self.clk_freq)
self.csr_devices.append("drtio_transceiver") self.csr_devices.append("drtio_transceiver")