diff --git a/library/xilinx/util_adxcvr/util_adxcvr_xch.v b/library/xilinx/util_adxcvr/util_adxcvr_xch.v
index 14b477914..435207e6a 100644
--- a/library/xilinx/util_adxcvr/util_adxcvr_xch.v
+++ b/library/xilinx/util_adxcvr/util_adxcvr_xch.v
@@ -760,11 +760,11 @@ module util_adxcvr_xch #(
     .ACJTAG_DEBUG_MODE (1'b0),
     .ACJTAG_MODE (1'b0),
     .ACJTAG_RESET (1'b0),
-    .ADAPT_CFG0 (16'b1111100000000000),
-    .ADAPT_CFG1 (16'b0000000000000000),
+    .ADAPT_CFG0 (16'hf800),
+    .ADAPT_CFG1 (16'h0000),
     .ALIGN_COMMA_DOUBLE ("FALSE"),
     .ALIGN_COMMA_ENABLE (10'b1111111111),
-    .ALIGN_COMMA_WORD (1'h1),
+    .ALIGN_COMMA_WORD (1),
     .ALIGN_MCOMMA_DET ("TRUE"),
     .ALIGN_MCOMMA_VALUE (10'b1010000011),
     .ALIGN_PCOMMA_DET ("TRUE"),
@@ -775,7 +775,7 @@ module util_adxcvr_xch #(
     .CBCC_DATA_SOURCE_SEL ("DECODED"),
     .CDR_SWAP_MODE_EN (1'b0),
     .CHAN_BOND_KEEP_ALIGN ("FALSE"),
-    .CHAN_BOND_MAX_SKEW (1'h1),
+    .CHAN_BOND_MAX_SKEW (1),
     .CHAN_BOND_SEQ_1_1 (10'b0000000000),
     .CHAN_BOND_SEQ_1_2 (10'b0000000000),
     .CHAN_BOND_SEQ_1_3 (10'b0000000000),
@@ -787,13 +787,13 @@ module util_adxcvr_xch #(
     .CHAN_BOND_SEQ_2_4 (10'b0000000000),
     .CHAN_BOND_SEQ_2_ENABLE (4'b1111),
     .CHAN_BOND_SEQ_2_USE ("FALSE"),
-    .CHAN_BOND_SEQ_LEN (1'h1),
+    .CHAN_BOND_SEQ_LEN (1),
     .CLK_CORRECT_USE ("FALSE"),
     .CLK_COR_KEEP_IDLE ("FALSE"),
     .CLK_COR_MAX_LAT (12),
     .CLK_COR_MIN_LAT (8),
     .CLK_COR_PRECEDENCE ("TRUE"),
-    .CLK_COR_REPEAT_WAIT (1'h0),
+    .CLK_COR_REPEAT_WAIT (0),
     .CLK_COR_SEQ_1_1 (10'b0100000000),
     .CLK_COR_SEQ_1_2 (10'b0100000000),
     .CLK_COR_SEQ_1_3 (10'b0100000000),
@@ -805,17 +805,17 @@ module util_adxcvr_xch #(
     .CLK_COR_SEQ_2_4 (10'b0100000000),
     .CLK_COR_SEQ_2_ENABLE (4'b1111),
     .CLK_COR_SEQ_2_USE ("FALSE"),
-    .CLK_COR_SEQ_LEN (1'h1),
-    .CPLL_CFG0 (16'b0110011111111010),
-    .CPLL_CFG1 (16'b1010010010010100),
-    .CPLL_CFG2 (16'b1111000000000111),
-    .CPLL_CFG3 (6'b000000),
+    .CLK_COR_SEQ_LEN (1),
+    .CPLL_CFG0 (16'h67f8),
+    .CPLL_CFG1 (16'ha4ac),
+    .CPLL_CFG2 (16'h0007),
+    .CPLL_CFG3 (6'h00),
     .CPLL_FBDIV (CPLL_FBDIV),
-    .CPLL_FBDIV_45 (5),
-    .CPLL_INIT_CFG0 (16'b0000000000011110),
-    .CPLL_INIT_CFG1 (8'b00000000),
-    .CPLL_LOCK_CFG (16'b0000000111101000),
-    .CPLL_REFCLK_DIV (1'h1),
+    .CPLL_FBDIV_45 (CPLL_FBDIV_4_5),
+    .CPLL_INIT_CFG0 (16'h02b2),
+    .CPLL_INIT_CFG1 (8'h00),
+    .CPLL_LOCK_CFG (16'h01e8),
+    .CPLL_REFCLK_DIV (1),
     .DDI_CTRL (2'b00),
     .DDI_REALIGN_WAIT (15),
     .DEC_MCOMMA_DETECT ("TRUE"),
@@ -823,30 +823,30 @@ module util_adxcvr_xch #(
     .DEC_VALID_COMMA_ONLY ("FALSE"),
     .DFE_D_X_REL_POS (1'b0),
     .DFE_VCM_COMP_EN (1'b0),
-    .DMONITOR_CFG0 (10'b0000000000),
-    .DMONITOR_CFG1 (8'b00000000),
+    .DMONITOR_CFG0 (10'h000),
+    .DMONITOR_CFG1 (8'h00),
     .ES_CLK_PHASE_SEL (1'b0),
     .ES_CONTROL (6'b000000),
     .ES_ERRDET_EN ("TRUE"),
     .ES_EYE_SCAN_EN ("TRUE"),
-    .ES_HORZ_OFFSET (12'b000000000000),
+    .ES_HORZ_OFFSET (12'h000),
     .ES_PMA_CFG (10'b0000000000),
     .ES_PRESCALE (5'b00000),
-    .ES_QUALIFIER0 (16'b0000000000000000),
-    .ES_QUALIFIER1 (16'b0000000000000000),
-    .ES_QUALIFIER2 (16'b0000000000000000),
-    .ES_QUALIFIER3 (16'b0000000000000000),
-    .ES_QUALIFIER4 (16'b0000000000000000),
-    .ES_QUAL_MASK0 (16'b0000000000000000),
-    .ES_QUAL_MASK1 (16'b0000000000000000),
-    .ES_QUAL_MASK2 (16'b0000000000000000),
-    .ES_QUAL_MASK3 (16'b0000000000000000),
-    .ES_QUAL_MASK4 (16'b0000000000000000),
-    .ES_SDATA_MASK0 (16'b0000000000000000),
-    .ES_SDATA_MASK1 (16'b0000000000000000),
-    .ES_SDATA_MASK2 (16'b0000000000000000),
-    .ES_SDATA_MASK3 (16'b0000000000000000),
-    .ES_SDATA_MASK4 (16'b0000000000000000),
+    .ES_QUALIFIER0 (16'h0000),
+    .ES_QUALIFIER1 (16'h0000),
+    .ES_QUALIFIER2 (16'h0000),
+    .ES_QUALIFIER3 (16'h0000),
+    .ES_QUALIFIER4 (16'h0000),
+    .ES_QUAL_MASK0 (16'h0000),
+    .ES_QUAL_MASK1 (16'h0000),
+    .ES_QUAL_MASK2 (16'h0000),
+    .ES_QUAL_MASK3 (16'h0000),
+    .ES_QUAL_MASK4 (16'h0000),
+    .ES_SDATA_MASK0 (16'h0000),
+    .ES_SDATA_MASK1 (16'h0000),
+    .ES_SDATA_MASK2 (16'h0000),
+    .ES_SDATA_MASK3 (16'h0000),
+    .ES_SDATA_MASK4 (16'h0000),
     .EVODD_PHI_CFG (11'b00000000000),
     .EYE_SCAN_SWAP_EN (1'b0),
     .FTS_DESKEW_SEQ_ENABLE (4'b1111),
@@ -866,22 +866,22 @@ module util_adxcvr_xch #(
     .PCI3_RX_ELECIDLE_HI_COUNT (6'b000000),
     .PCI3_RX_ELECIDLE_LP4_DISABLE (1'b0),
     .PCI3_RX_FIFO_DISABLE (1'b0),
-    .PCIE_BUFG_DIV_CTRL (16'b0011010100001001),
-    .PCIE_RXPCS_CFG_GEN3 (16'b0000001010100100),
-    .PCIE_RXPMA_CFG (16'b0000000000001010),
-    .PCIE_TXPCS_CFG_GEN3 (16'b0010010010100000),
-    .PCIE_TXPMA_CFG (16'b0000000000001010),
+    .PCIE_BUFG_DIV_CTRL (16'h1000),
+    .PCIE_RXPCS_CFG_GEN3 (16'h02a4),
+    .PCIE_RXPMA_CFG (16'h000a),
+    .PCIE_TXPCS_CFG_GEN3 (16'h24a4),
+    .PCIE_TXPMA_CFG (16'h000a),
     .PCS_PCIE_EN ("FALSE"),
     .PCS_RSVD0 (16'b0000000000000000),
     .PCS_RSVD1 (3'b000),
-    .PD_TRANS_TIME_FROM_P2 (12'b000000111100),
-    .PD_TRANS_TIME_NONE_P2 (8'b00011001),
-    .PD_TRANS_TIME_TO_P2 (8'b01100100),
-    .PLL_SEL_MODE_GEN12 (2'b11),
-    .PLL_SEL_MODE_GEN3 (2'b11),
-    .PMA_RSV1 (16'b0001000000000000),
+    .PD_TRANS_TIME_FROM_P2 (12'h03c),
+    .PD_TRANS_TIME_NONE_P2 (8'h19),
+    .PD_TRANS_TIME_TO_P2 (8'h64),
+    .PLL_SEL_MODE_GEN12 (2'h3),
+    .PLL_SEL_MODE_GEN3 (2'h3),
+    .PMA_RSV1 (16'hf000),
     .PROCESS_PAR (3'b010),
-    .RATE_SW_USE_DRP (1'b0),
+    .RATE_SW_USE_DRP (1'b1),
     .RESET_POWERSAVE_DISABLE (1'b0),
     .RXBUFRESET_TIME (5'b00011),
     .RXBUF_ADDR_MODE ("FAST"),
@@ -891,105 +891,105 @@ module util_adxcvr_xch #(
     .RXBUF_RESET_ON_CB_CHANGE ("TRUE"),
     .RXBUF_RESET_ON_COMMAALIGN ("FALSE"),
     .RXBUF_RESET_ON_EIDLE ("FALSE"),
-    .RXBUF_RESET_ON_RATE_CHANGE ("FALSE"),
+    .RXBUF_RESET_ON_RATE_CHANGE ("TRUE"),
     .RXBUF_THRESH_OVFLW (57),
     .RXBUF_THRESH_OVRD ("TRUE"),
     .RXBUF_THRESH_UNDFLW (3),
     .RXCDRFREQRESET_TIME (5'b00001),
     .RXCDRPHRESET_TIME (5'b00001),
-    .RXCDR_CFG0 (16'b0000000000000000),
-    .RXCDR_CFG0_GEN3 (16'b0000000000000000),
-    .RXCDR_CFG1 (16'b0000000000000000),
-    .RXCDR_CFG1_GEN3 (16'b0000000000000000),
-    .RXCDR_CFG2 (16'b0000011101100110),
-    .RXCDR_CFG2_GEN3 (16'b0000011101100110),
-    .RXCDR_CFG3 (16'b0000000000000000),
-    .RXCDR_CFG3_GEN3 (16'b0000000000000000),
-    .RXCDR_CFG4 (16'b0000000000000000),
-    .RXCDR_CFG4_GEN3 (16'b0000000000000000),
-    .RXCDR_CFG5 (16'b0000000000000000),
-    .RXCDR_CFG5_GEN3 (16'b0000000000000000),
+    .RXCDR_CFG0 (16'h0000),
+    .RXCDR_CFG0_GEN3 (16'h0000),
+    .RXCDR_CFG1 (16'h0000),
+    .RXCDR_CFG1_GEN3 (16'h0000),
+    .RXCDR_CFG2 (16'h0766),
+    .RXCDR_CFG2_GEN3 (16'h07e6),
+    .RXCDR_CFG3 (16'h0000),
+    .RXCDR_CFG3_GEN3 (16'h0000),
+    .RXCDR_CFG4 (16'h0000),
+    .RXCDR_CFG4_GEN3 (16'h0000),
+    .RXCDR_CFG5 (16'h0000),
+    .RXCDR_CFG5_GEN3 (16'h0000),
     .RXCDR_FR_RESET_ON_EIDLE (1'b0),
     .RXCDR_HOLD_DURING_EIDLE (1'b0),
-    .RXCDR_LOCK_CFG0 (16'b0100010010000000),
-    .RXCDR_LOCK_CFG1 (16'b0101111111111111),
-    .RXCDR_LOCK_CFG2 (16'b0111011111000011),
+    .RXCDR_LOCK_CFG0 (16'h4480),
+    .RXCDR_LOCK_CFG1 (16'h5fff),
+    .RXCDR_LOCK_CFG2 (16'h77c3),
     .RXCDR_PH_RESET_ON_EIDLE (1'b0),
-    .RXCFOK_CFG0 (16'b0100000000000000),
-    .RXCFOK_CFG1 (16'b0000000001100101),
-    .RXCFOK_CFG2 (16'b0000000000101110),
+    .RXCFOK_CFG0 (16'h4000),
+    .RXCFOK_CFG1 (16'h0065),
+    .RXCFOK_CFG2 (16'h002e),
     .RXDFELPMRESET_TIME (7'b0001111),
-    .RXDFELPM_KL_CFG0 (16'b0000000000000000),
-    .RXDFELPM_KL_CFG1 (16'b0000000000000010),
-    .RXDFELPM_KL_CFG2 (16'b0000000000000000),
-    .RXDFE_CFG0 (16'b0000101000000000),
-    .RXDFE_CFG1 (16'b0000000000000000),
-    .RXDFE_GC_CFG0 (16'b0000000000000000),
-    .RXDFE_GC_CFG1 (16'b0111100001100000),
-    .RXDFE_GC_CFG2 (16'b0000000000000000),
-    .RXDFE_H2_CFG0 (16'b0000000000000000),
-    .RXDFE_H2_CFG1 (16'b0000000000000000),
-    .RXDFE_H3_CFG0 (16'b0100000000000000),
-    .RXDFE_H3_CFG1 (16'b0000000000000000),
-    .RXDFE_H4_CFG0 (16'b0010000000000000),
-    .RXDFE_H4_CFG1 (16'b0000000000000011),
-    .RXDFE_H5_CFG0 (16'b0010000000000000),
-    .RXDFE_H5_CFG1 (16'b0000000000000011),
-    .RXDFE_H6_CFG0 (16'b0010000000000000),
-    .RXDFE_H6_CFG1 (16'b0000000000000000),
-    .RXDFE_H7_CFG0 (16'b0010000000000000),
-    .RXDFE_H7_CFG1 (16'b0000000000000000),
-    .RXDFE_H8_CFG0 (16'b0010000000000000),
-    .RXDFE_H8_CFG1 (16'b0000000000000000),
-    .RXDFE_H9_CFG0 (16'b0010000000000000),
-    .RXDFE_H9_CFG1 (16'b0000000000000000),
-    .RXDFE_HA_CFG0 (16'b0010000000000000),
-    .RXDFE_HA_CFG1 (16'b0000000000000000),
-    .RXDFE_HB_CFG0 (16'b0010000000000000),
-    .RXDFE_HB_CFG1 (16'b0000000000000000),
-    .RXDFE_HC_CFG0 (16'b0000000000000000),
-    .RXDFE_HC_CFG1 (16'b0000000000000000),
-    .RXDFE_HD_CFG0 (16'b0000000000000000),
-    .RXDFE_HD_CFG1 (16'b0000000000000000),
-    .RXDFE_HE_CFG0 (16'b0000000000000000),
-    .RXDFE_HE_CFG1 (16'b0000000000000000),
-    .RXDFE_HF_CFG0 (16'b0000000000000000),
-    .RXDFE_HF_CFG1 (16'b0000000000000000),
-    .RXDFE_OS_CFG0 (16'b1000000000000000),
-    .RXDFE_OS_CFG1 (16'b0000000000000000),
-    .RXDFE_UT_CFG0 (16'b1000000000000000),
-    .RXDFE_UT_CFG1 (16'b0000000000000011),
-    .RXDFE_VP_CFG0 (16'b1010101000000000),
-    .RXDFE_VP_CFG1 (16'b0000000000110011),
-    .RXDLY_CFG (16'b0000000000011111),
-    .RXDLY_LCFG (16'b0000000000110000),
+    .RXDFELPM_KL_CFG0 (16'h0000),
+    .RXDFELPM_KL_CFG1 (16'h0032),
+    .RXDFELPM_KL_CFG2 (16'h0000),
+    .RXDFE_CFG0 (16'h0a00),
+    .RXDFE_CFG1 (16'h0000),
+    .RXDFE_GC_CFG0 (16'h0000),
+    .RXDFE_GC_CFG1 (16'h7870),
+    .RXDFE_GC_CFG2 (16'h0000),
+    .RXDFE_H2_CFG0 (16'h0000),
+    .RXDFE_H2_CFG1 (16'h0000),
+    .RXDFE_H3_CFG0 (16'h4000),
+    .RXDFE_H3_CFG1 (16'h0000),
+    .RXDFE_H4_CFG0 (16'h2000),
+    .RXDFE_H4_CFG1 (16'h0003),
+    .RXDFE_H5_CFG0 (16'h2000),
+    .RXDFE_H5_CFG1 (16'h0003),
+    .RXDFE_H6_CFG0 (16'h2000),
+    .RXDFE_H6_CFG1 (16'h0000),
+    .RXDFE_H7_CFG0 (16'h2000),
+    .RXDFE_H7_CFG1 (16'h0000),
+    .RXDFE_H8_CFG0 (16'h2000),
+    .RXDFE_H8_CFG1 (16'h0000),
+    .RXDFE_H9_CFG0 (16'h2000),
+    .RXDFE_H9_CFG1 (16'h0000),
+    .RXDFE_HA_CFG0 (16'h2000),
+    .RXDFE_HA_CFG1 (16'h0000),
+    .RXDFE_HB_CFG0 (16'h2000),
+    .RXDFE_HB_CFG1 (16'h0000),
+    .RXDFE_HC_CFG0 (16'h0000),
+    .RXDFE_HC_CFG1 (16'h0000),
+    .RXDFE_HD_CFG0 (16'h0000),
+    .RXDFE_HD_CFG1 (16'h0000),
+    .RXDFE_HE_CFG0 (16'h0000),
+    .RXDFE_HE_CFG1 (16'h0000),
+    .RXDFE_HF_CFG0 (16'h0000),
+    .RXDFE_HF_CFG1 (16'h0000),
+    .RXDFE_OS_CFG0 (16'h8000),
+    .RXDFE_OS_CFG1 (16'h0000),
+    .RXDFE_UT_CFG0 (16'h8000),
+    .RXDFE_UT_CFG1 (16'h0003),
+    .RXDFE_VP_CFG0 (16'haa00),
+    .RXDFE_VP_CFG1 (16'h0033),
+    .RXDLY_CFG (16'h001f),
+    .RXDLY_LCFG (16'h0030),
     .RXELECIDLE_CFG ("Sigcfg_4"),
     .RXGBOX_FIFO_INIT_RD_ADDR (4),
     .RXGEARBOX_EN ("FALSE"),
     .RXISCANRESET_TIME (5'b00001),
-    .RXLPM_CFG (16'b0000000000000000),
-    .RXLPM_GC_CFG (16'b0000000000000000),
-    .RXLPM_KH_CFG0 (16'b0000000000000000),
-    .RXLPM_KH_CFG1 (16'b0000000000000010),
-    .RXLPM_OS_CFG0 (16'b1000000000000000),
-    .RXLPM_OS_CFG1 (16'b0000000000000010),
+    .RXLPM_CFG (16'h0000),
+    .RXLPM_GC_CFG (16'h1000),
+    .RXLPM_KH_CFG0 (16'h0000),
+    .RXLPM_KH_CFG1 (16'h0002),
+    .RXLPM_OS_CFG0 (16'h8000),
+    .RXLPM_OS_CFG1 (16'h0002),
     .RXOOB_CFG (9'b000000110),
     .RXOOB_CLK_CFG ("PMA"),
     .RXOSCALRESET_TIME (5'b00011),
     .RXOUT_DIV (RX_OUT_DIV),
     .RXPCSRESET_TIME (5'b00011),
-    .RXPHBEACON_CFG (16'b0000000000000000),
-    .RXPHDLY_CFG (16'b0010000000100000),
-    .RXPHSAMP_CFG (16'b0010000100000000),
-    .RXPHSLIP_CFG (16'b0110011000100010),
+    .RXPHBEACON_CFG (16'h0000),
+    .RXPHDLY_CFG (16'h2020),
+    .RXPHSAMP_CFG (16'h2100),
+    .RXPHSLIP_CFG (16'h6622),
     .RXPH_MONITOR_SEL (5'b00000),
-    .RXPI_CFG0 (2'b00),
-    .RXPI_CFG1 (2'b00),
-    .RXPI_CFG2 (2'b00),
-    .RXPI_CFG3 (2'b00),
+    .RXPI_CFG0 (2'b01),
+    .RXPI_CFG1 (2'b01),
+    .RXPI_CFG2 (2'b01),
+    .RXPI_CFG3 (2'b01),
     .RXPI_CFG4 (1'b0),
     .RXPI_CFG5 (1'b1),
-    .RXPI_CFG6 (3'b000),
+    .RXPI_CFG6 (3'b011),
     .RXPI_LPM (1'b0),
     .RXPI_VREFSEL (1'b0),
     .RXPMACLK_SEL ("DATA"),
@@ -1002,7 +1002,7 @@ module util_adxcvr_xch #(
     .RXSYNC_OVRD (1'b0),
     .RXSYNC_SKIP_DA (1'b0),
     .RX_AFE_CM_EN (1'b0),
-    .RX_BIAS_CFG0 (16'b0000101010110100),
+    .RX_BIAS_CFG0 (16'h0ab4),
     .RX_BUFFER_CFG (6'b000000),
     .RX_CAPFF_SARC_ENB (1'b0),
     .RX_CLK25_DIV (RX_CLK25_DIV),
@@ -1020,11 +1020,11 @@ module util_adxcvr_xch #(
     .RX_DFELPM_CFG1 (1'b1),
     .RX_DFELPM_KLKH_AGC_STUP_EN (1'b1),
     .RX_DFE_AGC_CFG0 (2'b10),
-    .RX_DFE_AGC_CFG1 (3'b100),
+    .RX_DFE_AGC_CFG1 (3'b000),
     .RX_DFE_KL_LPM_KH_CFG0 (2'b01),
-    .RX_DFE_KL_LPM_KH_CFG1 (3'b100),
+    .RX_DFE_KL_LPM_KH_CFG1 (3'b000),
     .RX_DFE_KL_LPM_KL_CFG0 (2'b01),
-    .RX_DFE_KL_LPM_KL_CFG1 (3'b100),
+    .RX_DFE_KL_LPM_KL_CFG1 (3'b000),
     .RX_DFE_LPM_HOLD_DURING_EIDLE (1'b0),
     .RX_DISPERR_SEQ_MATCH ("TRUE"),
     .RX_DIVRESET_TIME (5'b00001),
@@ -1034,14 +1034,14 @@ module util_adxcvr_xch #(
     .RX_EYESCAN_VS_RANGE (2'b00),
     .RX_EYESCAN_VS_UT_SIGN (1'b0),
     .RX_FABINT_USRCLK_FLOP (1'b0),
-    .RX_INT_DATAWIDTH (1'h1),
+    .RX_INT_DATAWIDTH (1),
     .RX_PMA_POWER_SAVE (1'b0),
-    .RX_PROGDIV_CFG (20.0),
-    .RX_SAMPLE_PERIOD (3'b101),
+    .RX_PROGDIV_CFG (0.000000),
+    .RX_SAMPLE_PERIOD (3'b111),
     .RX_SIG_VALID_DLY (11),
     .RX_SUM_DFETAPREP_EN (1'b0),
-    .RX_SUM_IREF_TUNE (4'b0000),
-    .RX_SUM_RES_CTRL (2'b00),
+    .RX_SUM_IREF_TUNE (4'b1100),
+    .RX_SUM_RES_CTRL (2'b11),
     .RX_SUM_VCMTUNE (4'b0000),
     .RX_SUM_VCM_OVWR (1'b0),
     .RX_SUM_VREF_TUNE (3'b000),
@@ -1050,7 +1050,7 @@ module util_adxcvr_xch #(
     .RX_XCLK_SEL ("RXDES"),
     .SAS_MAX_COM (64),
     .SAS_MIN_COM (36),
-    .SATA_BURST_SEQ_LEN (4'b1111),
+    .SATA_BURST_SEQ_LEN (4'b1110),
     .SATA_BURST_VAL (3'b100),
     .SATA_CPLL_CFG ("VCO_3000MHZ"),
     .SATA_EIDLE_VAL (3'b100),
@@ -1061,21 +1061,22 @@ module util_adxcvr_xch #(
     .SATA_MIN_INIT (12),
     .SATA_MIN_WAKE (4),
     .SHOW_REALIGN_COMMA ("TRUE"),
+    .SIM_MODE ("FAST"),
     .SIM_RECEIVER_DETECT_PASS ("TRUE"),
     .SIM_RESET_SPEEDUP ("TRUE"),
     .SIM_TX_EIDLE_DRIVE_LEVEL (1'b0),
     .SIM_VERSION (2),
-    .TAPDLY_SET_TX (2'b00),
+    .TAPDLY_SET_TX (2'h0),
     .TEMPERATUR_PAR (4'b0010),
     .TERM_RCAL_CFG (15'b100001000010000),
     .TERM_RCAL_OVRD (3'b000),
-    .TRANS_TIME_RATE (8'b00001110),
-    .TST_RSV0 (8'b00000000),
-    .TST_RSV1 (8'b00000000),
+    .TRANS_TIME_RATE (8'h0e),
+    .TST_RSV0 (8'h00),
+    .TST_RSV1 (8'h00),
     .TXBUF_EN ("TRUE"),
     .TXBUF_RESET_ON_RATE_CHANGE ("TRUE"),
-    .TXDLY_CFG (16'b0000000000001001),
-    .TXDLY_LCFG (16'b0000000001010000),
+    .TXDLY_CFG (16'h0009),
+    .TXDLY_LCFG (16'h0050),
     .TXDRVBIAS_N (4'b1010),
     .TXDRVBIAS_P (4'b1010),
     .TXFIFO_ADDR_CFG ("LOW"),
@@ -1083,22 +1084,22 @@ module util_adxcvr_xch #(
     .TXGEARBOX_EN ("FALSE"),
     .TXOUT_DIV (TX_OUT_DIV),
     .TXPCSRESET_TIME (5'b00011),
-    .TXPHDLY_CFG0 (16'b0010000000100000),
-    .TXPHDLY_CFG1 (16'b0000000011010101),
-    .TXPH_CFG (16'b0000100110000000),
+    .TXPHDLY_CFG0 (16'h2020),
+    .TXPHDLY_CFG1 (16'h0075),
+    .TXPH_CFG (16'h0980),
     .TXPH_MONITOR_SEL (5'b00000),
-    .TXPI_CFG0 (2'b00),
-    .TXPI_CFG1 (2'b00),
-    .TXPI_CFG2 (2'b00),
+    .TXPI_CFG0 (2'b01),
+    .TXPI_CFG1 (2'b01),
+    .TXPI_CFG2 (2'b01),
     .TXPI_CFG3 (1'b0),
     .TXPI_CFG4 (1'b1),
-    .TXPI_CFG5 (3'b000),
+    .TXPI_CFG5 (3'b011),
     .TXPI_GRAY_SEL (1'b0),
     .TXPI_INVSTROBE_SEL (1'b0),
     .TXPI_LPM (1'b0),
     .TXPI_PPMCLK_SEL ("TXUSRCLK2"),
     .TXPI_PPM_CFG (8'b00000000),
-    .TXPI_SYNFREQ_PPM (3'b000),
+    .TXPI_SYNFREQ_PPM (3'b001),
     .TXPI_VREFSEL (1'b0),
     .TXPMARESET_TIME (5'b00011),
     .TXSYNC_MULTILANE (1'b1),
@@ -1118,7 +1119,7 @@ module util_adxcvr_xch #(
     .TX_EML_PHI_TUNE (1'b0),
     .TX_FABINT_USRCLK_FLOP (1'b0),
     .TX_IDLE_DATA_ZERO (1'b0),
-    .TX_INT_DATAWIDTH (1'h1),
+    .TX_INT_DATAWIDTH (1),
     .TX_LOOPBACK_DRIVE_HIZ ("FALSE"),
     .TX_MAINCURSOR_SEL (1'b0),
     .TX_MARGIN_FULL_0 (7'b1001111),
@@ -1135,288 +1136,122 @@ module util_adxcvr_xch #(
     .TX_PMADATA_OPT (1'b0),
     .TX_PMA_POWER_SAVE (1'b0),
     .TX_PROGCLK_SEL ("PREPI"),
-    .TX_PROGDIV_CFG (20.0),
+    .TX_PROGDIV_CFG (0.000000),
     .TX_QPI_STATUS_EN (1'b0),
-    .TX_RXDETECT_CFG (14'b00000000110010),
+    .TX_RXDETECT_CFG (14'h0032),
     .TX_RXDETECT_REF (3'b100),
-    .TX_SAMPLE_PERIOD (3'b101),
+    .TX_SAMPLE_PERIOD (3'b111),
     .TX_SARC_LPBK_ENB (1'b0),
     .TX_XCLK_SEL ("TXOUT"),
     .USE_PCS_CLK_PHASE_SEL (1'b0),
     .WB_MODE (2'b00))
   i_gthe3_channel (
-    .CFGRESET (1'd0),
-    .CLKRSVD0 (1'd0),
-    .CLKRSVD1 (1'd0),
-    .CPLLLOCKDETCLK (up_clk),
-    .CPLLLOCKEN (1'd1),
-    .CPLLPD (1'b0),
-    .CPLLREFCLKSEL (3'b001),
-    .CPLLRESET (up_cpll_rst),
-    .DMONFIFORESET (1'd0),
-    .DMONITORCLK (1'd0),
-    .DRPADDR (up_addr_int[8:0]),
-    .DRPCLK (up_clk),
-    .DRPDI (up_wdata_int),
-    .DRPEN (up_enb_int),
-    .DRPWE (up_wr_int),
-    .EVODDPHICALDONE (1'd0),
-    .EVODDPHICALSTART (1'd0),
-    .EVODDPHIDRDEN (1'd0),
-    .EVODDPHIDWREN (1'd0),
-    .EVODDPHIXRDEN (1'd0),
-    .EVODDPHIXWREN (1'd0),
-    .EYESCANMODE (1'd0),
-    .EYESCANRESET (1'd0),
-    .EYESCANTRIGGER (1'd0),
-    .GTGREFCLK (1'd0),
-    .GTHRXN (rx_n),
-    .GTHRXP (rx_p),
-    .GTNORTHREFCLK0 (1'd0),
-    .GTNORTHREFCLK1 (1'd0),
-    .GTREFCLK0 (cpll_ref_clk),
-    .GTREFCLK1 (1'd0),
-    .GTRESETSEL (1'd0),
-    .GTRSVD (15'd0),
-    .GTRXRESET (up_rx_rst),
-    .GTSOUTHREFCLK0 (1'd0),
-    .GTSOUTHREFCLK1 (1'd0),
-    .GTTXRESET (up_tx_rst),
-    .LOOPBACK (3'd0),
-    .LPBKRXTXSEREN (1'd0),
-    .LPBKTXRXSEREN (1'd0),
-    .PCIEEQRXEQADAPTDONE (1'd0),
-    .PCIERSTIDLE (1'd0),
-    .PCIERSTTXSYNCSTART (1'd0),
-    .PCIEUSERRATEDONE (1'd0),
-    .PCSRSVDIN (16'd0),
-    .PCSRSVDIN2 (5'd0),
-    .PMARSVDIN (5'd0),
-    .QPLL0CLK (qpll2ch_clk),
-    .QPLL0REFCLK (qpll2ch_ref_clk),
-    .QPLL1CLK (1'd0),
-    .QPLL1REFCLK (1'd0),
-    .RESETOVRD (1'd0),
-    .RSTCLKENTX (1'd0),
-    .RXBUFRESET (1'd0),
-    .RXCDRFREQRESET (1'd0),
-    .RXCDRHOLD (1'd0),
-    .RXCDROVRDEN (1'd0),
-    .RXCDRRESET (1'd0),
-    .RXCDRRESETRSV (1'd0),
-    .RXCHBONDEN (1'd0),
-    .RXCHBONDI (5'd0),
-    .RXCHBONDLEVEL (2'd0),
-    .RXCHBONDMASTER (1'd0),
-    .RXCHBONDSLAVE (1'd0),
-    .RXCOMMADETEN (1'd1),
-    .RXDFEAGCCTRL (2'b01),
-    .RXDFEAGCHOLD (1'd0),
-    .RXDFEAGCOVRDEN (1'd0),
-    .RXDFELFHOLD (1'd0),
-    .RXDFELFOVRDEN (1'd0),
-    .RXDFELPMRESET (1'd0),
-    .RXDFETAP10HOLD (1'd0),
-    .RXDFETAP10OVRDEN (1'd0),
-    .RXDFETAP11HOLD (1'd0),
-    .RXDFETAP11OVRDEN (1'd0),
-    .RXDFETAP12HOLD (1'd0),
-    .RXDFETAP12OVRDEN (1'd0),
-    .RXDFETAP13HOLD (1'd0),
-    .RXDFETAP13OVRDEN (1'd0),
-    .RXDFETAP14HOLD (1'd0),
-    .RXDFETAP14OVRDEN (1'd0),
-    .RXDFETAP15HOLD (1'd0),
-    .RXDFETAP15OVRDEN (1'd0),
-    .RXDFETAP2HOLD (1'd0),
-    .RXDFETAP2OVRDEN (1'd0),
-    .RXDFETAP3HOLD (1'd0),
-    .RXDFETAP3OVRDEN (1'd0),
-    .RXDFETAP4HOLD (1'd0),
-    .RXDFETAP4OVRDEN (1'd0),
-    .RXDFETAP5HOLD (1'd0),
-    .RXDFETAP5OVRDEN (1'd0),
-    .RXDFETAP6HOLD (1'd0),
-    .RXDFETAP6OVRDEN (1'd0),
-    .RXDFETAP7HOLD (1'd0),
-    .RXDFETAP7OVRDEN (1'd0),
-    .RXDFETAP8HOLD (1'd0),
-    .RXDFETAP8OVRDEN (1'd0),
-    .RXDFETAP9HOLD (1'd0),
-    .RXDFETAP9OVRDEN (1'd0),
-    .RXDFEUTHOLD (1'd0),
-    .RXDFEUTOVRDEN (1'd0),
-    .RXDFEVPHOLD (1'd0),
-    .RXDFEVPOVRDEN (1'd0),
-    .RXDFEVSEN (1'd0),
-    .RXDFEXYDEN (1'd1),
-    .RXDLYBYPASS (1'd1),
-    .RXDLYEN (1'd0),
-    .RXDLYOVRDEN (1'd0),
-    .RXDLYSRESET (1'd0),
-    .RXELECIDLEMODE (2'b11),
-    .RXGEARBOXSLIP (1'd0),
-    .RXLATCLK (1'd0),
-    .RXLPMEN (up_rx_lpm_dfe_n),
-    .RXLPMGCHOLD (1'd0),
-    .RXLPMGCOVRDEN (1'd0),
-    .RXLPMHFHOLD (1'd0),
-    .RXLPMHFOVRDEN (1'd0),
-    .RXLPMLFHOLD (1'd0),
-    .RXLPMLFKLOVRDEN (1'd0),
-    .RXLPMOSHOLD (1'd0),
-    .RXLPMOSOVRDEN (1'd0),
-    .RXMCOMMAALIGNEN (rx_calign),
-    .RXMONITORSEL (2'd0),
-    .RXOOBRESET (1'd0),
-    .RXOSCALRESET (1'd0),
-    .RXOSHOLD (1'd0),
-    .RXOSINTCFG (4'b1101),
-    .RXOSINTEN (1'd1),
-    .RXOSINTHOLD (1'd0),
-    .RXOSINTOVRDEN (1'd0),
-    .RXOSINTSTROBE (1'd0),
-    .RXOSINTTESTOVRDEN (1'd0),
-    .RXOSOVRDEN (1'd0),
-    .RXOUTCLKSEL (up_rx_out_clk_sel),
-    .RXPCOMMAALIGNEN (rx_calign),
-    .RXPCSRESET (1'd0),
-    .RXPD (2'd0),
-    .RXPHALIGN (1'd0),
-    .RXPHALIGNEN (1'd0),
-    .RXPHDLYPD (1'd1),
-    .RXPHDLYRESET (1'd0),
-    .RXPHOVRDEN (1'd0),
-    .RXPLLCLKSEL (rx_pll_clk_sel_s),
-    .RXPMARESET (1'd0),
-    .RXPOLARITY (1'd0),
-    .RXPRBSCNTRESET (1'd0),
-    .RXPRBSSEL (4'd0),
-    .RXPROGDIVRESET (1'd0),
-    .RXQPIEN (1'd0),
-    .RXRATE (rx_rate_m2),
-    .RXRATEMODE (1'd0),
-    .RXSLIDE (1'd0),
-    .RXSLIPOUTCLK (1'd0),
-    .RXSLIPPMA (1'd0),
-    .RXSYNCALLIN (1'd0),
-    .RXSYNCIN (1'd0),
-    .RXSYNCMODE (1'd0),
-    .RXSYSCLKSEL (rx_sys_clk_sel_s),
-    .RXUSERRDY (up_rx_user_ready),
-    .RXUSRCLK (rx_clk),
-    .RXUSRCLK2 (rx_clk),
-    .RX8B10BEN (1'd1),
-    .SIGVALIDCLK (1'd0),
-    .TSTIN (20'd0),
-    .TXBUFDIFFCTRL (3'd0),
-    .TXCOMINIT (1'd0),
-    .TXCOMSAS (1'd0),
-    .TXCOMWAKE (1'd0),
-    .TXCTRL0 (16'd0),
-    .TXCTRL1 (16'd0),
-    .TXCTRL2 ({4'd0, tx_charisk}),
-    .TXDATA ({96'd0, tx_data}),
-    .TXDATAEXTENDRSVD (8'd0),
-    .TXDEEMPH (1'd0),
-    .TXDETECTRX (1'd0),
-    .TXDIFFCTRL (4'b1100),
-    .TXDIFFPD (1'd0),
-    .TXDLYBYPASS (1'd1),
-    .TXDLYEN (1'd0),
-    .TXDLYHOLD (1'd0),
-    .TXDLYOVRDEN (1'd0),
-    .TXDLYSRESET (1'd0),
-    .TXDLYUPDOWN (1'd0),
-    .TXELECIDLE (1'd0),
-    .TXHEADER (6'd0),
-    .TXINHIBIT (1'd0),
-    .TXLATCLK (1'd0),
-    .TXMAINCURSOR (7'b1000000),
-    .TXMARGIN (3'd0),
-    .TXOUTCLKSEL (up_tx_out_clk_sel),
-    .TXPCSRESET (1'd0),
-    .TXPD (2'd0),
-    .TXPDELECIDLEMODE (1'd0),
-    .TXPHALIGN (1'd0),
-    .TXPHALIGNEN (1'd0),
-    .TXPHDLYPD (1'd1),
-    .TXPHDLYRESET (1'd0),
-    .TXPHDLYTSTCLK (1'd0),
-    .TXPHINIT (1'd0),
-    .TXPHOVRDEN (1'd0),
-    .TXPIPPMEN (1'd0),
-    .TXPIPPMOVRDEN (1'd0),
-    .TXPIPPMPD (1'd0),
-    .TXPIPPMSEL (1'd0),
-    .TXPIPPMSTEPSIZE (5'd0),
-    .TXPISOPD (1'd0),
-    .TXPLLCLKSEL (tx_pll_clk_sel_s),
-    .TXPMARESET (1'd0),
-    .TXPOLARITY (1'd0),
-    .TXPOSTCURSOR (5'd0),
-    .TXPOSTCURSORINV (1'd0),
-    .TXPRBSFORCEERR (1'd0),
-    .TXPRBSSEL (4'd0),
-    .TXPRECURSOR (5'd0),
-    .TXPRECURSORINV (1'd0),
-    .TXPROGDIVRESET (up_tx_rst),
-    .TXQPIBIASEN (1'd0),
-    .TXQPISTRONGPDOWN (1'd0),
-    .TXQPIWEAKPUP (1'd0),
-    .TXRATE (tx_rate_m2),
-    .TXRATEMODE (1'd0),
-    .TXSEQUENCE (7'd0),
-    .TXSWING (1'd0),
-    .TXSYNCALLIN (1'd0),
-    .TXSYNCIN (1'd0),
-    .TXSYNCMODE (1'd0),
-    .TXSYSCLKSEL (tx_sys_clk_sel_s),
-    .TXUSERRDY (up_tx_user_ready),
-    .TXUSRCLK (tx_clk),
-    .TXUSRCLK2 (tx_clk),
-    .TX8B10BBYPASS (8'd0),
-    .TX8B10BEN (1'd1),
     .BUFGTCE (),
     .BUFGTCEMASK (),
     .BUFGTDIV (),
     .BUFGTRESET (),
     .BUFGTRSTMASK (),
+    .CFGRESET (1'h0),
+    .CLKRSVD0 (1'h0),
+    .CLKRSVD1 (1'h0),
     .CPLLFBCLKLOST (),
     .CPLLLOCK (cpll_locked_s),
+    .CPLLLOCKDETCLK (up_clk),
+    .CPLLLOCKEN (1'h1),
+    .CPLLPD (1'h0),
     .CPLLREFCLKLOST (),
+    .CPLLREFCLKSEL (3'h1),
+    .CPLLRESET (up_cpll_rst),
+    .DMONFIFORESET (1'h0),
+    .DMONITORCLK (1'h0),
     .DMONITOROUT (),
+    .DRPADDR (up_addr_int[8:0]),
+    .DRPCLK (up_clk),
+    .DRPDI (up_wdata_int),
     .DRPDO (up_rdata_s),
+    .DRPEN (up_enb_int),
     .DRPRDY (up_ready_s),
+    .DRPWE (up_wr_int),
+    .EVODDPHICALDONE (1'h0),
+    .EVODDPHICALSTART (1'h0),
+    .EVODDPHIDRDEN (1'h0),
+    .EVODDPHIDWREN (1'h0),
+    .EVODDPHIXRDEN (1'h0),
+    .EVODDPHIXWREN (1'h0),
     .EYESCANDATAERROR (),
+    .EYESCANMODE (1'h0),
+    .EYESCANRESET (1'h0),
+    .EYESCANTRIGGER (1'h0),
+    .GTGREFCLK (1'h0),
+    .GTHRXN (rx_n),
+    .GTHRXP (rx_p),
     .GTHTXN (tx_n),
     .GTHTXP (tx_p),
+    .GTNORTHREFCLK0 (1'h0),
+    .GTNORTHREFCLK1 (1'h0),
     .GTPOWERGOOD (),
+    .GTREFCLK0 (cpll_ref_clk),
+    .GTREFCLK1 (1'h0),
     .GTREFCLKMONITOR (),
+    .GTRESETSEL (1'h0),
+    .GTRSVD (16'h0),
+    .GTRXRESET (up_rx_rst),
+    .GTSOUTHREFCLK0 (1'h0),
+    .GTSOUTHREFCLK1 (1'h0),
+    .GTTXRESET (up_tx_rst),
+    .LOOPBACK (3'h0),
+    .LPBKRXTXSEREN (1'h0),
+    .LPBKTXRXSEREN (1'h0),
+    .PCIEEQRXEQADAPTDONE (1'h0),
     .PCIERATEGEN3 (),
     .PCIERATEIDLE (),
     .PCIERATEQPLLPD (),
     .PCIERATEQPLLRESET (),
+    .PCIERSTIDLE (1'h0),
+    .PCIERSTTXSYNCSTART (1'h0),
     .PCIESYNCTXSYNCDONE (),
     .PCIEUSERGEN3RDY (),
     .PCIEUSERPHYSTATUSRST (),
+    .PCIEUSERRATEDONE (1'h0),
     .PCIEUSERRATESTART (),
+    .PCSRSVDIN (16'h0),
+    .PCSRSVDIN2 (5'h0),
     .PCSRSVDOUT (),
     .PHYSTATUS (),
     .PINRSRVDAS (),
+    .PMARSVDIN (5'h0),
+    .QPLL0CLK (qpll2ch_clk),
+    .QPLL0REFCLK (qpll2ch_ref_clk),
+    .QPLL1CLK (1'h0),
+    .QPLL1REFCLK (1'h0),
     .RESETEXCEPTION (),
+    .RESETOVRD (1'h0),
+    .RSTCLKENTX (1'h0),
+    .RX8B10BEN (1'h1),
+    .RXBUFRESET (1'h0),
     .RXBUFSTATUS (),
     .RXBYTEISALIGNED (),
     .RXBYTEREALIGN (),
+    .RXCDRFREQRESET (1'h0),
+    .RXCDRHOLD (1'h0),
     .RXCDRLOCK (),
+    .RXCDROVRDEN (1'h0),
     .RXCDRPHDONE (),
+    .RXCDRRESET (1'h0),
+    .RXCDRRESETRSV (1'h0),
     .RXCHANBONDSEQ (),
     .RXCHANISALIGNED (),
     .RXCHANREALIGN (),
+    .RXCHBONDEN (1'h0),
+    .RXCHBONDI (5'h0),
+    .RXCHBONDLEVEL (3'h0),
+    .RXCHBONDMASTER (1'h0),
     .RXCHBONDO (),
+    .RXCHBONDSLAVE (1'h0),
     .RXCLKCORCNT (),
     .RXCOMINITDET (),
     .RXCOMMADET (),
+    .RXCOMMADETEN (1'h1),
     .RXCOMSASDET (),
     .RXCOMWAKEDET (),
     .RXCTRL0 ({rx_charisk_open_s, rx_charisk}),
@@ -1426,54 +1261,220 @@ module util_adxcvr_xch #(
     .RXDATA ({rx_data_open_s, rx_data}),
     .RXDATAEXTENDRSVD (),
     .RXDATAVALID (),
+    .RXDFEAGCCTRL (2'h1),
+    .RXDFEAGCHOLD (1'h0),
+    .RXDFEAGCOVRDEN (1'h0),
+    .RXDFELFHOLD (1'h0),
+    .RXDFELFOVRDEN (1'h0),
+    .RXDFELPMRESET (1'h0),
+    .RXDFETAP10HOLD (1'h0),
+    .RXDFETAP10OVRDEN (1'h0),
+    .RXDFETAP11HOLD (1'h0),
+    .RXDFETAP11OVRDEN (1'h0),
+    .RXDFETAP12HOLD (1'h0),
+    .RXDFETAP12OVRDEN (1'h0),
+    .RXDFETAP13HOLD (1'h0),
+    .RXDFETAP13OVRDEN (1'h0),
+    .RXDFETAP14HOLD (1'h0),
+    .RXDFETAP14OVRDEN (1'h0),
+    .RXDFETAP15HOLD (1'h0),
+    .RXDFETAP15OVRDEN (1'h0),
+    .RXDFETAP2HOLD (1'h0),
+    .RXDFETAP2OVRDEN (1'h0),
+    .RXDFETAP3HOLD (1'h0),
+    .RXDFETAP3OVRDEN (1'h0),
+    .RXDFETAP4HOLD (1'h0),
+    .RXDFETAP4OVRDEN (1'h0),
+    .RXDFETAP5HOLD (1'h0),
+    .RXDFETAP5OVRDEN (1'h0),
+    .RXDFETAP6HOLD (1'h0),
+    .RXDFETAP6OVRDEN (1'h0),
+    .RXDFETAP7HOLD (1'h0),
+    .RXDFETAP7OVRDEN (1'h0),
+    .RXDFETAP8HOLD (1'h0),
+    .RXDFETAP8OVRDEN (1'h0),
+    .RXDFETAP9HOLD (1'h0),
+    .RXDFETAP9OVRDEN (1'h0),
+    .RXDFEUTHOLD (1'h0),
+    .RXDFEUTOVRDEN (1'h0),
+    .RXDFEVPHOLD (1'h0),
+    .RXDFEVPOVRDEN (1'h0),
+    .RXDFEVSEN (1'h0),
+    .RXDFEXYDEN (1'h1),
+    .RXDLYBYPASS (1'h1),
+    .RXDLYEN (1'h0),
+    .RXDLYOVRDEN (1'h0),
+    .RXDLYSRESET (1'h0),
     .RXDLYSRESETDONE (),
     .RXELECIDLE (),
+    .RXELECIDLEMODE (2'h3),
+    .RXGEARBOXSLIP (1'h0),
     .RXHEADER (),
     .RXHEADERVALID (),
+    .RXLATCLK (1'h0),
+    .RXLPMEN (up_rx_lpm_dfe_n),
+    .RXLPMGCHOLD (1'h0),
+    .RXLPMGCOVRDEN (1'h0),
+    .RXLPMHFHOLD (1'h0),
+    .RXLPMHFOVRDEN (1'h0),
+    .RXLPMLFHOLD (1'h0),
+    .RXLPMLFKLOVRDEN (1'h0),
+    .RXLPMOSHOLD (1'h0),
+    .RXLPMOSOVRDEN (1'h0),
+    .RXMCOMMAALIGNEN (rx_calign),
     .RXMONITOROUT (),
+    .RXMONITORSEL (2'h0),
+    .RXOOBRESET (1'h0),
+    .RXOSCALRESET (1'h0),
+    .RXOSHOLD (1'h0),
+    .RXOSINTCFG (4'hd),
     .RXOSINTDONE (),
+    .RXOSINTEN (1'h1),
+    .RXOSINTHOLD (1'h0),
+    .RXOSINTOVRDEN (1'h0),
     .RXOSINTSTARTED (),
+    .RXOSINTSTROBE (1'h0),
     .RXOSINTSTROBEDONE (),
     .RXOSINTSTROBESTARTED (),
+    .RXOSINTTESTOVRDEN (1'h0),
+    .RXOSOVRDEN (1'h0),
     .RXOUTCLK (rx_out_clk_s),
     .RXOUTCLKFABRIC (),
     .RXOUTCLKPCS (),
+    .RXOUTCLKSEL (up_rx_out_clk_sel),
+    .RXPCOMMAALIGNEN (rx_calign),
+    .RXPCSRESET (1'h0),
+    .RXPD (2'h0),
+    .RXPHALIGN (1'h0),
     .RXPHALIGNDONE (),
+    .RXPHALIGNEN (1'h0),
     .RXPHALIGNERR (),
+    .RXPHDLYPD (1'h1),
+    .RXPHDLYRESET (1'h0),
+    .RXPHOVRDEN (1'h0),
+    .RXPLLCLKSEL (rx_pll_clk_sel_s),
+    .RXPMARESET (1'h0),
     .RXPMARESETDONE (),
+    .RXPOLARITY (1'h0),
+    .RXPRBSCNTRESET (1'h0),
     .RXPRBSERR (),
     .RXPRBSLOCKED (),
+    .RXPRBSSEL (4'h0),
     .RXPRGDIVRESETDONE (),
+    .RXPROGDIVRESET (1'h0),
+    .RXQPIEN (1'h0),
     .RXQPISENN (),
     .RXQPISENP (),
+    .RXRATE (rx_rate_m2),
     .RXRATEDONE (),
+    .RXRATEMODE (1'h0),
     .RXRECCLKOUT (),
     .RXRESETDONE (rx_rst_done_s),
+    .RXSLIDE (1'h0),
     .RXSLIDERDY (),
     .RXSLIPDONE (),
+    .RXSLIPOUTCLK (1'h0),
     .RXSLIPOUTCLKRDY (),
+    .RXSLIPPMA (1'h0),
     .RXSLIPPMARDY (),
     .RXSTARTOFSEQ (),
     .RXSTATUS (),
+    .RXSYNCALLIN (1'h0),
     .RXSYNCDONE (),
+    .RXSYNCIN (1'h0),
+    .RXSYNCMODE (1'h0),
     .RXSYNCOUT (),
+    .RXSYSCLKSEL (rx_sys_clk_sel_s),
+    .RXUSERRDY (up_rx_user_ready),
+    .RXUSRCLK (rx_clk),
+    .RXUSRCLK2 (rx_clk),
     .RXVALID (),
+    .SIGVALIDCLK (1'h0),
+    .TSTIN (20'h0),
+    .TX8B10BBYPASS (8'h0),
+    .TX8B10BEN (1'h1),
+    .TXBUFDIFFCTRL (3'h0),
     .TXBUFSTATUS (),
     .TXCOMFINISH (),
+    .TXCOMINIT (1'h0),
+    .TXCOMSAS (1'h0),
+    .TXCOMWAKE (1'h0),
+    .TXCTRL0 (16'h0),
+    .TXCTRL1 (16'h0),
+    .TXCTRL2 ({4'd0, tx_charisk}),
+    .TXDATA ({96'd0, tx_data}),
+    .TXDATAEXTENDRSVD (8'h0),
+    .TXDEEMPH (1'h0),
+    .TXDETECTRX (1'h0),
+    .TXDIFFCTRL (4'h8),
+    .TXDIFFPD (1'h0),
+    .TXDLYBYPASS (1'h1),
+    .TXDLYEN (1'h0),
+    .TXDLYHOLD (1'h0),
+    .TXDLYOVRDEN (1'h0),
+    .TXDLYSRESET (1'h0),
     .TXDLYSRESETDONE (),
+    .TXDLYUPDOWN (1'h0),
+    .TXELECIDLE (1'h0),
+    .TXHEADER (6'h0),
+    .TXINHIBIT (1'h0),
+    .TXLATCLK (1'h0),
+    .TXMAINCURSOR (7'h40),
+    .TXMARGIN (3'h0),
     .TXOUTCLK (tx_out_clk_s),
     .TXOUTCLKFABRIC (),
     .TXOUTCLKPCS (),
+    .TXOUTCLKSEL (up_tx_out_clk_sel),
+    .TXPCSRESET (1'h0),
+    .TXPD (2'h0),
+    .TXPDELECIDLEMODE (1'h0),
+    .TXPHALIGN (1'h0),
     .TXPHALIGNDONE (),
+    .TXPHALIGNEN (1'h0),
+    .TXPHDLYPD (1'h1),
+    .TXPHDLYRESET (1'h0),
+    .TXPHDLYTSTCLK (1'h0),
+    .TXPHINIT (1'h0),
     .TXPHINITDONE (),
+    .TXPHOVRDEN (1'h0),
+    .TXPIPPMEN (1'h0),
+    .TXPIPPMOVRDEN (1'h0),
+    .TXPIPPMPD (1'h0),
+    .TXPIPPMSEL (1'h0),
+    .TXPIPPMSTEPSIZE (5'h0),
+    .TXPISOPD (1'h0),
+    .TXPLLCLKSEL (tx_pll_clk_sel_s),
+    .TXPMARESET (1'h0),
     .TXPMARESETDONE (),
+    .TXPOLARITY (1'h0),
+    .TXPOSTCURSOR (5'h0),
+    .TXPOSTCURSORINV (1'h0),
+    .TXPRBSFORCEERR (1'h0),
+    .TXPRBSSEL (4'h0),
+    .TXPRECURSOR (5'h0),
+    .TXPRECURSORINV (1'h0),
     .TXPRGDIVRESETDONE (),
+    .TXPROGDIVRESET (up_tx_rst),
+    .TXQPIBIASEN (1'h0),
     .TXQPISENN (),
     .TXQPISENP (),
+    .TXQPISTRONGPDOWN (1'h0),
+    .TXQPIWEAKPUP (1'h0),
+    .TXRATE (tx_rate_m2),
     .TXRATEDONE (),
+    .TXRATEMODE (1'h0),
     .TXRESETDONE (tx_rst_done_s),
+    .TXSEQUENCE (7'h0),
+    .TXSWING (1'h0),
+    .TXSYNCALLIN (1'h0),
     .TXSYNCDONE (),
-    .TXSYNCOUT ());
+    .TXSYNCIN (1'h0),
+    .TXSYNCMODE (1'h0),
+    .TXSYNCOUT (),
+    .TXSYSCLKSEL (tx_sys_clk_sel_s),
+    .TXUSERRDY (up_tx_user_ready),
+    .TXUSRCLK (tx_clk),
+    .TXUSRCLK2 (tx_clk));
   end
   endgenerate
 
diff --git a/library/xilinx/util_adxcvr/util_adxcvr_xcm.v b/library/xilinx/util_adxcvr/util_adxcvr_xcm.v
index 6c65ec311..a13956ab7 100644
--- a/library/xilinx/util_adxcvr/util_adxcvr_xcm.v
+++ b/library/xilinx/util_adxcvr/util_adxcvr_xcm.v
@@ -180,141 +180,142 @@ module util_adxcvr_xcm #(
   generate
   if (XCVR_TYPE == 1) begin
   GTHE3_COMMON #(
-    .SIM_RESET_SPEEDUP ("TRUE"),
-    .SIM_VERSION (2),
-    .SARC_EN (1'b1),
-    .SARC_SEL (1'b0),
-    .SDM0_DATA_PIN_SEL (1'b0),
-    .SDM0_WIDTH_PIN_SEL (1'b0),
-    .SDM1_DATA_PIN_SEL (1'b0),
-    .SDM1_WIDTH_PIN_SEL (1'b0),
-    .BIAS_CFG0 (16'b0000000000000000),
-    .BIAS_CFG1 (16'b0000000000000000),
-    .BIAS_CFG2 (16'b0000000000000000),
-    .BIAS_CFG3 (16'b0000000001000000),
-    .BIAS_CFG4 (16'b0000000000000000),
-    .COMMON_CFG0 (16'b0000000000000000),
-    .COMMON_CFG1 (16'b0000000000000000),
-    .POR_CFG (16'b0000000000000100),
-    .QPLL0_CFG0 (16'b0011000000011100),
-    .QPLL0_CFG1 (16'b0000000000011000),
-    .QPLL0_CFG1_G3 (16'b0000000000011000),
-    .QPLL0_CFG2 (16'b0000000001001000),
-    .QPLL0_CFG2_G3 (16'b0000000001001000),
-    .QPLL0_CFG3 (16'b0000000100100000),
-    .QPLL0_CFG4 (16'b0000000000001001),
-    .QPLL0_INIT_CFG0 (16'b0000000000000000),
-    .QPLL0_LOCK_CFG (16'b0010010111101000),
-    .QPLL0_LOCK_CFG_G3 (16'b0010010111101000),
+    .BIAS_CFG0 (16'h0000),
+    .BIAS_CFG1 (16'h0000),
+    .BIAS_CFG2 (16'h0000),
+    .BIAS_CFG3 (16'h0040),
+    .BIAS_CFG4 (16'h0000),
+    .BIAS_CFG_RSVD (10'b0000000000),
+    .COMMON_CFG0 (16'h0000),
+    .COMMON_CFG1 (16'h0000),
+    .POR_CFG (16'h0004),
+    .QPLL0_CFG0 (16'h321c),
+    .QPLL0_CFG1 (16'h1018),
+    .QPLL0_CFG1_G3 (16'h1018),
+    .QPLL0_CFG2 (16'h0048),
+    .QPLL0_CFG2_G3 (16'h0048),
+    .QPLL0_CFG3 (16'h0120),
+    .QPLL0_CFG4 (16'h0000),
+    .QPLL0_CP (10'b0000011111),
+    .QPLL0_CP_G3 (10'b1111111111),
+    .QPLL0_FBDIV (QPLL_FBDIV),
+    .QPLL0_FBDIV_G3 (80),
+    .QPLL0_INIT_CFG0 (16'h02b2),
+    .QPLL0_INIT_CFG1 (8'h00),
+    .QPLL0_LOCK_CFG (16'h21e8),
+    .QPLL0_LOCK_CFG_G3 (16'h21e8),
+    .QPLL0_LPF (10'b1111111111),
+    .QPLL0_LPF_G3 (10'b0000010101),
+    .QPLL0_REFCLK_DIV (QPLL_REFCLK_DIV),
     .QPLL0_SDM_CFG0 (16'b0000000000000000),
     .QPLL0_SDM_CFG1 (16'b0000000000000000),
     .QPLL0_SDM_CFG2 (16'b0000000000000000),
-    .QPLL1_CFG0 (16'b0011000000011100),
-    .QPLL1_CFG1 (16'b0000000000011000),
-    .QPLL1_CFG1_G3 (16'b0000000000011000),
-    .QPLL1_CFG2 (16'b0000000001000000),
-    .QPLL1_CFG2_G3 (16'b0000000001000000),
-    .QPLL1_CFG3 (16'b0000000100100000),
-    .QPLL1_CFG4 (16'b0000000000001001),
-    .QPLL1_INIT_CFG0 (16'b0000000000000000),
-    .QPLL1_LOCK_CFG (16'b0010010111101000),
-    .QPLL1_LOCK_CFG_G3 (16'b0010010111101000),
+    .QPLL1_CFG0 (16'h321c),
+    .QPLL1_CFG1 (16'h1018),
+    .QPLL1_CFG1_G3 (16'h1018),
+    .QPLL1_CFG2 (16'h0040),
+    .QPLL1_CFG2_G3 (16'h0040),
+    .QPLL1_CFG3 (16'h0120),
+    .QPLL1_CFG4 (16'h0000),
+    .QPLL1_CP (10'b0000011111),
+    .QPLL1_CP_G3 (10'b1111111111),
+    .QPLL1_FBDIV (QPLL_FBDIV),
+    .QPLL1_FBDIV_G3 (80),
+    .QPLL1_INIT_CFG0 (16'h02b2),
+    .QPLL1_INIT_CFG1 (8'h00),
+    .QPLL1_LOCK_CFG (16'h21e8),
+    .QPLL1_LOCK_CFG_G3 (16'h21e8),
+    .QPLL1_LPF (10'b1111111111),
+    .QPLL1_LPF_G3 (10'b0000010101),
+    .QPLL1_REFCLK_DIV (QPLL_REFCLK_DIV),
     .QPLL1_SDM_CFG0 (16'b0000000000000000),
     .QPLL1_SDM_CFG1 (16'b0000000000000000),
     .QPLL1_SDM_CFG2 (16'b0000000000000000),
-    .RSVD_ATTR0 (16'b0000000000000000),
-    .RSVD_ATTR1 (16'b0000000000000000),
-    .RSVD_ATTR2 (16'b0000000000000000),
-    .RSVD_ATTR3 (16'b0000000000000000),
-    .SDM0DATA1_0 (16'b0000000000000000),
-    .SDM0INITSEED0_0 (16'b0000000000000000),
-    .SDM1DATA1_0 (16'b0000000000000000),
-    .SDM1INITSEED0_0 (16'b0000000000000000),
+    .RSVD_ATTR0 (16'h0000),
+    .RSVD_ATTR1 (16'h0000),
+    .RSVD_ATTR2 (16'h0000),
+    .RSVD_ATTR3 (16'h0000),
     .RXRECCLKOUT0_SEL (2'b00),
     .RXRECCLKOUT1_SEL (2'b00),
-    .QPLL0_INIT_CFG1 (8'b00000000),
-    .QPLL1_INIT_CFG1 (8'b00000000),
+    .SARC_EN (1'b1),
+    .SARC_SEL (1'b0),
+    .SDM0DATA1_0 (16'b0000000000000000),
     .SDM0DATA1_1 (9'b000000000),
+    .SDM0INITSEED0_0 (16'b0000000000000000),
     .SDM0INITSEED0_1 (9'b000000000),
+    .SDM0_DATA_PIN_SEL (1'b0),
+    .SDM0_WIDTH_PIN_SEL (1'b0),
+    .SDM1DATA1_0 (16'b0000000000000000),
     .SDM1DATA1_1 (9'b000000000),
+    .SDM1INITSEED0_0 (16'b0000000000000000),
     .SDM1INITSEED0_1 (9'b000000000),
-    .BIAS_CFG_RSVD (10'b0000000000),
-    .QPLL0_CP (10'b0000011111),
-    .QPLL0_CP_G3 (10'b1111111111),
-    .QPLL0_LPF (10'b1111111111),
-    .QPLL0_LPF_G3 (10'b0000010101),
-    .QPLL1_CP (10'b0000011111),
-    .QPLL1_CP_G3 (10'b1111111111),
-    .QPLL1_LPF (10'b1111111111),
-    .QPLL1_LPF_G3 (10'b0000010101),
-    .QPLL0_FBDIV (QPLL_FBDIV),
-    .QPLL0_FBDIV_G3 (80),
-    .QPLL0_REFCLK_DIV (QPLL_REFCLK_DIV),
-    .QPLL1_FBDIV (QPLL_FBDIV),
-    .QPLL1_FBDIV_G3 (80),
-    .QPLL1_REFCLK_DIV (QPLL_REFCLK_DIV))
+    .SDM1_DATA_PIN_SEL (1'b0),
+    .SDM1_WIDTH_PIN_SEL (1'b0),
+    .SIM_MODE ("FAST"),
+    .SIM_RESET_SPEEDUP ("TRUE"),
+    .SIM_VERSION (2))
   i_gthe3_common (
-    .BGBYPASSB (1'd1),
-    .BGMONITORENB (1'd1),
-    .BGPDB (1'd1),
-    .BGRCALOVRD (5'b11111),
-    .BGRCALOVRDENB (1'd1),
+    .BGBYPASSB (1'h1),
+    .BGMONITORENB (1'h1),
+    .BGPDB (1'h1),
+    .BGRCALOVRD (5'h1f),
+    .BGRCALOVRDENB (1'h1),
     .DRPADDR (up_addr_int[8:0]),
     .DRPCLK (up_clk),
     .DRPDI (up_wdata_int),
-    .DRPEN (up_enb_int),
-    .DRPWE (up_wr_int),
-    .GTGREFCLK0 (1'd0),
-    .GTGREFCLK1 (1'd0),
-    .GTNORTHREFCLK00 (1'd0),
-    .GTNORTHREFCLK01 (1'd0),
-    .GTNORTHREFCLK10 (1'd0),
-    .GTNORTHREFCLK11 (1'd0),
-    .GTREFCLK00 (qpll_ref_clk),
-    .GTREFCLK01 (1'd0),
-    .GTREFCLK10 (1'd0),
-    .GTREFCLK11 (1'd0),
-    .GTSOUTHREFCLK00 (1'd0),
-    .GTSOUTHREFCLK01 (1'd0),
-    .GTSOUTHREFCLK10 (1'd0),
-    .GTSOUTHREFCLK11 (1'd0),
-    .PMARSVD0 (8'd0),
-    .PMARSVD1 (8'd0),
-    .QPLLRSVD1 (8'd0),
-    .QPLLRSVD2 (5'd0),
-    .QPLLRSVD3 (5'd0),
-    .QPLLRSVD4 (8'd0),
-    .QPLL0CLKRSVD0 (1'd0),
-    .QPLL0CLKRSVD1 (1'd0),
-    .QPLL0LOCKDETCLK (up_clk),
-    .QPLL0LOCKEN (1'd1),
-    .QPLL0PD (1'd0),
-    .QPLL0REFCLKSEL (3'b001),
-    .QPLL0RESET (up_qpll_rst),
-    .QPLL1CLKRSVD0 (1'd0),
-    .QPLL1CLKRSVD1 (1'd0),
-    .QPLL1LOCKDETCLK (1'd0),
-    .QPLL1LOCKEN (1'd0),
-    .QPLL1PD (1'd1),
-    .QPLL1REFCLKSEL (3'b001),
-    .QPLL1RESET (1'd1),
-    .RCALENB (1'd1),
     .DRPDO (up_rdata_s),
+    .DRPEN (up_enb_int),
     .DRPRDY (up_ready_s),
+    .DRPWE (up_wr_int),
+    .GTGREFCLK0 (1'h0),
+    .GTGREFCLK1 (1'h0),
+    .GTNORTHREFCLK00 (1'h0),
+    .GTNORTHREFCLK01 (1'h0),
+    .GTNORTHREFCLK10 (1'h0),
+    .GTNORTHREFCLK11 (1'h0),
+    .GTREFCLK00 (qpll_ref_clk),
+    .GTREFCLK01 (1'h0),
+    .GTREFCLK10 (1'h0),
+    .GTREFCLK11 (1'h0),
+    .GTSOUTHREFCLK00 (1'h0),
+    .GTSOUTHREFCLK01 (1'h0),
+    .GTSOUTHREFCLK10 (1'h0),
+    .GTSOUTHREFCLK11 (1'h0),
+    .PMARSVD0 (8'h0),
+    .PMARSVD1 (8'h0),
     .PMARSVDOUT0 (),
     .PMARSVDOUT1 (),
-    .QPLLDMONITOR0 (),
-    .QPLLDMONITOR1 (),
+    .QPLL0CLKRSVD0 (1'h0),
+    .QPLL0CLKRSVD1 (1'h0),
     .QPLL0FBCLKLOST (),
     .QPLL0LOCK (qpll2ch_locked),
+    .QPLL0LOCKDETCLK (up_clk),
+    .QPLL0LOCKEN (1'h1),
     .QPLL0OUTCLK (qpll2ch_clk),
     .QPLL0OUTREFCLK (qpll2ch_ref_clk),
+    .QPLL0PD (1'h0),
     .QPLL0REFCLKLOST (),
+    .QPLL0REFCLKSEL (3'h1),
+    .QPLL0RESET (up_qpll_rst),
+    .QPLL1CLKRSVD0 (1'h0),
+    .QPLL1CLKRSVD1 (1'h0),
     .QPLL1FBCLKLOST (),
     .QPLL1LOCK (),
+    .QPLL1LOCKDETCLK (1'h0),
+    .QPLL1LOCKEN (1'h0),
     .QPLL1OUTCLK (),
     .QPLL1OUTREFCLK (),
+    .QPLL1PD (1'h0),
     .QPLL1REFCLKLOST (),
+    .QPLL1REFCLKSEL (3'h1),
+    .QPLL1RESET (1'h1),
+    .QPLLDMONITOR0 (),
+    .QPLLDMONITOR1 (),
+    .QPLLRSVD1 (8'h0),
+    .QPLLRSVD2 (5'h0),
+    .QPLLRSVD3 (5'h0),
+    .QPLLRSVD4 (8'h0),
+    .RCALENB (1'h1),
     .REFCLKOUTMONITOR0 (),
     .REFCLKOUTMONITOR1 (),
     .RXRECCLK0_SEL (),