diff --git a/fpga/common/rtl/mqnic_interface_rx.v b/fpga/common/rtl/mqnic_interface_rx.v
index c6356ae72..900eb9c1b 100644
--- a/fpga/common/rtl/mqnic_interface_rx.v
+++ b/fpga/common/rtl/mqnic_interface_rx.v
@@ -53,6 +53,7 @@ module mqnic_interface_rx #
parameter DMA_ADDR_WIDTH = 64,
parameter DMA_LEN_WIDTH = 16,
parameter DMA_TAG_WIDTH = 16,
+ parameter DMA_CLIENT_LEN_WIDTH = DMA_LEN_WIDTH,
parameter RAM_ADDR_WIDTH = $clog2(RX_RAM_SIZE),
parameter RAM_SEG_COUNT = 2,
parameter RAM_SEG_DATA_WIDTH = 256*2/RAM_SEG_COUNT,
@@ -222,7 +223,6 @@ module mqnic_interface_rx #
);
parameter DMA_CLIENT_TAG_WIDTH = $clog2(RX_DESC_TABLE_SIZE);
-parameter DMA_CLIENT_LEN_WIDTH = DMA_LEN_WIDTH;
parameter REQ_TAG_WIDTH = $clog2(RX_DESC_TABLE_SIZE);
diff --git a/fpga/common/rtl/mqnic_interface_tx.v b/fpga/common/rtl/mqnic_interface_tx.v
index bc365a9f5..9613290d5 100644
--- a/fpga/common/rtl/mqnic_interface_tx.v
+++ b/fpga/common/rtl/mqnic_interface_tx.v
@@ -53,6 +53,7 @@ module mqnic_interface_tx #
parameter DMA_ADDR_WIDTH = 64,
parameter DMA_LEN_WIDTH = 16,
parameter DMA_TAG_WIDTH = 16,
+ parameter DMA_CLIENT_LEN_WIDTH = DMA_LEN_WIDTH,
parameter RAM_ADDR_WIDTH = $clog2(TX_RAM_SIZE),
parameter RAM_SEG_COUNT = 2,
parameter RAM_SEG_DATA_WIDTH = 256*2/RAM_SEG_COUNT,
@@ -208,7 +209,6 @@ module mqnic_interface_tx #
);
parameter DMA_CLIENT_TAG_WIDTH = $clog2(TX_DESC_TABLE_SIZE);
-parameter DMA_CLIENT_LEN_WIDTH = DMA_LEN_WIDTH;
wire [AXIS_DESC_DATA_WIDTH-1:0] tx_fifo_desc_tdata;
wire [AXIS_DESC_KEEP_WIDTH-1:0] tx_fifo_desc_tkeep;
diff --git a/fpga/common/tb/cmac_pad/sim_build/test_cmac_pad/ax6me1mp_results.xml b/fpga/common/tb/cmac_pad/sim_build/test_cmac_pad/ax6me1mp_results.xml
new file mode 100644
index 000000000..bae980fe9
--- /dev/null
+++ b/fpga/common/tb/cmac_pad/sim_build/test_cmac_pad/ax6me1mp_results.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/fpga/common/tb/cmac_pad/sim_build/test_cmac_pad/q285ux5n_results.xml b/fpga/common/tb/cmac_pad/sim_build/test_cmac_pad/q285ux5n_results.xml
new file mode 100644
index 000000000..a9be45956
--- /dev/null
+++ b/fpga/common/tb/cmac_pad/sim_build/test_cmac_pad/q285ux5n_results.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/fpga/common/tb/cpl_queue_manager/sim_build/test_cpl_queue_manager/h1dmhgdz_results.xml b/fpga/common/tb/cpl_queue_manager/sim_build/test_cpl_queue_manager/h1dmhgdz_results.xml
new file mode 100644
index 000000000..27aa52002
--- /dev/null
+++ b/fpga/common/tb/cpl_queue_manager/sim_build/test_cpl_queue_manager/h1dmhgdz_results.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/fpga/common/tb/cpl_queue_manager/sim_build/test_cpl_queue_manager/zp5g120k_results.xml b/fpga/common/tb/cpl_queue_manager/sim_build/test_cpl_queue_manager/zp5g120k_results.xml
new file mode 100644
index 000000000..35f3d2b07
--- /dev/null
+++ b/fpga/common/tb/cpl_queue_manager/sim_build/test_cpl_queue_manager/zp5g120k_results.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/fpga/common/tb/mqnic_core_axi/sim_build/test_mqnic_core_axi-1-1-128-64-64-0-0/bewhw82z_results.xml b/fpga/common/tb/mqnic_core_axi/sim_build/test_mqnic_core_axi-1-1-128-64-64-0-0/bewhw82z_results.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/fpga/common/tb/mqnic_core_axi/sim_build/test_mqnic_core_axi-1-1-128-64-64-0-0/n_gmicw__results.xml b/fpga/common/tb/mqnic_core_axi/sim_build/test_mqnic_core_axi-1-1-128-64-64-0-0/n_gmicw__results.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/fpga/common/tb/mqnic_core_axi/sim_build/test_mqnic_core_axi-1-1-128-64-64-1-0/bjslinn6_results.xml b/fpga/common/tb/mqnic_core_axi/sim_build/test_mqnic_core_axi-1-1-128-64-64-1-0/bjslinn6_results.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/fpga/common/tb/mqnic_core_axi/sim_build/test_mqnic_core_axi-1-1-128-64-64-1-0/jdqon2ah_results.xml b/fpga/common/tb/mqnic_core_axi/sim_build/test_mqnic_core_axi-1-1-128-64-64-1-0/jdqon2ah_results.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/fpga/common/tb/mqnic_core_axi/sim_build/test_mqnic_core_axi-1-2-128-64-64-1-0/b1ah1613_results.xml b/fpga/common/tb/mqnic_core_axi/sim_build/test_mqnic_core_axi-1-2-128-64-64-1-0/b1ah1613_results.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/fpga/common/tb/mqnic_core_axi/sim_build/test_mqnic_core_axi-1-2-128-64-64-1-0/nyqtfxad_results.xml b/fpga/common/tb/mqnic_core_axi/sim_build/test_mqnic_core_axi-1-2-128-64-64-1-0/nyqtfxad_results.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/fpga/common/tb/mqnic_core_pcie_ptile/sim_build/test_mqnic_core_pcie_ptile-1-1-256-64-64-0-0/_dpaurrk_results.xml b/fpga/common/tb/mqnic_core_pcie_ptile/sim_build/test_mqnic_core_pcie_ptile-1-1-256-64-64-0-0/_dpaurrk_results.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/fpga/common/tb/mqnic_core_pcie_ptile/sim_build/test_mqnic_core_pcie_ptile-1-1-256-64-64-0-0/c3xdbn2i_results.xml b/fpga/common/tb/mqnic_core_pcie_ptile/sim_build/test_mqnic_core_pcie_ptile-1-1-256-64-64-0-0/c3xdbn2i_results.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/fpga/common/tb/mqnic_core_pcie_ptile/sim_build/test_mqnic_core_pcie_ptile-1-1-256-64-64-1-0/swrq1_72_results.xml b/fpga/common/tb/mqnic_core_pcie_ptile/sim_build/test_mqnic_core_pcie_ptile-1-1-256-64-64-1-0/swrq1_72_results.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/fpga/common/tb/mqnic_core_pcie_ptile/sim_build/test_mqnic_core_pcie_ptile-1-1-256-64-64-1-0/vps5pfkd_results.xml b/fpga/common/tb/mqnic_core_pcie_ptile/sim_build/test_mqnic_core_pcie_ptile-1-1-256-64-64-1-0/vps5pfkd_results.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/fpga/common/tb/mqnic_core_pcie_ptile/sim_build/test_mqnic_core_pcie_ptile-1-1-512-512-512-1-0/04l3n826_results.xml b/fpga/common/tb/mqnic_core_pcie_ptile/sim_build/test_mqnic_core_pcie_ptile-1-1-512-512-512-1-0/04l3n826_results.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/fpga/common/tb/mqnic_core_pcie_ptile/sim_build/test_mqnic_core_pcie_ptile-1-1-512-512-512-1-0/m33w71we_results.xml b/fpga/common/tb/mqnic_core_pcie_ptile/sim_build/test_mqnic_core_pcie_ptile-1-1-512-512-512-1-0/m33w71we_results.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/fpga/common/tb/mqnic_core_pcie_ptile/sim_build/test_mqnic_core_pcie_ptile-1-1-512-64-64-1-0/jam_8nm2_results.xml b/fpga/common/tb/mqnic_core_pcie_ptile/sim_build/test_mqnic_core_pcie_ptile-1-1-512-64-64-1-0/jam_8nm2_results.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/fpga/common/tb/mqnic_core_pcie_ptile/sim_build/test_mqnic_core_pcie_ptile-1-1-512-64-64-1-0/vf8q5kbi_results.xml b/fpga/common/tb/mqnic_core_pcie_ptile/sim_build/test_mqnic_core_pcie_ptile-1-1-512-64-64-1-0/vf8q5kbi_results.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/fpga/common/tb/mqnic_core_pcie_ptile/sim_build/test_mqnic_core_pcie_ptile-1-2-256-64-64-1-0/3i32i0be_results.xml b/fpga/common/tb/mqnic_core_pcie_ptile/sim_build/test_mqnic_core_pcie_ptile-1-2-256-64-64-1-0/3i32i0be_results.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/fpga/common/tb/mqnic_core_pcie_ptile/sim_build/test_mqnic_core_pcie_ptile-1-2-256-64-64-1-0/_q9ctxdh_results.xml b/fpga/common/tb/mqnic_core_pcie_ptile/sim_build/test_mqnic_core_pcie_ptile-1-2-256-64-64-1-0/_q9ctxdh_results.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/fpga/common/tb/mqnic_core_pcie_s10/sim_build/test_mqnic_core_pcie_s10-1-1-256-64-128-1-0/4zqzv3or_results.xml b/fpga/common/tb/mqnic_core_pcie_s10/sim_build/test_mqnic_core_pcie_s10-1-1-256-64-128-1-0/4zqzv3or_results.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/fpga/common/tb/mqnic_core_pcie_s10/sim_build/test_mqnic_core_pcie_s10-1-1-256-64-128-1-0/vmeafg62_results.xml b/fpga/common/tb/mqnic_core_pcie_s10/sim_build/test_mqnic_core_pcie_s10-1-1-256-64-128-1-0/vmeafg62_results.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/fpga/common/tb/mqnic_core_pcie_s10/sim_build/test_mqnic_core_pcie_s10-1-1-256-64-64-1-1/7rrf0kqr_results.xml b/fpga/common/tb/mqnic_core_pcie_s10/sim_build/test_mqnic_core_pcie_s10-1-1-256-64-64-1-1/7rrf0kqr_results.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/fpga/common/tb/mqnic_core_pcie_s10/sim_build/test_mqnic_core_pcie_s10-1-1-256-64-64-1-1/e4xh8dwe_results.xml b/fpga/common/tb/mqnic_core_pcie_s10/sim_build/test_mqnic_core_pcie_s10-1-1-256-64-64-1-1/e4xh8dwe_results.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/fpga/common/tb/mqnic_core_pcie_s10/sim_build/test_mqnic_core_pcie_s10-1-1-512-64-128-1-0/hfpyob84_results.xml b/fpga/common/tb/mqnic_core_pcie_s10/sim_build/test_mqnic_core_pcie_s10-1-1-512-64-128-1-0/hfpyob84_results.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/fpga/common/tb/mqnic_core_pcie_s10/sim_build/test_mqnic_core_pcie_s10-1-1-512-64-128-1-0/qzbu0ydz_results.xml b/fpga/common/tb/mqnic_core_pcie_s10/sim_build/test_mqnic_core_pcie_s10-1-1-512-64-128-1-0/qzbu0ydz_results.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/fpga/common/tb/mqnic_core_pcie_s10/sim_build/test_mqnic_core_pcie_s10-2-1-256-64-64-1-0/c3r5ecyn_results.xml b/fpga/common/tb/mqnic_core_pcie_s10/sim_build/test_mqnic_core_pcie_s10-2-1-256-64-64-1-0/c3r5ecyn_results.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/fpga/common/tb/mqnic_core_pcie_s10/sim_build/test_mqnic_core_pcie_s10-2-1-256-64-64-1-0/j1pc_d_f_results.xml b/fpga/common/tb/mqnic_core_pcie_s10/sim_build/test_mqnic_core_pcie_s10-2-1-256-64-64-1-0/j1pc_d_f_results.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/fpga/common/tb/mqnic_core_pcie_us/sim_build/test_mqnic_core_pcie_us-1-1-256-64-64-0-0/a_obyo2j_results.xml b/fpga/common/tb/mqnic_core_pcie_us/sim_build/test_mqnic_core_pcie_us-1-1-256-64-64-0-0/a_obyo2j_results.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/fpga/common/tb/mqnic_core_pcie_us/sim_build/test_mqnic_core_pcie_us-1-1-256-64-64-0-0/hqheoxv3_results.xml b/fpga/common/tb/mqnic_core_pcie_us/sim_build/test_mqnic_core_pcie_us-1-1-256-64-64-0-0/hqheoxv3_results.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/fpga/common/tb/mqnic_core_pcie_us/sim_build/test_mqnic_core_pcie_us-1-1-256-64-64-1-0/fm95asb__results.xml b/fpga/common/tb/mqnic_core_pcie_us/sim_build/test_mqnic_core_pcie_us-1-1-256-64-64-1-0/fm95asb__results.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/fpga/common/tb/mqnic_core_pcie_us/sim_build/test_mqnic_core_pcie_us-1-1-256-64-64-1-0/h0ymec5h_results.xml b/fpga/common/tb/mqnic_core_pcie_us/sim_build/test_mqnic_core_pcie_us-1-1-256-64-64-1-0/h0ymec5h_results.xml
new file mode 100644
index 000000000..e69de29bb
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
index ef4a5170e..f07f2d3e8 100644
--- a/fpga/mqnic/Nexus_K3P_S/fpga_25g/rtl/fpga_core.v
+++ b/fpga/mqnic/Nexus_K3P_S/fpga_25g/rtl/fpga_core.v
@@ -425,6 +425,9 @@ wire sfp_i2c_select_scl_o;
wire sfp_i2c_select_sda_o;
wire [7:0] sfp_i2c_select;
+reg sfp_i2c_scl_o_reg = 1'b1;
+reg sfp_i2c_sda_o_reg = 1'b1;
+
wire sfp_i2c_scl_i_int = sfp_i2c_scl_i & sfp_i2c_scl_o;
wire sfp_i2c_sda_i_int = (sfp_1_i2c_sda_i || !sfp_i2c_select[0]) && (sfp_2_i2c_sda_i || !sfp_i2c_select[1]) & sfp_i2c_sda_o_reg & sfp_i2c_select_sda_o;
@@ -433,9 +436,6 @@ reg sfp_1_rs_reg = 1'b0;
reg sfp_2_tx_disable_reg = 1'b0;
reg sfp_2_rs_reg = 1'b0;
-reg sfp_i2c_scl_o_reg = 1'b1;
-reg sfp_i2c_sda_o_reg = 1'b1;
-
reg eeprom_i2c_scl_o_reg = 1'b1;
reg eeprom_i2c_sda_o_reg = 1'b1;