From 614b33a2054ed0f45ac7ff72dfb58cbf44f80c40 Mon Sep 17 00:00:00 2001
From: Alex Forencich <alex@alexforencich.com>
Date: Tue, 14 Nov 2023 18:19:29 -0800
Subject: [PATCH] fpga/mqnic/DK_DEV_1SDX_P_A: Fix MAC timing constraints for
 DK-DEV-1SDX-P-A

Signed-off-by: Alex Forencich <alex@alexforencich.com>
---
 fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/fpga.sdc | 13 --------
 .../fpga_100g/fpga_100g/Makefile              |  3 +-
 .../fpga_100g_app_dma_bench/Makefile          |  3 +-
 .../fpga_100g/fpga_10g/Makefile               |  3 +-
 .../fpga_100g/fpga_25g/Makefile               |  3 +-
 .../DK_DEV_1SDX_P_A/fpga_100g/mac_100g.sdc    | 12 ++++++++
 .../DK_DEV_1SDX_P_A/fpga_100g/mac_25g.sdc     | 30 +++++++++++++++++++
 7 files changed, 50 insertions(+), 17 deletions(-)
 create mode 100644 fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/mac_100g.sdc
 create mode 100644 fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/mac_25g.sdc

diff --git a/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/fpga.sdc b/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/fpga.sdc
index 3f5d00cf3..136d7f948 100644
--- a/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/fpga.sdc
+++ b/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/fpga.sdc
@@ -92,16 +92,3 @@ set_clock_groups -asynchronous -group [ get_clocks "pcie_hip_inst|intel_pcie_pti
 
 # PTP ref clock
 set_clock_groups -asynchronous -group [ get_clocks "ref_div_inst|stratix10_clkctrl_0|clkdiv_inst|clock_div2" ]
-
-# E-Tile MACs
-proc constrain_etile_mac { inst } {
-    puts "Inserting timing constraints for MAC $inst"
-
-    set_clock_groups -asynchronous -group [ get_clocks "$inst|mac_inst|alt_ehipc3_0|alt_ehipc3_hard_inst|E100GX4_FEC_PTP_PR.nphy_ptp0|alt_ehipc3_nphy_elane_ptp|tx_clkout|ch0" ]
-    set_clock_groups -asynchronous -group [ get_clocks "$inst|mac_inst|alt_ehipc3_0|alt_ehipc3_hard_inst|E100GX4_FEC_PTP_PR.nphy_ptp1|alt_ehipc3_nphy_elane_ptp|tx_clkout|ch0" ]
-
-    constrain_sync_reset_inst "$inst|.mac_reset_sync_inst"
-}
-
-constrain_etile_mac "qsfp1_mac_inst"
-constrain_etile_mac "qsfp2_mac_inst"
diff --git a/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/fpga_100g/Makefile b/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/fpga_100g/Makefile
index 8e28b24af..dd09941a7 100644
--- a/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/fpga_100g/Makefile
+++ b/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/fpga_100g/Makefile
@@ -125,7 +125,8 @@ IP_TCL_FILES += ip/ref_div.tcl
 QSF_FILES = fpga.qsf
 
 # SDC files
-SDC_FILES = fpga.sdc
+SDC_FILES += fpga.sdc
+SDC_FILES += mac_100g.sdc
 
 # Configuration
 CONFIG_TCL_FILES = ./config.tcl
diff --git a/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/fpga_100g_app_dma_bench/Makefile b/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/fpga_100g_app_dma_bench/Makefile
index a61d0d3c7..9668268d7 100644
--- a/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/fpga_100g_app_dma_bench/Makefile
+++ b/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/fpga_100g_app_dma_bench/Makefile
@@ -127,7 +127,8 @@ IP_TCL_FILES += ip/ref_div.tcl
 QSF_FILES = fpga.qsf
 
 # SDC files
-SDC_FILES = fpga.sdc
+SDC_FILES += fpga.sdc
+SDC_FILES += mac_100g.sdc
 
 # Configuration
 CONFIG_TCL_FILES = ./config.tcl
diff --git a/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/fpga_10g/Makefile b/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/fpga_10g/Makefile
index c8f691bd2..86ff4198d 100644
--- a/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/fpga_10g/Makefile
+++ b/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/fpga_10g/Makefile
@@ -126,7 +126,8 @@ IP_TCL_FILES += ip/ref_div.tcl
 QSF_FILES = fpga.qsf
 
 # SDC files
-SDC_FILES = fpga.sdc
+SDC_FILES += fpga.sdc
+SDC_FILES += mac_25g.sdc
 
 # Configuration
 CONFIG_TCL_FILES = ./config.tcl
diff --git a/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/fpga_25g/Makefile b/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/fpga_25g/Makefile
index 0f79736a7..10b29fa05 100644
--- a/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/fpga_25g/Makefile
+++ b/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/fpga_25g/Makefile
@@ -126,7 +126,8 @@ IP_TCL_FILES += ip/ref_div.tcl
 QSF_FILES = fpga.qsf
 
 # SDC files
-SDC_FILES = fpga.sdc
+SDC_FILES += fpga.sdc
+SDC_FILES += mac_25g.sdc
 
 # Configuration
 CONFIG_TCL_FILES = ./config.tcl
diff --git a/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/mac_100g.sdc b/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/mac_100g.sdc
new file mode 100644
index 000000000..0cc9ba335
--- /dev/null
+++ b/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/mac_100g.sdc
@@ -0,0 +1,12 @@
+# E-Tile MACs
+proc constrain_etile_mac { inst } {
+    puts "Inserting timing constraints for MAC $inst"
+
+    set_clock_groups -asynchronous -group [ get_clocks "$inst|mac_inst|alt_ehipc3_0|alt_ehipc3_hard_inst|E100GX4_FEC_PTP_PR.nphy_ptp0|alt_ehipc3_nphy_elane_ptp|tx_clkout|ch0" ]
+    set_clock_groups -asynchronous -group [ get_clocks "$inst|mac_inst|alt_ehipc3_0|alt_ehipc3_hard_inst|E100GX4_FEC_PTP_PR.nphy_ptp1|alt_ehipc3_nphy_elane_ptp|tx_clkout|ch0" ]
+
+    constrain_sync_reset_inst "$inst|.mac_reset_sync_inst"
+}
+
+constrain_etile_mac "qsfp1_mac_inst"
+constrain_etile_mac "qsfp2_mac_inst"
diff --git a/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/mac_25g.sdc b/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/mac_25g.sdc
new file mode 100644
index 000000000..f535b9c81
--- /dev/null
+++ b/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/mac_25g.sdc
@@ -0,0 +1,30 @@
+# E-Tile MACs
+set_clock_groups -asynchronous -group [ get_clocks "iopll_etile_ptp_inst|iopll_0_refclk" ]
+set_clock_groups -asynchronous -group [ get_clocks "iopll_etile_ptp_inst|iopll_0_outclk0" ]
+
+proc constrain_etile_mac_quad { inst } {
+    puts "Inserting timing constraints for MAC quad $inst"
+
+    for {set i 0} {$i < 4} {incr i} {
+        set_clock_groups -asynchronous -group [ get_clocks "$inst|mac_inst|alt_ehipc3_0|alt_ehipc3_hard_inst|SL_NPHY.altera_xcvr_native_inst|alt_ehipc3_nphy_elane|rx_clkout2|ch${i}" ]
+        set_clock_groups -asynchronous -group [ get_clocks "$inst|mac_inst|alt_ehipc3_0|alt_ehipc3_hard_inst|SL_NPHY.altera_xcvr_native_inst|alt_ehipc3_nphy_elane|rx_clkout|ch${i}" ]
+        set_clock_groups -asynchronous -group [ get_clocks "$inst|mac_inst|alt_ehipc3_0|alt_ehipc3_hard_inst|SL_NPHY.altera_xcvr_native_inst|alt_ehipc3_nphy_elane|tx_clkout2|ch${i}" ]
+        set_clock_groups -asynchronous -group [ get_clocks "$inst|mac_inst|alt_ehipc3_0|alt_ehipc3_hard_inst|SL_NPHY.altera_xcvr_native_inst|alt_ehipc3_nphy_elane|tx_clkout|ch${i}" ]
+        set_clock_groups -asynchronous -group [ get_clocks "$inst|mac_inst|alt_ehipc3_0|alt_ehipc3_hard_inst|SL_NPHY_RSFEC.altera_xcvr_native_inst|alt_ehipc3_nphy_elane|rx_clkout2|ch${i}" ]
+        set_clock_groups -asynchronous -group [ get_clocks "$inst|mac_inst|alt_ehipc3_0|alt_ehipc3_hard_inst|SL_NPHY_RSFEC.altera_xcvr_native_inst|alt_ehipc3_nphy_elane|rx_clkout|ch${i}" ]
+        set_clock_groups -asynchronous -group [ get_clocks "$inst|mac_inst|alt_ehipc3_0|alt_ehipc3_hard_inst|SL_NPHY_RSFEC.altera_xcvr_native_inst|alt_ehipc3_nphy_elane|tx_clkout2|ch${i}" ]
+        set_clock_groups -asynchronous -group [ get_clocks "$inst|mac_inst|alt_ehipc3_0|alt_ehipc3_hard_inst|SL_NPHY_RSFEC.altera_xcvr_native_inst|alt_ehipc3_nphy_elane|tx_clkout|ch${i}" ]
+    }
+
+    set_clock_groups -asynchronous -group [ get_clocks "$inst|mac_inst|alt_ehipc3_0|alt_ehipc3_hard_inst|SL_PTP_NPHY_CHPLL.nphy_ptp0|alt_ehipc3_nphy_elane_ptp|tx_clkout|ch0" ]
+    set_clock_groups -asynchronous -group [ get_clocks "$inst|mac_inst|alt_ehipc3_0|alt_ehipc3_hard_inst|SL_PTP_NPHY_CHPLL.nphy_ptp1|alt_ehipc3_nphy_elane_ptp_plloff|tx_transfer_clk|ch0" ]
+
+    for {set i 0} {$i < 4} {incr i} {
+        constrain_sync_reset_inst "$inst|mac_ch[$i].mac_tx_reset_sync_inst"
+        constrain_sync_reset_inst "$inst|mac_ch[$i].mac_tx_ptp_reset_sync_inst"
+        constrain_sync_reset_inst "$inst|mac_ch[$i].mac_rx_ptp_reset_sync_inst"
+    }
+}
+
+constrain_etile_mac_quad "qsfp1_mac_inst"
+constrain_etile_mac_quad "qsfp2_mac_inst"