Update alink ras settings

Change-Id: I37af27d4dd2ac30dc6d63e15d884797b7273f8b9
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/50426
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Jenny Huynh <jhuynh@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/50434
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
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: Christian R. Geddes <crgeddes@us.ibm.com>

2 files changed, 53 insertions, 35 deletions

diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_dl_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_dl_scom.C
index 4f84e3137..1587a0078 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_dl_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_dl_scom.C
@@ -31,10 +31,15 @@ using namespace fapi2;
 
 constexpr uint64_t literal_1 = 1;
 constexpr uint64_t literal_0x0F = 0x0F;
-constexpr uint64_t literal_0x0 = 0x0;
 constexpr uint64_t literal_0xF = 0xF;
+constexpr uint64_t literal_0x0 = 0x0;
 constexpr uint64_t literal_0xE = 0xE;
-constexpr uint64_t literal_0b0000000 = 0b0000000;
+constexpr uint64_t literal_0x5 = 0x5;
+constexpr uint64_t literal_0b0001111 = 0b0001111;
+constexpr uint64_t literal_0b0111111 = 0b0111111;
+constexpr uint64_t literal_0b111 = 0b111;
+constexpr uint64_t literal_0x6 = 0x6;
+constexpr uint64_t literal_0x7 = 0x7;
 
 fapi2::ReturnCode p9_fbc_ioo_dl_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT0,
                                      const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT1)
@@ -82,7 +87,7 @@ fapi2::ReturnCode p9_fbc_ioo_dl_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS
                 l_scom_buffer.insert<11, 5, 59, uint64_t>(literal_0x0F );
             }
 
-            l_scom_buffer.insert<28, 4, 60, uint64_t>(literal_0x0 );
+            l_scom_buffer.insert<28, 4, 60, uint64_t>(literal_0xF );
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
                     && (l_chip_ec == 0x22)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) )
@@ -172,8 +177,8 @@ fapi2::ReturnCode p9_fbc_ioo_dl_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS
                 l_scom_buffer.insert<59, 1, 63, uint64_t>(l_PB_IOO_LL0_CONFIG_LINK1_OLL_ENABLED_OFF );
             }
 
-            l_scom_buffer.insert<4, 4, 60, uint64_t>(literal_0x0 );
-            l_scom_buffer.insert<9, 7, 57, uint64_t>(literal_0b0000000 );
+            l_scom_buffer.insert<4, 4, 60, uint64_t>(literal_0x5 );
+            l_scom_buffer.insert<9, 7, 57, uint64_t>(literal_0b0001111 );
             constexpr auto l_PB_IOO_LL0_CONFIG_ELEVEN_LANE_MODE_ON = 0x1;
             l_scom_buffer.insert<37, 1, 63, uint64_t>(l_PB_IOO_LL0_CONFIG_ELEVEN_LANE_MODE_ON );
 
@@ -191,8 +196,8 @@ fapi2::ReturnCode p9_fbc_ioo_dl_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS
                 l_scom_buffer.insert<3, 1, 63, uint64_t>(l_PB_IOO_LL0_CONFIG_LINK_FAIL_CRC_ERROR_ON );
             }
 
-            l_scom_buffer.insert<20, 4, 60, uint64_t>(literal_0x0 );
-            l_scom_buffer.insert<25, 7, 57, uint64_t>(literal_0b0000000 );
+            l_scom_buffer.insert<20, 4, 60, uint64_t>(literal_0x5 );
+            l_scom_buffer.insert<25, 7, 57, uint64_t>(literal_0b0111111 );
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
                     && (l_chip_ec == 0x22)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) )
@@ -222,6 +227,30 @@ fapi2::ReturnCode p9_fbc_ioo_dl_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x901080full, l_scom_buffer));
         }
+        {
+            FAPI_TRY(fapi2::getScom( TGT0, 0x9010818ull, l_scom_buffer ));
+
+            l_scom_buffer.insert<8, 3, 61, uint64_t>(literal_0b111 );
+            l_scom_buffer.insert<4, 4, 60, uint64_t>(literal_0xF );
+            l_scom_buffer.insert<0, 4, 60, uint64_t>(literal_0x6 );
+            FAPI_TRY(fapi2::putScom(TGT0, 0x9010818ull, l_scom_buffer));
+        }
+        {
+            FAPI_TRY(fapi2::getScom( TGT0, 0x9010819ull, l_scom_buffer ));
+
+            l_scom_buffer.insert<8, 2, 62, uint64_t>(literal_0b111 );
+            l_scom_buffer.insert<4, 4, 60, uint64_t>(literal_0xF );
+            l_scom_buffer.insert<0, 4, 60, uint64_t>(literal_0x7 );
+            FAPI_TRY(fapi2::putScom(TGT0, 0x9010819ull, l_scom_buffer));
+        }
+        {
+            FAPI_TRY(fapi2::getScom( TGT0, 0x901081aull, l_scom_buffer ));
+
+            l_scom_buffer.insert<8, 9, 55, uint64_t>(literal_0b111 );
+            l_scom_buffer.insert<4, 4, 60, uint64_t>(literal_0xF );
+            l_scom_buffer.insert<0, 4, 60, uint64_t>(literal_0x7 );
+            FAPI_TRY(fapi2::putScom(TGT0, 0x901081aull, l_scom_buffer));
+        }
 
     };
 fapi_try_exit:
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_tl_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_tl_scom.C
index e5b7d545e..81a2affff 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_tl_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_tl_scom.C
@@ -29,14 +29,9 @@
 
 using namespace fapi2;
 
+constexpr uint64_t literal_0 = 0;
 constexpr uint64_t literal_3 = 3;
-constexpr uint64_t literal_6 = 6;
-constexpr uint64_t literal_2 = 2;
-constexpr uint64_t literal_5 = 5;
 constexpr uint64_t literal_1 = 1;
-constexpr uint64_t literal_4 = 4;
-constexpr uint64_t literal_0 = 0;
-constexpr uint64_t literal_0xFFFFFFFFFFFFFFFF = 0xFFFFFFFFFFFFFFFF;
 constexpr uint64_t literal_0x1 = 0x1;
 constexpr uint64_t literal_0x40 = 0x40;
 constexpr uint64_t literal_12 = 12;
@@ -44,11 +39,15 @@ constexpr uint64_t literal_10 = 10;
 constexpr uint64_t literal_154 = 154;
 constexpr uint64_t literal_0x36 = 0x36;
 constexpr uint64_t literal_0x37 = 0x37;
+constexpr uint64_t literal_4 = 4;
 constexpr uint64_t literal_0x2A = 0x2A;
 constexpr uint64_t literal_0x2C = 0x2C;
+constexpr uint64_t literal_2 = 2;
+constexpr uint64_t literal_5 = 5;
 constexpr uint64_t literal_74 = 74;
 constexpr uint64_t literal_0x1B = 0x1B;
 constexpr uint64_t literal_0x1C = 0x1C;
+constexpr uint64_t literal_6 = 6;
 constexpr uint64_t literal_95 = 95;
 constexpr uint64_t literal_0x22 = 0x22;
 constexpr uint64_t literal_0x24 = 0x24;
@@ -73,18 +72,6 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
         fapi2::ATTR_PROC_FABRIC_X_ATTACHED_CHIP_CNFG_Type l_TGT0_ATTR_PROC_FABRIC_X_ATTACHED_CHIP_CNFG;
         FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_PROC_FABRIC_X_ATTACHED_CHIP_CNFG, TGT0,
                                l_TGT0_ATTR_PROC_FABRIC_X_ATTACHED_CHIP_CNFG));
-        uint64_t l_def_OBUS3_FBC_ENABLED = ((l_TGT0_ATTR_PROC_FABRIC_X_ATTACHED_CHIP_CNFG[literal_6] !=
-                                             fapi2::ENUM_ATTR_PROC_FABRIC_X_ATTACHED_CHIP_CNFG_FALSE)
-                                            || (l_TGT0_ATTR_PROC_FABRIC_A_ATTACHED_CHIP_CNFG[literal_3] !=
-                                                fapi2::ENUM_ATTR_PROC_FABRIC_A_ATTACHED_CHIP_CNFG_FALSE));
-        uint64_t l_def_OBUS2_FBC_ENABLED = ((l_TGT0_ATTR_PROC_FABRIC_X_ATTACHED_CHIP_CNFG[literal_5] !=
-                                             fapi2::ENUM_ATTR_PROC_FABRIC_X_ATTACHED_CHIP_CNFG_FALSE)
-                                            || (l_TGT0_ATTR_PROC_FABRIC_A_ATTACHED_CHIP_CNFG[literal_2] !=
-                                                fapi2::ENUM_ATTR_PROC_FABRIC_A_ATTACHED_CHIP_CNFG_FALSE));
-        uint64_t l_def_OBUS1_FBC_ENABLED = ((l_TGT0_ATTR_PROC_FABRIC_X_ATTACHED_CHIP_CNFG[literal_4] !=
-                                             fapi2::ENUM_ATTR_PROC_FABRIC_X_ATTACHED_CHIP_CNFG_FALSE)
-                                            || (l_TGT0_ATTR_PROC_FABRIC_A_ATTACHED_CHIP_CNFG[literal_1] !=
-                                                fapi2::ENUM_ATTR_PROC_FABRIC_A_ATTACHED_CHIP_CNFG_FALSE));
         uint64_t l_def_OBUS0_FBC_ENABLED = ((l_TGT0_ATTR_PROC_FABRIC_X_ATTACHED_CHIP_CNFG[literal_3] !=
                                              fapi2::ENUM_ATTR_PROC_FABRIC_X_ATTACHED_CHIP_CNFG_FALSE)
                                             || (l_TGT0_ATTR_PROC_FABRIC_A_ATTACHED_CHIP_CNFG[literal_0] !=
@@ -96,10 +83,22 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
         uint64_t l_def_LO_LIMIT_R = ((l_TGT1_ATTR_FREQ_PB_MHZ * literal_10) > (l_TGT1_ATTR_FREQ_A_MHZ * literal_12));
         uint64_t l_def_OBUS0_LO_LIMIT_D = (l_TGT1_ATTR_FREQ_A_MHZ * literal_10);
         uint64_t l_def_OBUS0_LO_LIMIT_N = (l_TGT1_ATTR_FREQ_PB_MHZ * literal_154);
+        uint64_t l_def_OBUS1_FBC_ENABLED = ((l_TGT0_ATTR_PROC_FABRIC_X_ATTACHED_CHIP_CNFG[literal_4] !=
+                                             fapi2::ENUM_ATTR_PROC_FABRIC_X_ATTACHED_CHIP_CNFG_FALSE)
+                                            || (l_TGT0_ATTR_PROC_FABRIC_A_ATTACHED_CHIP_CNFG[literal_1] !=
+                                                fapi2::ENUM_ATTR_PROC_FABRIC_A_ATTACHED_CHIP_CNFG_FALSE));
         uint64_t l_def_OBUS1_LO_LIMIT_D = l_TGT1_ATTR_FREQ_A_MHZ;
         uint64_t l_def_OBUS1_LO_LIMIT_N = (l_TGT1_ATTR_FREQ_PB_MHZ * literal_12);
+        uint64_t l_def_OBUS2_FBC_ENABLED = ((l_TGT0_ATTR_PROC_FABRIC_X_ATTACHED_CHIP_CNFG[literal_5] !=
+                                             fapi2::ENUM_ATTR_PROC_FABRIC_X_ATTACHED_CHIP_CNFG_FALSE)
+                                            || (l_TGT0_ATTR_PROC_FABRIC_A_ATTACHED_CHIP_CNFG[literal_2] !=
+                                                fapi2::ENUM_ATTR_PROC_FABRIC_A_ATTACHED_CHIP_CNFG_FALSE));
         uint64_t l_def_OBUS2_LO_LIMIT_D = (l_TGT1_ATTR_FREQ_A_MHZ * literal_10);
         uint64_t l_def_OBUS2_LO_LIMIT_N = (l_TGT1_ATTR_FREQ_PB_MHZ * literal_74);
+        uint64_t l_def_OBUS3_FBC_ENABLED = ((l_TGT0_ATTR_PROC_FABRIC_X_ATTACHED_CHIP_CNFG[literal_6] !=
+                                             fapi2::ENUM_ATTR_PROC_FABRIC_X_ATTACHED_CHIP_CNFG_FALSE)
+                                            || (l_TGT0_ATTR_PROC_FABRIC_A_ATTACHED_CHIP_CNFG[literal_3] !=
+                                                fapi2::ENUM_ATTR_PROC_FABRIC_A_ATTACHED_CHIP_CNFG_FALSE));
         uint64_t l_def_OBUS3_LO_LIMIT_D = (l_TGT1_ATTR_FREQ_A_MHZ * literal_10);
         uint64_t l_def_OBUS3_LO_LIMIT_N = (l_TGT1_ATTR_FREQ_PB_MHZ * literal_95);
         fapi2::ATTR_PROC_FABRIC_SMP_OPTICS_MODE_Type l_TGT1_ATTR_PROC_FABRIC_SMP_OPTICS_MODE;
@@ -130,16 +129,6 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                                             && l_TGT0_ATTR_PROC_NPU_REGION_ENABLED));
         fapi2::buffer<uint64_t> l_scom_buffer;
         {
-            FAPI_TRY(fapi2::getScom( TGT0, 0x5013803ull, l_scom_buffer ));
-
-            if ((((l_def_OBUS0_FBC_ENABLED || l_def_OBUS1_FBC_ENABLED) || l_def_OBUS2_FBC_ENABLED) || l_def_OBUS3_FBC_ENABLED))
-            {
-                l_scom_buffer.insert<0, 64, 0, uint64_t>(literal_0xFFFFFFFFFFFFFFFF );
-            }
-
-            FAPI_TRY(fapi2::putScom(TGT0, 0x5013803ull, l_scom_buffer));
-        }
-        {
             FAPI_TRY(fapi2::getScom( TGT0, 0x501380aull, l_scom_buffer ));
 
             if (( ! l_def_OBUS0_FBC_ENABLED))