Revert "P9 Xbus/DMI CM Workaround"

This reverts commit 20cda0435fc199da99ca47ab654360ec884c721c.

Change-Id: I916d22b6ea3d32c50b9c8b4481362d16919c4897
CQ: SW461582
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/75333
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/75358
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>

3 files changed, 18 insertions, 30 deletions

diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_xbus_g0_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_xbus_g0_scom.C
index 627a74c20..1442041f7 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_xbus_g0_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_xbus_g0_scom.C
@@ -43,12 +43,12 @@ constexpr uint64_t literal_0b0000011 = 0b0000011;
 constexpr uint64_t literal_0b000000 = 0b000000;
 constexpr uint64_t literal_0b100111 = 0b100111;
 constexpr uint64_t literal_0b1010 = 0b1010;
-constexpr uint64_t literal_0b00 = 0b00;
+constexpr uint64_t literal_0b01 = 0b01;
 constexpr uint64_t literal_0b11 = 0b11;
-constexpr uint64_t literal_0b01010000 = 0b01010000;
 constexpr uint64_t literal_0b01011100 = 0b01011100;
-constexpr uint64_t literal_0b00110111 = 0b00110111;
+constexpr uint64_t literal_0b01100110 = 0b01100110;
 constexpr uint64_t literal_0b00111101 = 0b00111101;
+constexpr uint64_t literal_0b01000100 = 0b01000100;
 constexpr uint64_t literal_0b0010000 = 0b0010000;
 constexpr uint64_t literal_0b00001 = 0b00001;
 constexpr uint64_t literal_0b0001 = 0b0001;
@@ -61,7 +61,7 @@ constexpr uint64_t literal_0b0000000000000000 = 0b0000000000000000;
 constexpr uint64_t literal_0b01111111 = 0b01111111;
 constexpr uint64_t literal_0b10 = 0b10;
 constexpr uint64_t literal_0b1100 = 0b1100;
-constexpr uint64_t literal_0b01 = 0b01;
+constexpr uint64_t literal_0b00 = 0b00;
 constexpr uint64_t literal_0b01110 = 0b01110;
 
 fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>& TGT0,
@@ -3213,7 +3213,7 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8008c00006010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<48, 2, 62, uint64_t>(literal_0b00 );
+            l_scom_buffer.insert<48, 2, 62, uint64_t>(literal_0b01 );
             constexpr auto l_IOF1_RX_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_PEAK_TUNE_OFF = 0x0;
             l_scom_buffer.insert<55, 1, 63, uint64_t>(l_IOF1_RX_RX0_RXCTL_CTL_REGS_RX_CTL_REGS_RX_PEAK_TUNE_OFF );
             l_scom_buffer.insert<57, 2, 62, uint64_t>(literal_0b11 );
@@ -3240,20 +3240,20 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
 
             if ((l_TGT0_ATTR_IO_XBUS_CHAN_EQ & ENUM_ATTR_IO_XBUS_CHAN_EQ_LOWER_VGA_GAIN_TARGET))
             {
-                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0b01010000 );
+                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0b01011100 );
             }
             else if (( true ))
             {
-                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0b01011100 );
+                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0b01100110 );
             }
 
             if ((l_TGT0_ATTR_IO_XBUS_CHAN_EQ & ENUM_ATTR_IO_XBUS_CHAN_EQ_LOWER_VGA_GAIN_TARGET))
             {
-                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0b00110111 );
+                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0b00111101 );
             }
             else if (( true ))
             {
-                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0b00111101 );
+                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0b01000100 );
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x8008d00006010c3full, l_scom_buffer));
@@ -3377,7 +3377,6 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
 
             constexpr auto l_IOF1_RX_RX0_RXCTL_DATASM_DATASM_REGS_RX_CTL_DATASM_CLKDIST_PDWN_OFF = 0x0;
             l_scom_buffer.insert<60, 1, 63, uint64_t>(l_IOF1_RX_RX0_RXCTL_DATASM_DATASM_REGS_RX_CTL_DATASM_CLKDIST_PDWN_OFF );
-            l_scom_buffer.insert<56, 4, 60, uint64_t>(literal_0b0010 );
             FAPI_TRY(fapi2::putScom(TGT0, 0x800b800006010c3full, l_scom_buffer));
         }
         {
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_xbus_g1_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_xbus_g1_scom.C
index 43487aa9c..c8052a2ca 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_xbus_g1_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_xbus_g1_scom.C
@@ -44,12 +44,12 @@ constexpr uint64_t literal_0b000000 = 0b000000;
 constexpr uint64_t literal_0b100111 = 0b100111;
 constexpr uint64_t literal_0b000001 = 0b000001;
 constexpr uint64_t literal_0b1010 = 0b1010;
-constexpr uint64_t literal_0b00 = 0b00;
+constexpr uint64_t literal_0b01 = 0b01;
 constexpr uint64_t literal_0b11 = 0b11;
-constexpr uint64_t literal_0b01010000 = 0b01010000;
 constexpr uint64_t literal_0b01011100 = 0b01011100;
-constexpr uint64_t literal_0b00110111 = 0b00110111;
+constexpr uint64_t literal_0b01100110 = 0b01100110;
 constexpr uint64_t literal_0b00111101 = 0b00111101;
+constexpr uint64_t literal_0b01000100 = 0b01000100;
 constexpr uint64_t literal_0b0010000 = 0b0010000;
 constexpr uint64_t literal_0b00001 = 0b00001;
 constexpr uint64_t literal_0b0001 = 0b0001;
@@ -62,7 +62,7 @@ constexpr uint64_t literal_0b0000000000000000 = 0b0000000000000000;
 constexpr uint64_t literal_0b01111111 = 0b01111111;
 constexpr uint64_t literal_0b10 = 0b10;
 constexpr uint64_t literal_0b1100 = 0b1100;
-constexpr uint64_t literal_0b01 = 0b01;
+constexpr uint64_t literal_0b00 = 0b00;
 constexpr uint64_t literal_0b01110 = 0b01110;
 
 fapi2::ReturnCode p9_xbus_g1_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>& TGT0,
@@ -3214,7 +3214,7 @@ fapi2::ReturnCode p9_xbus_g1_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x8008c02006010c3full, l_scom_buffer ));
 
-            l_scom_buffer.insert<48, 2, 62, uint64_t>(literal_0b00 );
+            l_scom_buffer.insert<48, 2, 62, uint64_t>(literal_0b01 );
             constexpr auto l_IOF1_RX_RX1_RXCTL_CTL_REGS_RX_CTL_REGS_RX_PEAK_TUNE_OFF = 0x0;
             l_scom_buffer.insert<55, 1, 63, uint64_t>(l_IOF1_RX_RX1_RXCTL_CTL_REGS_RX_CTL_REGS_RX_PEAK_TUNE_OFF );
             l_scom_buffer.insert<57, 2, 62, uint64_t>(literal_0b11 );
@@ -3241,20 +3241,20 @@ fapi2::ReturnCode p9_xbus_g1_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
 
             if ((l_TGT0_ATTR_IO_XBUS_CHAN_EQ & ENUM_ATTR_IO_XBUS_CHAN_EQ_LOWER_VGA_GAIN_TARGET))
             {
-                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0b01010000 );
+                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0b01011100 );
             }
             else if (( true ))
             {
-                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0b01011100 );
+                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0b01100110 );
             }
 
             if ((l_TGT0_ATTR_IO_XBUS_CHAN_EQ & ENUM_ATTR_IO_XBUS_CHAN_EQ_LOWER_VGA_GAIN_TARGET))
             {
-                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0b00110111 );
+                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0b00111101 );
             }
             else if (( true ))
             {
-                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0b00111101 );
+                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0b01000100 );
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x8008d02006010c3full, l_scom_buffer));
@@ -3378,7 +3378,6 @@ fapi2::ReturnCode p9_xbus_g1_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
 
             constexpr auto l_IOF1_RX_RX1_RXCTL_DATASM_DATASM_REGS_RX_CTL_DATASM_CLKDIST_PDWN_OFF = 0x0;
             l_scom_buffer.insert<60, 1, 63, uint64_t>(l_IOF1_RX_RX1_RXCTL_DATASM_DATASM_REGS_RX_CTL_DATASM_CLKDIST_PDWN_OFF );
-            l_scom_buffer.insert<56, 4, 60, uint64_t>(literal_0b0010 );
             FAPI_TRY(fapi2::putScom(TGT0, 0x800b802006010c3full, l_scom_buffer));
         }
         {
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9c_dmi_io_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9c_dmi_io_scom.C
index d65aeca70..259e82fed 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9c_dmi_io_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9c_dmi_io_scom.C
@@ -54,8 +54,6 @@ constexpr uint64_t literal_7 = 7;
 constexpr uint64_t literal_0b1010 = 0b1010;
 constexpr uint64_t literal_0b01 = 0b01;
 constexpr uint64_t literal_0b00 = 0b00;
-constexpr uint64_t literal_0b01010000 = 0b01010000;
-constexpr uint64_t literal_0b00110111 = 0b00110111;
 constexpr uint64_t literal_0b0010111 = 0b0010111;
 constexpr uint64_t literal_0b00010 = 0b00010;
 constexpr uint64_t literal_0b0010 = 0b0010;
@@ -4241,13 +4239,6 @@ fapi2::ReturnCode p9c_dmi_io_scom(const fapi2::Target<fapi2::TARGET_TYPE_DMI>& T
             FAPI_TRY(fapi2::putScom(TGT0, 0x8008c0600701103full, l_scom_buffer));
         }
         {
-            FAPI_TRY(fapi2::getScom( TGT0, 0x8008d0600701103full, l_scom_buffer ));
-
-            l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0b01010000 );
-            l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0b00110111 );
-            FAPI_TRY(fapi2::putScom(TGT0, 0x8008d0600701103full, l_scom_buffer));
-        }
-        {
             FAPI_TRY(fapi2::getScom( TGT0, 0x800970600701103full, l_scom_buffer ));
 
             constexpr auto l_IOMP_RX3_RXCTL_CTL_REGS_RX_CTL_REGS_RX_RC_ENABLE_CTLE_1ST_LATCH_OFFSET_CAL_ON = 0x1;
@@ -4368,7 +4359,6 @@ fapi2::ReturnCode p9c_dmi_io_scom(const fapi2::Target<fapi2::TARGET_TYPE_DMI>& T
             l_scom_buffer.insert<60, 1, 63, uint64_t>(l_IOMP_RX3_RXCTL_DATASM_DATASM_REGS_RX_CTL_DATASM_CLKDIST_PDWN_OFF );
             constexpr auto l_IOMP_RX3_RXCTL_DATASM_DATASM_REGS_RX_PG_DATASM_SPARE_MODE_0_ON = 0x1;
             l_scom_buffer.insert<48, 1, 63, uint64_t>(l_IOMP_RX3_RXCTL_DATASM_DATASM_REGS_RX_PG_DATASM_SPARE_MODE_0_ON );
-            l_scom_buffer.insert<56, 4, 60, uint64_t>(literal_0b0010 );
             FAPI_TRY(fapi2::putScom(TGT0, 0x800b80600701103full, l_scom_buffer));
         }
         {