Hardware
/
liteeth
mirror of https://github.com/enjoy-digital/liteeth.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

phy/Ultrascale/1000BaseX: Switch to LiteICLink's ChannelPLL for more flexibility/simplicity. 

LiteICLink's ChannelPLL directly computes the CPLL/DIV parameters.
This commit is contained in:
Florent Kermarrec 2024-02-07 09:24:01 +01:00
parent 8f521d838c
commit 80ba793bcf
3 changed files with 39 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
liteeth/phy/ku_1000basex.py
View File

@ -11,19 +11,21 @@ from migen.genlib.cdc import PulseSynchronizer
from litex.gen import *
from liteiclink.serdes.gth3_ultrascale import GTHChannelPLL
from liteeth.common import *
from liteeth.phy.pcs_1000basex import *
# KU_1000BASEX PHY ---------------------------------------------------------------------------------
class KU_1000BASEX(LiteXModule):
# Configured for 200MHz transceiver reference clock
# Configured for 200MHz or 156.25MHz transceiver reference clock
dw = 8
linerate = 1.25e9
rx_clk_freq = 125e6
tx_clk_freq = 125e6
def __init__(self, refclk_or_clk_pads, data_pads, sys_clk_freq, refclk_freq=200e6, with_csr=True, rx_polarity=0, tx_polarity=0):
assert refclk_freq in [200e6]
assert refclk_freq in [200e6, 156.25e6]
pcs = PCS(lsb_first=True)
self.submodules += pcs
@ -69,6 +71,10 @@ class KU_1000BASEX(LiteXModule):
rx_data = Signal(20)
rx_reset_done = Signal()
pll = GTHChannelPLL(refclk, refclk_freq, self.linerate)
self.submodules.pll = pll
print(pll)
gth_params = dict(
p_ACJTAG_DEBUG_MODE = 0b0,
p_ACJTAG_MODE = 0b0,
@ -123,12 +129,12 @@ class KU_1000BASEX(LiteXModule):
p_CPLL_CFG1 = 0b1010010010101100,
p_CPLL_CFG2 = 0b0000000000000111,
p_CPLL_CFG3 = 0b000000,
p_CPLL_FBDIV = 5,
p_CPLL_FBDIV_45 = 5,
p_CPLL_FBDIV = pll.config["n2"],
p_CPLL_FBDIV_45 = pll.config["n1"],
p_CPLL_INIT_CFG0 = 0b0000001010110010,
p_CPLL_INIT_CFG1 = 0b00000000,
p_CPLL_LOCK_CFG = 0b0000000111101000,
p_CPLL_REFCLK_DIV = 2,
p_CPLL_REFCLK_DIV = pll.config["m"],
p_DDI_CTRL = 0b00,
p_DDI_REALIGN_WAIT = 15,
p_DEC_MCOMMA_DETECT = "FALSE",
@ -291,7 +297,7 @@ class KU_1000BASEX(LiteXModule):
p_RXOOB_CFG = 0b000000110,
p_RXOOB_CLK_CFG = "PMA",
p_RXOSCALRESET_TIME = 0b00011,
p_RXOUT_DIV = {1.25e9 : 4, 3.125e9 : 2}[self.linerate],
p_RXOUT_DIV = pll.config["d"],
p_RXPCSRESET_TIME = 0b00011,
p_RXPHBEACON_CFG = 0b0000000000000000,
p_RXPHDLY_CFG = 0b0010000000100000,
@ -320,7 +326,7 @@ class KU_1000BASEX(LiteXModule):
p_RX_BIAS_CFG0 = 0b0000101010110100,
p_RX_BUFFER_CFG = 0b000000,
p_RX_CAPFF_SARC_ENB = 0b0,
p_RX_CLK25_DIV = 8,
p_RX_CLK25_DIV = {200e6: 8, 156.25e6: 7}[refclk_freq],
p_RX_CLKMUX_EN = 0b1,
p_RX_CLK_SLIP_OVRD = 0b00000,
p_RX_CM_BUF_CFG = 0b1010,
@ -396,7 +402,7 @@ class KU_1000BASEX(LiteXModule):
p_TXFIFO_ADDR_CFG = "LOW",
p_TXGBOX_FIFO_INIT_RD_ADDR = 4,
p_TXGEARBOX_EN = "FALSE",
p_TXOUT_DIV = {1.25e9 : 4, 3.125e9 : 2}[self.linerate],
p_TXOUT_DIV = pll.config["d"],
p_TXPCSRESET_TIME = 0b00011,
p_TXPHDLY_CFG0 = 0b0010000000100000,
p_TXPHDLY_CFG1 = 0b0000000001110101,
@ -419,7 +425,7 @@ class KU_1000BASEX(LiteXModule):
p_TXSYNC_MULTILANE = 0b0,
p_TXSYNC_OVRD = 0b0,
p_TXSYNC_SKIP_DA = 0b0,
p_TX_CLK25_DIV = 8,
p_TX_CLK25_DIV = {200e6: 8, 156.25e6: 7}[refclk_freq],
p_TX_CLKMUX_EN = 0b1,
p_TX_DATA_WIDTH = 20,
p_TX_DCD_CFG = 0b000010,

18
liteeth/phy/usp_gth_1000basex.py
View File

@ -1,7 +1,7 @@
#
# This file is part of LiteEth.
#
# Copyright (c) 2019-2023 Florent Kermarrec <florent@enjoy-digital.fr>
# Copyright (c) 2019-2024 Florent Kermarrec <florent@enjoy-digital.fr>
# Copyright (c) 2018 Sebastien Bourdeauducq <sb@m-labs.hk>
# SPDX-License-Identifier: BSD-2-Clause
@ -11,6 +11,8 @@ from migen.genlib.cdc import PulseSynchronizer
from litex.gen import *
from liteiclink.serdes.gth4_ultrascale import GTHChannelPLL
from liteeth.common import *
from liteeth.phy.pcs_1000basex import *
@ -69,6 +71,10 @@ class USP_GTH_1000BASEX(LiteXModule):
rx_data = Signal(20)
rx_reset_done = Signal()
pll = GTHChannelPLL(refclk, refclk_freq, self.linerate)
self.submodules.pll = pll
print(pll)
gth_params = dict(
p_ACJTAG_DEBUG_MODE = 0b0,
p_ACJTAG_MODE = 0b0,
@ -136,11 +142,11 @@ class USP_GTH_1000BASEX(LiteXModule):
p_CPLL_CFG1 = 0b0000000000100011,
p_CPLL_CFG2 = 0b0000000000000010,
p_CPLL_CFG3 = 0b000000,
p_CPLL_FBDIV = {200e6: 5, 156.25e6: 4}[refclk_freq],
p_CPLL_FBDIV_45 = {200e6: 5, 156.25e6: 4}[refclk_freq],
p_CPLL_FBDIV = pll.config["n2"],
p_CPLL_FBDIV_45 = pll.config["n1"],
p_CPLL_INIT_CFG0 = 0b0000001010110010,
p_CPLL_LOCK_CFG = 0b0000000111101000,
p_CPLL_REFCLK_DIV = {200e6: 2, 156.25e6: 1}[refclk_freq],
p_CPLL_REFCLK_DIV = pll.config["m"],
p_CTLE3_OCAP_EXT_CTRL = 0b000,
p_CTLE3_OCAP_EXT_EN = 0b0,
p_DDI_REALIGN_WAIT = 15,
@ -332,7 +338,7 @@ class USP_GTH_1000BASEX(LiteXModule):
p_RXOOB_CFG = 0b000000110,
p_RXOOB_CLK_CFG = "PMA",
p_RXOSCALRESET_TIME = 0b00011,
p_RXOUT_DIV = {1.25e9 : 4, 3.125e9 : 2}[self.linerate],
p_RXOUT_DIV = pll.config["d"],
p_RXPCSRESET_TIME = 0b00011,
p_RXPHBEACON_CFG = 0b0000000000000000,
p_RXPHDLY_CFG = 0b0010000001110000,
@ -443,7 +449,7 @@ class USP_GTH_1000BASEX(LiteXModule):
p_TXFIFO_ADDR_CFG = "LOW",
p_TXGBOX_FIFO_INIT_RD_ADDR = 4,
p_TXGEARBOX_EN = "FALSE",
p_TXOUT_DIV = {1.25e9 : 4, 3.125e9 : 2}[self.linerate],
p_TXOUT_DIV = pll.config["d"],
p_TXPCSRESET_TIME = 0b00011,
p_TXPHDLY_CFG0 = 0b0110000001110000,
p_TXPHDLY_CFG1 = 0b0000000000001111,

18
liteeth/phy/usp_gty_1000basex.py
View File

@ -1,7 +1,7 @@
#
# This file is part of LiteEth.
#
# Copyright (c) 2019-2023 Florent Kermarrec <florent@enjoy-digital.fr>
# Copyright (c) 2019-2024 Florent Kermarrec <florent@enjoy-digital.fr>
# Copyright (c) 2018 Sebastien Bourdeauducq <sb@m-labs.hk>
# SPDX-License-Identifier: BSD-2-Clause
@ -11,6 +11,8 @@ from migen.genlib.cdc import PulseSynchronizer
from litex.gen import *
from liteiclink.serdes.gty_ultrascale import GTYChannelPLL
from liteeth.common import *
from liteeth.phy.pcs_1000basex import *
@ -69,6 +71,10 @@ class USP_GTY_1000BASEX(LiteXModule):
rx_data = Signal(20)
rx_reset_done = Signal()
pll = GTYChannelPLL(refclk, refclk_freq, self.linerate)
self.submodules.pll = pll
print(pll)
gty_params = dict(
p_ACJTAG_DEBUG_MODE = 0b0,
p_ACJTAG_MODE = 0b0,
@ -137,11 +143,11 @@ class USP_GTY_1000BASEX(LiteXModule):
p_CPLL_CFG1 = 0b0000000000101011,
p_CPLL_CFG2 = 0b0000000000000010,
p_CPLL_CFG3 = 0b0000000000000000,
p_CPLL_FBDIV = {200e6: 5, 156.25e6: 4}[refclk_freq],
p_CPLL_FBDIV_45 = {200e6: 5, 156.25e6: 4}[refclk_freq],
p_CPLL_FBDIV = pll.config["n2"],
p_CPLL_FBDIV_45 = pll.config["n1"],
p_CPLL_INIT_CFG0 = 0b0000001010110010,
p_CPLL_LOCK_CFG = 0b0000000111101000,
p_CPLL_REFCLK_DIV = {200e6: 2, 156.25e6: 1}[refclk_freq],
p_CPLL_REFCLK_DIV = pll.config["m"],
p_CTLE3_OCAP_EXT_CTRL = 0b000,
p_CTLE3_OCAP_EXT_EN = 0b0,
p_DDI_CTRL = 0b00,
@ -355,7 +361,7 @@ class USP_GTY_1000BASEX(LiteXModule):
p_RXOOB_CFG = 0b000000110,
p_RXOOB_CLK_CFG = "PMA",
p_RXOSCALRESET_TIME = 0b00011,
p_RXOUT_DIV = {1.25e9 : 4, 3.125e9 : 2}[self.linerate],
p_RXOUT_DIV = pll.config["d"],
p_RXPCSRESET_TIME = 0b00011,
p_RXPHBEACON_CFG = 0b0000000000000000,
p_RXPHDLY_CFG = 0b0010000001110000,
@ -467,7 +473,7 @@ class USP_GTY_1000BASEX(LiteXModule):
p_TXFIFO_ADDR_CFG = "LOW",
p_TXGBOX_FIFO_INIT_RD_ADDR = 4,
p_TXGEARBOX_EN = "FALSE",
p_TXOUT_DIV = {1.25e9 : 4, 3.125e9 : 2}[self.linerate],
p_TXOUT_DIV = pll.config["d"],
p_TXPCSRESET_TIME = 0b00011,
p_TXPHDLY_CFG0 = 0b0110000001110000,
p_TXPHDLY_CFG1 = 0b0000000000001111,