From 664a633d2908e360a1c9f254aa362f1d98a9cc3b Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Tue, 23 Jan 2024 15:44:33 +0100 Subject: [PATCH] liteeth/phy: Fix 2500basex linerate. --- liteeth/phy/a7_1000basex.py | 10 +++++----- liteeth/phy/k7_1000basex.py | 2 +- liteeth/phy/ku_1000basex.py | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/liteeth/phy/a7_1000basex.py b/liteeth/phy/a7_1000basex.py index d0a14b9..8ccb0c6 100644 --- a/liteeth/phy/a7_1000basex.py +++ b/liteeth/phy/a7_1000basex.py @@ -203,8 +203,8 @@ class A7_1000BASEX(LiteXModule): # CDR Attributes p_RXCDR_CFG = { - 1.25e9 : 0x0001107FE086021101010, - 2.5e9 : 0x0000107FE206001041010, + 1.25e9 : 0x0001107FE086021101010, + 3.125e9 : 0x0000107FE206001041010, }[self.linerate], p_RXCDR_FR_RESET_ON_EIDLE = 0b0, p_RXCDR_HOLD_DURING_EIDLE = 0b0, @@ -323,10 +323,10 @@ class A7_1000BASEX(LiteXModule): p_SATA_PLL_CFG = "VCO_3000MHZ", # RX Fabric Clock Output Control Attributes - p_RXOUT_DIV = {1.25e9 : 4, 2.5e9 : 2}[self.linerate], + p_RXOUT_DIV = {1.25e9 : 4, 3.125e9 : 2}[self.linerate], # TX Fabric Clock Output Control Attributes - p_TXOUT_DIV = {1.25e9 : 4, 2.5e9 : 2}[self.linerate], + p_TXOUT_DIV = {1.25e9 : 4, 3.125e9 : 2}[self.linerate], # RX Phase Interpolator Attributes p_RXPI_CFG0 = 0b000, @@ -785,6 +785,6 @@ class A7_1000BASEX(LiteXModule): # A7_2500BASEX PHY --------------------------------------------------------------------------------- class A7_2500BASEX(A7_1000BASEX): - linerate = 2.5e9 + linerate = 3.125e9 rx_clk_freq = 312.5e6 tx_clk_freq = 312.5e6 diff --git a/liteeth/phy/k7_1000basex.py b/liteeth/phy/k7_1000basex.py index 96bb401..8ac4852 100644 --- a/liteeth/phy/k7_1000basex.py +++ b/liteeth/phy/k7_1000basex.py @@ -802,6 +802,6 @@ class K7_1000BASEX(LiteXModule): # K7_2500BASEX PHY --------------------------------------------------------------------------------- class K7_2500BASEX(K7_1000BASEX): - linerate = 2.5e9 + linerate = 3.125e9 rx_clk_freq = 312.5e6 tx_clk_freq = 312.5e6 diff --git a/liteeth/phy/ku_1000basex.py b/liteeth/phy/ku_1000basex.py index 372900f..c79f882 100644 --- a/liteeth/phy/ku_1000basex.py +++ b/liteeth/phy/ku_1000basex.py @@ -291,7 +291,7 @@ class KU_1000BASEX(LiteXModule): p_RXOOB_CFG = 0b000000110, p_RXOOB_CLK_CFG = "PMA", p_RXOSCALRESET_TIME = 0b00011, - p_RXOUT_DIV = {1.25e9 : 4, 2.5e9 : 2}[self.linerate], + p_RXOUT_DIV = {1.25e9 : 4, 3.125e9 : 2}[self.linerate], p_RXPCSRESET_TIME = 0b00011, p_RXPHBEACON_CFG = 0b0000000000000000, p_RXPHDLY_CFG = 0b0010000000100000, @@ -396,7 +396,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, 2.5e9 : 2}[self.linerate], + p_TXOUT_DIV = {1.25e9 : 4, 3.125e9 : 2}[self.linerate], p_TXPCSRESET_TIME = 0b00011, p_TXPHDLY_CFG0 = 0b0010000000100000, p_TXPHDLY_CFG1 = 0b0000000001110101, @@ -860,6 +860,6 @@ class KU_1000BASEX(LiteXModule): # KU_2500BASEX PHY --------------------------------------------------------------------------------- class KU_2500BASEX(KU_1000BASEX): - linerate = 2.5e9 + linerate = 3.125e9 rx_clk_freq = 312.5e6 tx_clk_freq = 312.5e6