Merge pull request #174 from enjoy-digital/1000basex_fixes_cleanup

1000basex fixes cleanup.
enjoy-digital · Oct 15, 2024 · efcbebe · efcbebe
2 parents 78b8f9e + 1699837
commit efcbebe
Show file tree

Hide file tree

Showing 7 changed files with 194 additions and 213 deletions.
diff --git a/liteeth/phy/a7_1000basex.py b/liteeth/phy/a7_1000basex.py
@@ -90,7 +90,7 @@ def __init__(self, qpll_channel, data_pads, sys_clk_freq, with_csr=True,
             # RX Byte and Word Alignment Attributes
             p_ALIGN_COMMA_DOUBLE         = "FALSE",
             p_ALIGN_COMMA_ENABLE         = 0b1111111111,
-            p_ALIGN_COMMA_WORD           = 1,
+            p_ALIGN_COMMA_WORD           = 2,
             p_ALIGN_MCOMMA_DET           = "TRUE",
             p_ALIGN_MCOMMA_VALUE         = 0b1010000011,
             p_ALIGN_PCOMMA_DET           = "TRUE",
@@ -212,7 +212,7 @@ def __init__(self, qpll_channel, data_pads, sys_clk_freq, with_csr=True,
 
             # CDR Attributes
             p_RXCDR_CFG                  = {
-                1.25e9  : 0x0001107FE086021101010,
+                1.25e9  : 0x0000107FE106001041010,
                 3.125e9 : 0x0000107FE206001041010,
             }[self.linerate],
             p_RXCDR_FR_RESET_ON_EIDLE    = 0b0,
@@ -505,9 +505,9 @@ def __init__(self, qpll_channel, data_pads, sys_clk_freq, with_csr=True,
             o_RXBYTEISALIGNED      = Open(),
             o_RXBYTEREALIGN        = Open(),
             o_RXCOMMADET           = Open(),
-            i_RXCOMMADETEN         = 0,
-            i_RXMCOMMAALIGNEN      = 0,
-            i_RXPCOMMAALIGNEN      = 0,
+            i_RXCOMMADETEN         = 0b1,
+            i_RXMCOMMAALIGNEN      = pcs.align,
+            i_RXPCOMMAALIGNEN      = pcs.align,
             i_RXSLIDE              = 0,
             # Receive Ports - RX Channel Bonding Ports
             o_RXCHANBONDSEQ        = Open(),

diff --git a/liteeth/phy/k7_1000basex.py b/liteeth/phy/k7_1000basex.py
@@ -484,9 +484,9 @@ def __init__(self, refclk_or_clk_pads, data_pads, sys_clk_freq, refclk_freq=200e
             o_RXBYTEISALIGNED  = Open(),
             o_RXBYTEREALIGN    = Open(),
             o_RXCOMMADET       = Open(),
-            i_RXCOMMADETEN     = 1,
-            i_RXMCOMMAALIGNEN  = 1,
-            i_RXPCOMMAALIGNEN  = 1,
+            i_RXCOMMADETEN     = 0b1,
+            i_RXMCOMMAALIGNEN  = pcs.align,
+            i_RXPCOMMAALIGNEN  = pcs.align,
 
             # Receive Ports - RX Channel Bonding Ports
             o_RXCHANBONDSEQ    = Open(),

diff --git a/liteeth/phy/ku_1000basex.py b/liteeth/phy/ku_1000basex.py
@@ -536,7 +536,7 @@ def __init__(self, refclk_or_clk_pads, data_pads, sys_clk_freq, refclk_freq=200e
             i_RXCHBONDLEVEL       = 0b000,
             i_RXCHBONDMASTER      = 0b0,
             i_RXCHBONDSLAVE       = 0b0,
-            i_RXCOMMADETEN        = 0b0,
+            i_RXCOMMADETEN        = 0b1,
             i_RXDFEAGCCTRL        = 0b01,
             i_RXDFEAGCHOLD        = 0b0,
             i_RXDFEAGCOVRDEN      = 0b0,
@@ -593,7 +593,7 @@ def __init__(self, refclk_or_clk_pads, data_pads, sys_clk_freq, refclk_freq=200e
             i_RXLPMLFKLOVRDEN     = 0b0,
             i_RXLPMOSHOLD         = 0b0,
             i_RXLPMOSOVRDEN       = 0b0,
-            i_RXMCOMMAALIGNEN     = 0b0,
+            i_RXMCOMMAALIGNEN     = pcs.align,
             i_RXMONITORSEL        = 0b00,
             i_RXOOBRESET          = 0b0,
             i_RXOSCALRESET        = 0b0,
@@ -606,7 +606,7 @@ def __init__(self, refclk_or_clk_pads, data_pads, sys_clk_freq, refclk_freq=200e
             i_RXOSINTTESTOVRDEN   = 0b0,
             i_RXOSOVRDEN          = 0b0,
             i_RXOUTCLKSEL         = 0b101,
-            i_RXPCOMMAALIGNEN     = 0b0,
+            i_RXPCOMMAALIGNEN     = pcs.align,
             i_RXPCSRESET          = 0b0,
             i_RXPD                = 0b00,
             i_RXPHALIGNEN         = 0b0,