eth: Clean up MAC wrappers

Signed-off-by: Alex Forencich <alex@alexforencich.com>

src/eth/rtl/us/taxi_eth_phy_10g_us_gt.sv

@@ -390,7 +390,7 @@ if (SIM) begin : xcvr
     assign xcvr_qpll0clk_out = 1'b0;
     assign xcvr_qpll0refclk_out = xcvr_gtrefclk00_in;
 
-    assign xcvr_qpll1lock_out = !gt_qpll1_reset && !gt_qpll0_pd;
+    assign xcvr_qpll1lock_out = !gt_qpll1_reset && !gt_qpll1_pd;
     assign xcvr_qpll1clk_out = 1'b0;
     assign xcvr_qpll1refclk_out = xcvr_gtrefclk01_in;
 
@@ -902,6 +902,10 @@ end else if (!HAS_COMMON && GT_TYPE == "GTY") begin : xcvr
     assign xcvr_qpll0clk_out = 1'b0;
     assign xcvr_qpll0refclk_out = 1'b0;
 
+    assign xcvr_qpll1lock_out = 1'b0;
+    assign xcvr_qpll1clk_out = 1'b0;
+    assign xcvr_qpll1refclk_out = 1'b0;
+
 end else if (!HAS_COMMON && GT_TYPE == "GTH") begin : xcvr
     // UltraScale/UltraScale+ GTH (channel only)
 
@@ -995,6 +999,10 @@ end else if (!HAS_COMMON && GT_TYPE == "GTH") begin : xcvr
     assign xcvr_qpll0clk_out = 1'b0;
     assign xcvr_qpll0refclk_out = 1'b0;
 
+    assign xcvr_qpll1lock_out = 1'b0;
+    assign xcvr_qpll1clk_out = 1'b0;
+    assign xcvr_qpll1refclk_out = 1'b0;
+
 end else begin
 
     $fatal(0, "Error: invalid configuration (%m)");

src/eth/rtl/us/taxi_eth_phy_10g_us_gt_ll.sv

@@ -48,7 +48,7 @@ module taxi_eth_phy_10g_us_gt_ll #
     parameter logic GT_RX_POLARITY = 1'b0,
 
     // MAC/PHY parameters
-    parameter DATA_W = 64,
+    parameter DATA_W = 32,
     parameter HDR_W = 2
 )
 (
@@ -426,7 +426,7 @@ if (SIM) begin : xcvr
     assign xcvr_qpll0clk_out = 1'b0;
     assign xcvr_qpll0refclk_out = xcvr_gtrefclk00_in;
 
-    assign xcvr_qpll1lock_out = !gt_qpll1_reset && !gt_qpll0_pd;
+    assign xcvr_qpll1lock_out = !gt_qpll1_reset && !gt_qpll1_pd;
     assign xcvr_qpll1clk_out = 1'b0;
     assign xcvr_qpll1refclk_out = xcvr_gtrefclk01_in;
 
@@ -978,6 +978,10 @@ end else if (!HAS_COMMON && GT_TYPE == "GTY") begin : xcvr
     assign xcvr_qpll0clk_out = 1'b0;
     assign xcvr_qpll0refclk_out = 1'b0;
 
+    assign xcvr_qpll1lock_out = 1'b0;
+    assign xcvr_qpll1clk_out = 1'b0;
+    assign xcvr_qpll1refclk_out = 1'b0;
+
 end else if (!HAS_COMMON && GT_TYPE == "GTH") begin : xcvr
     // UltraScale/UltraScale+ GTH (channel only)
 
@@ -1079,6 +1083,10 @@ end else if (!HAS_COMMON && GT_TYPE == "GTH") begin : xcvr
     assign xcvr_qpll0clk_out = 1'b0;
     assign xcvr_qpll0refclk_out = 1'b0;
 
+    assign xcvr_qpll1lock_out = 1'b0;
+    assign xcvr_qpll1clk_out = 1'b0;
+    assign xcvr_qpll1refclk_out = 1'b0;
+
 end else begin
 
     $fatal(0, "Error: invalid configuration (%m)");

src/eth/rtl/us/taxi_eth_phy_25g_us_gt.sv

@@ -390,7 +390,7 @@ if (SIM) begin : xcvr
     assign xcvr_qpll0clk_out = 1'b0;
     assign xcvr_qpll0refclk_out = xcvr_gtrefclk00_in;
 
-    assign xcvr_qpll1lock_out = !gt_qpll1_reset && !gt_qpll0_pd;
+    assign xcvr_qpll1lock_out = !gt_qpll1_reset && !gt_qpll1_pd;
     assign xcvr_qpll1clk_out = 1'b0;
     assign xcvr_qpll1refclk_out = xcvr_gtrefclk01_in;
 
@@ -902,6 +902,10 @@ end else if (!HAS_COMMON && GT_TYPE == "GTY") begin : xcvr
     assign xcvr_qpll0clk_out = 1'b0;
     assign xcvr_qpll0refclk_out = 1'b0;
 
+    assign xcvr_qpll1lock_out = 1'b0;
+    assign xcvr_qpll1clk_out = 1'b0;
+    assign xcvr_qpll1refclk_out = 1'b0;
+
 end else if (!HAS_COMMON && GT_TYPE == "GTH") begin : xcvr
     // UltraScale/UltraScale+ GTH (channel only)
 
@@ -995,6 +999,10 @@ end else if (!HAS_COMMON && GT_TYPE == "GTH") begin : xcvr
     assign xcvr_qpll0clk_out = 1'b0;
     assign xcvr_qpll0refclk_out = 1'b0;
 
+    assign xcvr_qpll1lock_out = 1'b0;
+    assign xcvr_qpll1clk_out = 1'b0;
+    assign xcvr_qpll1refclk_out = 1'b0;
+
 end else begin
 
     $fatal(0, "Error: invalid configuration (%m)");

src/eth/rtl/us/taxi_eth_phy_25g_us_gt_ll.sv

@@ -470,7 +470,7 @@ if (SIM) begin : xcvr
     assign xcvr_qpll0clk_out = 1'b0;
     assign xcvr_qpll0refclk_out = xcvr_gtrefclk00_in;
 
-    assign xcvr_qpll1lock_out = !gt_qpll1_reset && !gt_qpll0_pd;
+    assign xcvr_qpll1lock_out = !gt_qpll1_reset && !gt_qpll1_pd;
     assign xcvr_qpll1clk_out = 1'b0;
     assign xcvr_qpll1refclk_out = xcvr_gtrefclk01_in;
 
@@ -1022,6 +1022,10 @@ end else if (!HAS_COMMON && GT_TYPE == "GTY") begin : xcvr
     assign xcvr_qpll0clk_out = 1'b0;
     assign xcvr_qpll0refclk_out = 1'b0;
 
+    assign xcvr_qpll1lock_out = 1'b0;
+    assign xcvr_qpll1clk_out = 1'b0;
+    assign xcvr_qpll1refclk_out = 1'b0;
+
 end else if (!HAS_COMMON && GT_TYPE == "GTH") begin : xcvr
     // UltraScale/UltraScale+ GTH (channel only)
 
@@ -1123,6 +1127,10 @@ end else if (!HAS_COMMON && GT_TYPE == "GTH") begin : xcvr
     assign xcvr_qpll0clk_out = 1'b0;
     assign xcvr_qpll0refclk_out = 1'b0;
 
+    assign xcvr_qpll1lock_out = 1'b0;
+    assign xcvr_qpll1clk_out = 1'b0;
+    assign xcvr_qpll1refclk_out = 1'b0;
+
 end else begin
 
     $fatal(0, "Error: invalid configuration (%m)");