fpga/mqnic: Update MAC instances

Signed-off-by: Alex Forencich <[email protected]>
ucsdsysnet · Feb 11, 2024 · 8ff8a0b · 8ff8a0b
1 parent be98d7a
commit 8ff8a0b
Show file tree

Hide file tree

Showing 22 changed files with 236 additions and 81 deletions.
diff --git a/fpga/mqnic/250_SoC/fpga_25g/rtl/fpga_core.v b/fpga/mqnic/250_SoC/fpga_25g/rtl/fpga_core.v
@@ -1004,13 +1004,12 @@ generate
             .MIN_FRAME_LENGTH(MIN_FRAME_LENGTH),
             .PTP_PERIOD_NS(IF_PTP_PERIOD_NS),
             .PTP_PERIOD_FNS(IF_PTP_PERIOD_FNS),
-            .TX_PTP_TS_ENABLE(PTP_TS_ENABLE),
-            .TX_PTP_TS_WIDTH(PTP_TS_WIDTH),
+            .PTP_TS_ENABLE(PTP_TS_ENABLE),
+            .PTP_TS_FMT_TOD(1),
+            .PTP_TS_WIDTH(PTP_TS_WIDTH),
             .TX_PTP_TS_CTRL_IN_TUSER(0),
             .TX_PTP_TAG_ENABLE(PTP_TS_ENABLE),
             .TX_PTP_TAG_WIDTH(TX_TAG_WIDTH),
-            .RX_PTP_TS_ENABLE(PTP_TS_ENABLE),
-            .RX_PTP_TS_WIDTH(PTP_TS_WIDTH),
             .TX_USER_WIDTH(AXIS_ETH_TX_USER_WIDTH),
             .RX_USER_WIDTH(AXIS_ETH_RX_USER_WIDTH),
             .PFC_ENABLE(PFC_ENABLE),

diff --git a/fpga/mqnic/520N_MX/fpga_25g/rtl/fpga_core.v b/fpga/mqnic/520N_MX/fpga_25g/rtl/fpga_core.v
@@ -778,13 +778,12 @@ generate
             .MIN_FRAME_LENGTH(MIN_FRAME_LENGTH),
             .PTP_PERIOD_NS(IF_PTP_PERIOD_NS),
             .PTP_PERIOD_FNS(IF_PTP_PERIOD_FNS),
-            .TX_PTP_TS_ENABLE(PTP_TS_ENABLE),
-            .TX_PTP_TS_WIDTH(PTP_TS_WIDTH),
+            .PTP_TS_ENABLE(PTP_TS_ENABLE),
+            .PTP_TS_FMT_TOD(1),
+            .PTP_TS_WIDTH(PTP_TS_WIDTH),
             .TX_PTP_TS_CTRL_IN_TUSER(0),
             .TX_PTP_TAG_ENABLE(PTP_TS_ENABLE),
             .TX_PTP_TAG_WIDTH(TX_TAG_WIDTH),
-            .RX_PTP_TS_ENABLE(PTP_TS_ENABLE),
-            .RX_PTP_TS_WIDTH(PTP_TS_WIDTH),
             .TX_USER_WIDTH(AXIS_ETH_TX_USER_WIDTH),
             .RX_USER_WIDTH(AXIS_ETH_RX_USER_WIDTH),
             .PFC_ENABLE(PFC_ENABLE),

diff --git a/fpga/mqnic/ADM_PCIE_9V3/fpga_25g/rtl/fpga_core.v b/fpga/mqnic/ADM_PCIE_9V3/fpga_25g/rtl/fpga_core.v
@@ -1093,13 +1093,12 @@ generate
             .MIN_FRAME_LENGTH(MIN_FRAME_LENGTH),
             .PTP_PERIOD_NS(IF_PTP_PERIOD_NS),
             .PTP_PERIOD_FNS(IF_PTP_PERIOD_FNS),
-            .TX_PTP_TS_ENABLE(PTP_TS_ENABLE),
-            .TX_PTP_TS_WIDTH(PTP_TS_WIDTH),
+            .PTP_TS_ENABLE(PTP_TS_ENABLE),
+            .PTP_TS_FMT_TOD(1),
+            .PTP_TS_WIDTH(PTP_TS_WIDTH),
             .TX_PTP_TS_CTRL_IN_TUSER(0),
             .TX_PTP_TAG_ENABLE(PTP_TS_ENABLE),
             .TX_PTP_TAG_WIDTH(TX_TAG_WIDTH),
-            .RX_PTP_TS_ENABLE(PTP_TS_ENABLE),
-            .RX_PTP_TS_WIDTH(PTP_TS_WIDTH),
             .TX_USER_WIDTH(AXIS_ETH_TX_USER_WIDTH),
             .RX_USER_WIDTH(AXIS_ETH_RX_USER_WIDTH),
             .PFC_ENABLE(PFC_ENABLE),

diff --git a/fpga/mqnic/Alveo/fpga_25g/rtl/fpga_core.v b/fpga/mqnic/Alveo/fpga_25g/rtl/fpga_core.v
@@ -1002,13 +1002,12 @@ generate
             .MIN_FRAME_LENGTH(MIN_FRAME_LENGTH),
             .PTP_PERIOD_NS(IF_PTP_PERIOD_NS),
             .PTP_PERIOD_FNS(IF_PTP_PERIOD_FNS),
-            .TX_PTP_TS_ENABLE(PTP_TS_ENABLE),
-            .TX_PTP_TS_WIDTH(PTP_TS_WIDTH),
+            .PTP_TS_ENABLE(PTP_TS_ENABLE),
+            .PTP_TS_FMT_TOD(1),
+            .PTP_TS_WIDTH(PTP_TS_WIDTH),
             .TX_PTP_TS_CTRL_IN_TUSER(0),
             .TX_PTP_TAG_ENABLE(PTP_TS_ENABLE),
             .TX_PTP_TAG_WIDTH(TX_TAG_WIDTH),
-            .RX_PTP_TS_ENABLE(PTP_TS_ENABLE),
-            .RX_PTP_TS_WIDTH(PTP_TS_WIDTH),
             .TX_USER_WIDTH(AXIS_ETH_TX_USER_WIDTH),
             .RX_USER_WIDTH(AXIS_ETH_RX_USER_WIDTH),
             .PFC_ENABLE(PFC_ENABLE),

diff --git a/fpga/mqnic/DK_DEV_1SMX_H_A/fpga_25g/rtl/fpga_core.v b/fpga/mqnic/DK_DEV_1SMX_H_A/fpga_25g/rtl/fpga_core.v
@@ -744,13 +744,12 @@ generate
             .MIN_FRAME_LENGTH(MIN_FRAME_LENGTH),
             .PTP_PERIOD_NS(IF_PTP_PERIOD_NS),
             .PTP_PERIOD_FNS(IF_PTP_PERIOD_FNS),
-            .TX_PTP_TS_ENABLE(PTP_TS_ENABLE),
-            .TX_PTP_TS_WIDTH(PTP_TS_WIDTH),
+            .PTP_TS_ENABLE(PTP_TS_ENABLE),
+            .PTP_TS_FMT_TOD(1),
+            .PTP_TS_WIDTH(PTP_TS_WIDTH),
             .TX_PTP_TS_CTRL_IN_TUSER(0),
             .TX_PTP_TAG_ENABLE(PTP_TS_ENABLE),
             .TX_PTP_TAG_WIDTH(TX_TAG_WIDTH),
-            .RX_PTP_TS_ENABLE(PTP_TS_ENABLE),
-            .RX_PTP_TS_WIDTH(PTP_TS_WIDTH),
             .TX_USER_WIDTH(AXIS_ETH_TX_USER_WIDTH),
             .RX_USER_WIDTH(AXIS_ETH_RX_USER_WIDTH),
             .PFC_ENABLE(PFC_ENABLE),

diff --git a/fpga/mqnic/DNPCIe_40G_KU_LL_2QSFP/fpga/rtl/fpga_core.v b/fpga/mqnic/DNPCIe_40G_KU_LL_2QSFP/fpga/rtl/fpga_core.v
@@ -1100,13 +1100,12 @@ generate
             .MIN_FRAME_LENGTH(MIN_FRAME_LENGTH),
             .PTP_PERIOD_NS(IF_PTP_PERIOD_NS),
             .PTP_PERIOD_FNS(IF_PTP_PERIOD_FNS),
-            .TX_PTP_TS_ENABLE(PTP_TS_ENABLE),
-            .TX_PTP_TS_WIDTH(PTP_TS_WIDTH),
+            .PTP_TS_ENABLE(PTP_TS_ENABLE),
+            .PTP_TS_FMT_TOD(1),
+            .PTP_TS_WIDTH(PTP_TS_WIDTH),
             .TX_PTP_TS_CTRL_IN_TUSER(0),
             .TX_PTP_TAG_ENABLE(PTP_TS_ENABLE),
             .TX_PTP_TAG_WIDTH(TX_TAG_WIDTH),
-            .RX_PTP_TS_ENABLE(PTP_TS_ENABLE),
-            .RX_PTP_TS_WIDTH(PTP_TS_WIDTH),
             .TX_USER_WIDTH(AXIS_ETH_TX_USER_WIDTH),
             .RX_USER_WIDTH(AXIS_ETH_RX_USER_WIDTH),
             .PFC_ENABLE(PFC_ENABLE),

diff --git a/fpga/mqnic/KR260/fpga/rtl/fpga_core.v b/fpga/mqnic/KR260/fpga/rtl/fpga_core.v
@@ -689,13 +689,12 @@ generate
             .MIN_FRAME_LENGTH(MIN_FRAME_LENGTH),
             .PTP_PERIOD_NS(IF_PTP_PERIOD_NS),
             .PTP_PERIOD_FNS(IF_PTP_PERIOD_FNS),
-            .TX_PTP_TS_ENABLE(PTP_TS_ENABLE),
-            .TX_PTP_TS_WIDTH(PTP_TS_WIDTH),
+            .PTP_TS_ENABLE(PTP_TS_ENABLE),
+            .PTP_TS_FMT_TOD(1),
+            .PTP_TS_WIDTH(PTP_TS_WIDTH),
             .TX_PTP_TS_CTRL_IN_TUSER(0),
             .TX_PTP_TAG_ENABLE(PTP_TS_ENABLE),
             .TX_PTP_TAG_WIDTH(TX_TAG_WIDTH),
-            .RX_PTP_TS_ENABLE(PTP_TS_ENABLE),
-            .RX_PTP_TS_WIDTH(PTP_TS_WIDTH),
             .TX_USER_WIDTH(AXIS_ETH_TX_USER_WIDTH),
             .RX_USER_WIDTH(AXIS_ETH_RX_USER_WIDTH),
             .PFC_ENABLE(PFC_ENABLE),

diff --git a/fpga/mqnic/NetFPGA_SUME/fpga/rtl/fpga_core.v b/fpga/mqnic/NetFPGA_SUME/fpga/rtl/fpga_core.v
@@ -646,13 +646,12 @@ generate
             .MIN_FRAME_LENGTH(MIN_FRAME_LENGTH),
             .PTP_PERIOD_NS(IF_PTP_PERIOD_NS),
             .PTP_PERIOD_FNS(IF_PTP_PERIOD_FNS),
-            .TX_PTP_TS_ENABLE(PTP_TS_ENABLE),
-            .TX_PTP_TS_WIDTH(PTP_TS_WIDTH),
+            .PTP_TS_ENABLE(PTP_TS_ENABLE),
+            .PTP_TS_FMT_TOD(1),
+            .PTP_TS_WIDTH(PTP_TS_WIDTH),
             .TX_PTP_TS_CTRL_IN_TUSER(0),
             .TX_PTP_TAG_ENABLE(PTP_TS_ENABLE),
             .TX_PTP_TAG_WIDTH(TX_TAG_WIDTH),
-            .RX_PTP_TS_ENABLE(PTP_TS_ENABLE),
-            .RX_PTP_TS_WIDTH(PTP_TS_WIDTH),
             .TX_USER_WIDTH(AXIS_ETH_TX_USER_WIDTH),
             .RX_USER_WIDTH(AXIS_ETH_RX_USER_WIDTH),
             .PFC_ENABLE(PFC_ENABLE),

diff --git a/fpga/mqnic/Nexus_K3P_Q/fpga_25g/rtl/fpga_core.v b/fpga/mqnic/Nexus_K3P_Q/fpga_25g/rtl/fpga_core.v
@@ -1135,13 +1135,12 @@ generate
             .MIN_FRAME_LENGTH(MIN_FRAME_LENGTH),
             .PTP_PERIOD_NS(IF_PTP_PERIOD_NS),
             .PTP_PERIOD_FNS(IF_PTP_PERIOD_FNS),
-            .TX_PTP_TS_ENABLE(PTP_TS_ENABLE),
-            .TX_PTP_TS_WIDTH(PTP_TS_WIDTH),
+            .PTP_TS_ENABLE(PTP_TS_ENABLE),
+            .PTP_TS_FMT_TOD(1),
+            .PTP_TS_WIDTH(PTP_TS_WIDTH),
             .TX_PTP_TS_CTRL_IN_TUSER(0),
             .TX_PTP_TAG_ENABLE(PTP_TS_ENABLE),
             .TX_PTP_TAG_WIDTH(TX_TAG_WIDTH),
-            .RX_PTP_TS_ENABLE(PTP_TS_ENABLE),
-            .RX_PTP_TS_WIDTH(PTP_TS_WIDTH),
             .TX_USER_WIDTH(AXIS_ETH_TX_USER_WIDTH),
             .RX_USER_WIDTH(AXIS_ETH_RX_USER_WIDTH),
             .PFC_ENABLE(PFC_ENABLE),

diff --git a/fpga/mqnic/Nexus_K3P_S/fpga_25g/rtl/fpga_core.v b/fpga/mqnic/Nexus_K3P_S/fpga_25g/rtl/fpga_core.v
@@ -920,13 +920,12 @@ generate
             .MIN_FRAME_LENGTH(MIN_FRAME_LENGTH),
             .PTP_PERIOD_NS(IF_PTP_PERIOD_NS),
             .PTP_PERIOD_FNS(IF_PTP_PERIOD_FNS),
-            .TX_PTP_TS_ENABLE(PTP_TS_ENABLE),
-            .TX_PTP_TS_WIDTH(PTP_TS_WIDTH),
+            .PTP_TS_ENABLE(PTP_TS_ENABLE),
+            .PTP_TS_FMT_TOD(1),
+            .PTP_TS_WIDTH(PTP_TS_WIDTH),
             .TX_PTP_TS_CTRL_IN_TUSER(0),
             .TX_PTP_TAG_ENABLE(PTP_TS_ENABLE),
             .TX_PTP_TAG_WIDTH(TX_TAG_WIDTH),
-            .RX_PTP_TS_ENABLE(PTP_TS_ENABLE),
-            .RX_PTP_TS_WIDTH(PTP_TS_WIDTH),
             .TX_USER_WIDTH(AXIS_ETH_TX_USER_WIDTH),
             .RX_USER_WIDTH(AXIS_ETH_RX_USER_WIDTH),
             .PFC_ENABLE(PFC_ENABLE),

diff --git a/fpga/mqnic/VCU108/fpga_25g/rtl/fpga_core.v b/fpga/mqnic/VCU108/fpga_25g/rtl/fpga_core.v
@@ -906,13 +906,12 @@ generate
             .MIN_FRAME_LENGTH(MIN_FRAME_LENGTH),
             .PTP_PERIOD_NS(IF_PTP_PERIOD_NS),
             .PTP_PERIOD_FNS(IF_PTP_PERIOD_FNS),
-            .TX_PTP_TS_ENABLE(PTP_TS_ENABLE),
-            .TX_PTP_TS_WIDTH(PTP_TS_WIDTH),
+            .PTP_TS_ENABLE(PTP_TS_ENABLE),
+            .PTP_TS_FMT_TOD(1),
+            .PTP_TS_WIDTH(PTP_TS_WIDTH),
             .TX_PTP_TS_CTRL_IN_TUSER(0),
             .TX_PTP_TAG_ENABLE(PTP_TS_ENABLE),
             .TX_PTP_TAG_WIDTH(TX_TAG_WIDTH),
-            .RX_PTP_TS_ENABLE(PTP_TS_ENABLE),
-            .RX_PTP_TS_WIDTH(PTP_TS_WIDTH),
             .TX_USER_WIDTH(AXIS_ETH_TX_USER_WIDTH),
             .RX_USER_WIDTH(AXIS_ETH_RX_USER_WIDTH),
             .PFC_ENABLE(PFC_ENABLE),

diff --git a/fpga/mqnic/VCU118/fpga_25g/rtl/fpga_core.v b/fpga/mqnic/VCU118/fpga_25g/rtl/fpga_core.v
@@ -1049,13 +1049,12 @@ generate
             .MIN_FRAME_LENGTH(MIN_FRAME_LENGTH),
             .PTP_PERIOD_NS(IF_PTP_PERIOD_NS),
             .PTP_PERIOD_FNS(IF_PTP_PERIOD_FNS),
-            .TX_PTP_TS_ENABLE(PTP_TS_ENABLE),
-            .TX_PTP_TS_WIDTH(PTP_TS_WIDTH),
+            .PTP_TS_ENABLE(PTP_TS_ENABLE),
+            .PTP_TS_FMT_TOD(1),
+            .PTP_TS_WIDTH(PTP_TS_WIDTH),
             .TX_PTP_TS_CTRL_IN_TUSER(0),
             .TX_PTP_TAG_ENABLE(PTP_TS_ENABLE),
             .TX_PTP_TAG_WIDTH(TX_TAG_WIDTH),
-            .RX_PTP_TS_ENABLE(PTP_TS_ENABLE),
-            .RX_PTP_TS_WIDTH(PTP_TS_WIDTH),
             .TX_USER_WIDTH(AXIS_ETH_TX_USER_WIDTH),
             .RX_USER_WIDTH(AXIS_ETH_RX_USER_WIDTH),
             .PFC_ENABLE(PFC_ENABLE),

diff --git a/fpga/mqnic/XUPP3R/fpga_25g/rtl/fpga_core.v b/fpga/mqnic/XUPP3R/fpga_25g/rtl/fpga_core.v
@@ -1426,13 +1426,12 @@ generate
             .MIN_FRAME_LENGTH(MIN_FRAME_LENGTH),
             .PTP_PERIOD_NS(IF_PTP_PERIOD_NS),
             .PTP_PERIOD_FNS(IF_PTP_PERIOD_FNS),
-            .TX_PTP_TS_ENABLE(PTP_TS_ENABLE),
-            .TX_PTP_TS_WIDTH(PTP_TS_WIDTH),
+            .PTP_TS_ENABLE(PTP_TS_ENABLE),
+            .PTP_TS_FMT_TOD(1),
+            .PTP_TS_WIDTH(PTP_TS_WIDTH),
             .TX_PTP_TS_CTRL_IN_TUSER(0),
             .TX_PTP_TAG_ENABLE(PTP_TS_ENABLE),
             .TX_PTP_TAG_WIDTH(TX_TAG_WIDTH),
-            .RX_PTP_TS_ENABLE(PTP_TS_ENABLE),
-            .RX_PTP_TS_WIDTH(PTP_TS_WIDTH),
             .TX_USER_WIDTH(AXIS_ETH_TX_USER_WIDTH),
             .RX_USER_WIDTH(AXIS_ETH_RX_USER_WIDTH),
             .PFC_ENABLE(PFC_ENABLE),

diff --git a/fpga/mqnic/ZCU102/fpga/rtl/fpga_core.v b/fpga/mqnic/ZCU102/fpga/rtl/fpga_core.v
@@ -773,13 +773,12 @@ generate
             .MIN_FRAME_LENGTH(MIN_FRAME_LENGTH),
             .PTP_PERIOD_NS(IF_PTP_PERIOD_NS),
             .PTP_PERIOD_FNS(IF_PTP_PERIOD_FNS),
-            .TX_PTP_TS_ENABLE(PTP_TS_ENABLE),
-            .TX_PTP_TS_WIDTH(PTP_TS_WIDTH),
+            .PTP_TS_ENABLE(PTP_TS_ENABLE),
+            .PTP_TS_FMT_TOD(1),
+            .PTP_TS_WIDTH(PTP_TS_WIDTH),
             .TX_PTP_TS_CTRL_IN_TUSER(0),
             .TX_PTP_TAG_ENABLE(PTP_TS_ENABLE),
             .TX_PTP_TAG_WIDTH(TX_TAG_WIDTH),
-            .RX_PTP_TS_ENABLE(PTP_TS_ENABLE),
-            .RX_PTP_TS_WIDTH(PTP_TS_WIDTH),
             .TX_USER_WIDTH(AXIS_ETH_TX_USER_WIDTH),
             .RX_USER_WIDTH(AXIS_ETH_RX_USER_WIDTH),
             .PFC_ENABLE(PFC_ENABLE),

diff --git a/fpga/mqnic/ZCU102/fpga/rtl/fpga_core_custom_port_demo.v b/fpga/mqnic/ZCU102/fpga/rtl/fpga_core_custom_port_demo.v
@@ -911,13 +911,12 @@ generate
             .MIN_FRAME_LENGTH(MIN_FRAME_LENGTH),
             .PTP_PERIOD_NS(IF_PTP_PERIOD_NS),
             .PTP_PERIOD_FNS(IF_PTP_PERIOD_FNS),
-            .TX_PTP_TS_ENABLE(PTP_TS_ENABLE),
-            .TX_PTP_TS_WIDTH(PTP_TS_WIDTH),
+            .PTP_TS_ENABLE(PTP_TS_ENABLE),
+            .PTP_TS_FMT_TOD(1),
+            .PTP_TS_WIDTH(PTP_TS_WIDTH),
             .TX_PTP_TS_CTRL_IN_TUSER(0),
             .TX_PTP_TAG_ENABLE(PTP_TS_ENABLE),
             .TX_PTP_TAG_WIDTH(TX_TAG_WIDTH),
-            .RX_PTP_TS_ENABLE(PTP_TS_ENABLE),
-            .RX_PTP_TS_WIDTH(PTP_TS_WIDTH),
             .TX_USER_WIDTH(AXIS_ETH_TX_USER_WIDTH),
             .RX_USER_WIDTH(AXIS_ETH_RX_USER_WIDTH),
             .PFC_ENABLE(PFC_ENABLE),

diff --git a/fpga/mqnic/ZCU106/fpga_pcie/rtl/fpga.v b/fpga/mqnic/ZCU106/fpga_pcie/rtl/fpga.v
@@ -74,6 +74,8 @@ module fpga #
     parameter TX_CHECKSUM_ENABLE = 1,
     parameter RX_HASH_ENABLE = 1,
     parameter RX_CHECKSUM_ENABLE = 1,
+    parameter LFC_ENABLE = PFC_ENABLE,
+    parameter PFC_ENABLE = 1,
     parameter ENABLE_PADDING = 1,
     parameter ENABLE_DIC = 1,
     parameter MIN_FRAME_LENGTH = 64,
@@ -1077,6 +1079,8 @@ fpga_core #(
     .TX_CHECKSUM_ENABLE(TX_CHECKSUM_ENABLE),
     .RX_HASH_ENABLE(RX_HASH_ENABLE),
     .RX_CHECKSUM_ENABLE(RX_CHECKSUM_ENABLE),
+    .PFC_ENABLE(PFC_ENABLE),
+    .LFC_ENABLE(LFC_ENABLE),
     .ENABLE_PADDING(ENABLE_PADDING),
     .ENABLE_DIC(ENABLE_DIC),
     .MIN_FRAME_LENGTH(MIN_FRAME_LENGTH),