Initfile updates for FBC DD2

Change-Id: I18bf87b49f9bfba577bfc55fdf3cadc1fe09849f
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/39973
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: DANIEL C. HOWE <dchowe@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Jenny Huynh <jhuynh@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Matt K. Light <mklight@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Dev-Ready: Thi N. Tran <thi@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/39975
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>

5 files changed, 1114 insertions, 493 deletions

diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_cd_hp_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_cd_hp_scom.C
index 0e436a4cb..6e84db92a 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_cd_hp_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_cd_hp_scom.C
@@ -36,7 +36,7 @@ constexpr uint64_t literal_0x0 = 0x0;
 constexpr uint64_t literal_0x1 = 0x1;
 constexpr uint64_t literal_0x2 = 0x2;
 constexpr uint64_t literal_0x3 = 0x3;
-constexpr uint64_t literal_0x7 = 0x7;
+constexpr uint64_t literal_0x5 = 0x5;
 constexpr uint64_t literal_0x00 = 0x00;
 constexpr uint64_t literal_0x06 = 0x06;
 constexpr uint64_t literal_0x0D = 0x0D;
@@ -54,7 +54,7 @@ constexpr uint64_t literal_0b010 = 0b010;
 constexpr uint64_t literal_0x141 = 0x141;
 constexpr uint64_t literal_0x21B = 0x21B;
 constexpr uint64_t literal_0x30D = 0x30D;
-constexpr uint64_t literal_0x5 = 0x5;
+constexpr uint64_t literal_0x7 = 0x7;
 constexpr uint64_t literal_0x000 = 0x000;
 
 fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT0,
@@ -85,8 +85,8 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             l_scom_buffer.flush<0> ();
             l_scom_buffer.insert<49, 3, 61, uint64_t>(literal_0b111 );
             l_scom_buffer.insert<52, 6, 58, uint64_t>(literal_0x4 );
-            constexpr auto l_PB_CMD_PB_CFG_P7_SLEEP_BACKOFF_NEXT_BACKOFF_1K = 0x2;
-            l_scom_buffer.insert<58, 2, 62, uint64_t>(l_PB_CMD_PB_CFG_P7_SLEEP_BACKOFF_NEXT_BACKOFF_1K );
+            constexpr auto l_PB_CMD_PB_CFG_P7_SLEEP_BACKOFF_NEXT_DISABLED = 0x0;
+            l_scom_buffer.insert<58, 2, 62, uint64_t>(l_PB_CMD_PB_CFG_P7_SLEEP_BACKOFF_NEXT_DISABLED );
             l_scom_buffer.insert<60, 3, 61, uint64_t>(literal_0b000 );
             constexpr auto l_PB_CMD_PB_CFG_INCLUDE_LPC_RTY_NEXT_OFF = 0x0;
             l_scom_buffer.insert<63, 1, 63, uint64_t>(l_PB_CMD_PB_CFG_INCLUDE_LPC_RTY_NEXT_OFF );
@@ -101,7 +101,7 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             l_scom_buffer.insert<44, 3, 61, uint64_t>(literal_0x1 );
             l_scom_buffer.insert<47, 3, 61, uint64_t>(literal_0x2 );
             l_scom_buffer.insert<50, 3, 61, uint64_t>(literal_0x3 );
-            l_scom_buffer.insert<53, 3, 61, uint64_t>(literal_0x7 );
+            l_scom_buffer.insert<53, 3, 61, uint64_t>(literal_0x5 );
             FAPI_TRY(fapi2::putScom(TGT0, 0x90000e0605011c11ull, l_scom_buffer));
         }
         {
@@ -330,7 +330,7 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             l_scom_buffer.insert<28, 3, 61, uint64_t>(literal_0x1 );
             l_scom_buffer.insert<31, 3, 61, uint64_t>(literal_0x2 );
             l_scom_buffer.insert<34, 3, 61, uint64_t>(literal_0x3 );
-            l_scom_buffer.insert<37, 3, 61, uint64_t>(literal_0x7 );
+            l_scom_buffer.insert<37, 3, 61, uint64_t>(literal_0x5 );
             l_scom_buffer.insert<40, 3, 61, uint64_t>(literal_0x0 );
             l_scom_buffer.insert<43, 3, 61, uint64_t>(literal_0x0 );
             l_scom_buffer.insert<46, 3, 61, uint64_t>(literal_0x0 );
@@ -338,7 +338,7 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             l_scom_buffer.insert<52, 3, 61, uint64_t>(literal_0x1 );
             l_scom_buffer.insert<55, 3, 61, uint64_t>(literal_0x2 );
             l_scom_buffer.insert<58, 3, 61, uint64_t>(literal_0x3 );
-            l_scom_buffer.insert<61, 3, 61, uint64_t>(literal_0x7 );
+            l_scom_buffer.insert<61, 3, 61, uint64_t>(literal_0x5 );
             FAPI_TRY(fapi2::putScom(TGT0, 0x90000f0505011c11ull, l_scom_buffer));
         }
         {
@@ -351,191 +351,372 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             FAPI_TRY(fapi2::putScom(TGT0, 0x90000f2005011c11ull, l_scom_buffer));
         }
         {
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            l_scom_buffer.flush<0> ();
+
+            if ((l_def_TRUE == literal_1))
+            {
+                l_scom_buffer.insert<12, 3, 61, uint64_t>(literal_0b000 );
+            }
+
+            if ((l_def_TRUE == literal_1))
+            {
+                l_scom_buffer.insert<15, 1, 63, uint64_t>(literal_0b0 );
+            }
+
+            if ((l_def_TRUE == literal_1))
+            {
+                l_scom_buffer.insert<16, 2, 62, uint64_t>(literal_0b00 );
+            }
+
+            if ((l_def_TRUE == literal_1))
+            {
+                l_scom_buffer.insert<18, 1, 63, uint64_t>(literal_0b0 );
+            }
+
+            if ((l_def_TRUE == literal_1))
+            {
+                l_scom_buffer.insert<19, 1, 63, uint64_t>(literal_0b0 );
+            }
+
+            if ((l_def_TRUE == literal_1))
+            {
+                l_scom_buffer.insert<20, 1, 63, uint64_t>(literal_0b1 );
+            }
+
+            if ((l_def_TRUE == literal_1))
+            {
+                l_scom_buffer.insert<21, 2, 62, uint64_t>(literal_0b00 );
+            }
+
+            if ((l_def_TRUE == literal_1))
+            {
+                l_scom_buffer.insert<23, 1, 63, uint64_t>(literal_0b0 );
+            }
+
+            if (((l_def_SAFE_MODE == literal_1) || (l_def_CORE_CEILING_RATIO_8_8 == literal_1)))
+            {
+                l_scom_buffer.insert<24, 2, 62, uint64_t>(literal_0b00 );
+            }
+            else if ((l_def_TRUE == literal_1))
+            {
+                l_scom_buffer.insert<24, 2, 62, uint64_t>(literal_0b11 );
+            }
+
+            if ((l_def_TRUE == literal_1))
+            {
+                l_scom_buffer.insert<26, 1, 63, uint64_t>(literal_0b0 );
+            }
+
+            if ((l_def_TRUE == literal_1))
+            {
+                l_scom_buffer.insert<27, 1, 63, uint64_t>(literal_0b0 );
+            }
+
+            if ((l_def_SAFE_MODE == literal_1))
+            {
+                l_scom_buffer.insert<28, 2, 62, uint64_t>(literal_0b00 );
+            }
+            else if ((l_def_CORE_CEILING_RATIO_8_8 == literal_1))
+            {
+                l_scom_buffer.insert<28, 2, 62, uint64_t>(literal_0b11 );
+            }
+            else if ((l_def_TRUE == literal_1))
+            {
+                l_scom_buffer.insert<28, 2, 62, uint64_t>(literal_0b10 );
+            }
+
+            if ((l_def_TRUE == literal_1))
+            {
+                l_scom_buffer.insert<30, 1, 63, uint64_t>(literal_0b0 );
+            }
+
+            if ((l_def_TRUE == literal_1))
+            {
+                l_scom_buffer.insert<31, 1, 63, uint64_t>(literal_0b0 );
+            }
+
+            if ((l_def_SAFE_MODE == literal_1))
+            {
+                l_scom_buffer.insert<32, 2, 62, uint64_t>(literal_0b00 );
+            }
+            else if ((l_def_TRUE == literal_1))
+            {
+                l_scom_buffer.insert<32, 2, 62, uint64_t>(literal_0b11 );
+            }
+
+            if ((l_def_TRUE == literal_1))
+            {
+                l_scom_buffer.insert<34, 3, 61, uint64_t>(literal_0b111 );
+            }
+
+            if ((l_def_SAFE_MODE == literal_1))
+            {
+                l_scom_buffer.insert<37, 2, 62, uint64_t>(literal_0b00 );
+            }
+            else if ((l_def_TRUE == literal_1))
+            {
+                l_scom_buffer.insert<37, 2, 62, uint64_t>(literal_0b11 );
+            }
+
+            if ((l_def_TRUE == literal_1))
+            {
+                l_scom_buffer.insert<39, 1, 63, uint64_t>(literal_0b0 );
+            }
+
+            if ((l_def_TRUE == literal_1))
+            {
+                l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_0b0 );
+            }
+
+            if ((l_def_TRUE == literal_1))
+            {
+                l_scom_buffer.insert<41, 1, 63, uint64_t>(literal_0b1 );
+            }
+
+            if ((l_def_TRUE == literal_1))
+            {
+                l_scom_buffer.insert<42, 1, 63, uint64_t>(literal_0b1 );
+            }
+
+            if ((l_def_TRUE == literal_1))
+            {
+                l_scom_buffer.insert<43, 1, 63, uint64_t>(literal_0b0 );
+            }
+
+            if (((l_def_SAFE_MODE == literal_1) || (l_def_CORE_CEILING_RATIO_8_8 == literal_1)))
+            {
+                l_scom_buffer.insert<44, 2, 62, uint64_t>(literal_0b00 );
+            }
+            else if ((l_def_TRUE == literal_1))
+            {
+                l_scom_buffer.insert<44, 2, 62, uint64_t>(literal_0b11 );
+            }
+
+            if ((l_def_TRUE == literal_1))
+            {
+                l_scom_buffer.insert<46, 1, 63, uint64_t>(literal_0b0 );
+            }
+
+            if ((l_def_TRUE == literal_1))
+            {
+                l_scom_buffer.insert<47, 1, 63, uint64_t>(literal_0b0 );
+            }
+
+            if ((l_def_TRUE == literal_1))
+            {
+                l_scom_buffer.insert<48, 2, 62, uint64_t>(literal_0b00 );
+            }
+
+            if ((l_def_TRUE == literal_1))
+            {
+                l_scom_buffer.insert<50, 1, 63, uint64_t>(literal_0b0 );
+            }
+
+            if ((l_def_TRUE == literal_1))
+            {
+                l_scom_buffer.insert<51, 1, 63, uint64_t>(literal_0b0 );
+            }
+
+            if ((l_def_TRUE == literal_1))
+            {
+                l_scom_buffer.insert<52, 1, 63, uint64_t>(literal_0b0 );
+            }
+
+            if ((l_def_TRUE == literal_1))
+            {
+                l_scom_buffer.insert<53, 1, 63, uint64_t>(literal_0b0 );
+            }
+
+            if ((l_def_TRUE == literal_1))
+            {
+                l_scom_buffer.insert<54, 10, 54, uint64_t>(literal_0x000 );
+            }
+
+            FAPI_TRY(fapi2::putScom(TGT0, 0x90000f4005011811ull, l_scom_buffer));
+            FAPI_TRY(fapi2::putScom(TGT0, 0x90000f4005012011ull, l_scom_buffer));
+        }
+        {
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) )
             {
                 l_scom_buffer.flush<0> ();
 
                 if ((l_def_TRUE == literal_1))
                 {
-                    l_scom_buffer.insert<12, 3, 61, uint64_t>(literal_0b000 );
+                    l_scom_buffer.insert<26, 2, 62, uint64_t>(literal_0b00 );
                 }
 
                 if ((l_def_TRUE == literal_1))
                 {
-                    l_scom_buffer.insert<15, 1, 63, uint64_t>(literal_0b0 );
+                    l_scom_buffer.insert<28, 1, 63, uint64_t>(literal_0b0 );
                 }
 
                 if ((l_def_TRUE == literal_1))
                 {
-                    l_scom_buffer.insert<16, 2, 62, uint64_t>(literal_0b00 );
+                    l_scom_buffer.insert<29, 2, 62, uint64_t>(literal_0b00 );
                 }
 
                 if ((l_def_TRUE == literal_1))
                 {
-                    l_scom_buffer.insert<18, 1, 63, uint64_t>(literal_0b0 );
+                    l_scom_buffer.insert<31, 2, 62, uint64_t>(literal_0b00 );
                 }
 
                 if ((l_def_TRUE == literal_1))
                 {
-                    l_scom_buffer.insert<19, 1, 63, uint64_t>(literal_0b0 );
+                    l_scom_buffer.insert<33, 1, 63, uint64_t>(literal_0b0 );
                 }
 
                 if ((l_def_TRUE == literal_1))
                 {
-                    l_scom_buffer.insert<20, 1, 63, uint64_t>(literal_0b1 );
+                    l_scom_buffer.insert<34, 1, 63, uint64_t>(literal_0b0 );
                 }
 
-                if ((l_def_TRUE == literal_1))
+                if ((l_def_SAFE_MODE == literal_1))
                 {
-                    l_scom_buffer.insert<21, 2, 62, uint64_t>(literal_0b00 );
+                    l_scom_buffer.insert<35, 1, 63, uint64_t>(literal_0b0 );
                 }
-
-                if ((l_def_TRUE == literal_1))
+                else if ((l_def_TRUE == literal_1))
                 {
-                    l_scom_buffer.insert<23, 1, 63, uint64_t>(literal_0b0 );
+                    l_scom_buffer.insert<35, 1, 63, uint64_t>(literal_0b1 );
                 }
 
-                if (((l_def_SAFE_MODE == literal_1) || (l_def_CORE_CEILING_RATIO_8_8 == literal_1)))
+                if ((l_def_SAFE_MODE == literal_1))
                 {
-                    l_scom_buffer.insert<24, 2, 62, uint64_t>(literal_0b00 );
+                    l_scom_buffer.insert<36, 2, 62, uint64_t>(literal_0b00 );
                 }
                 else if ((l_def_TRUE == literal_1))
                 {
-                    l_scom_buffer.insert<24, 2, 62, uint64_t>(literal_0b11 );
-                }
-
-                if ((l_def_TRUE == literal_1))
-                {
-                    l_scom_buffer.insert<26, 1, 63, uint64_t>(literal_0b0 );
+                    l_scom_buffer.insert<36, 2, 62, uint64_t>(literal_0b01 );
                 }
 
                 if ((l_def_TRUE == literal_1))
                 {
-                    l_scom_buffer.insert<27, 1, 63, uint64_t>(literal_0b0 );
+                    l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0b0 );
                 }
 
                 if ((l_def_SAFE_MODE == literal_1))
                 {
-                    l_scom_buffer.insert<28, 2, 62, uint64_t>(literal_0b00 );
-                }
-                else if ((l_def_CORE_CEILING_RATIO_8_8 == literal_1))
-                {
-                    l_scom_buffer.insert<28, 2, 62, uint64_t>(literal_0b11 );
+                    l_scom_buffer.insert<39, 2, 62, uint64_t>(literal_0b00 );
                 }
                 else if ((l_def_TRUE == literal_1))
                 {
-                    l_scom_buffer.insert<28, 2, 62, uint64_t>(literal_0b10 );
+                    l_scom_buffer.insert<39, 2, 62, uint64_t>(literal_0b10 );
                 }
 
-                if ((l_def_TRUE == literal_1))
+                if ((l_def_SAFE_MODE == literal_1))
                 {
-                    l_scom_buffer.insert<30, 1, 63, uint64_t>(literal_0b0 );
+                    l_scom_buffer.insert<41, 2, 62, uint64_t>(literal_0b00 );
                 }
-
-                if ((l_def_TRUE == literal_1))
+                else if ((l_def_CORE_FLOOR_RATIO_2_8 == literal_1))
                 {
-                    l_scom_buffer.insert<31, 1, 63, uint64_t>(literal_0b0 );
+                    l_scom_buffer.insert<41, 2, 62, uint64_t>(literal_0b11 );
                 }
-
-                if ((l_def_SAFE_MODE == literal_1))
+                else if ((l_def_CORE_FLOOR_RATIO_4_8 == literal_1))
                 {
-                    l_scom_buffer.insert<32, 2, 62, uint64_t>(literal_0b00 );
+                    l_scom_buffer.insert<41, 2, 62, uint64_t>(literal_0b10 );
                 }
                 else if ((l_def_TRUE == literal_1))
                 {
-                    l_scom_buffer.insert<32, 2, 62, uint64_t>(literal_0b11 );
+                    l_scom_buffer.insert<41, 2, 62, uint64_t>(literal_0b01 );
                 }
 
                 if ((l_def_TRUE == literal_1))
                 {
-                    l_scom_buffer.insert<34, 3, 61, uint64_t>(literal_0b111 );
+                    l_scom_buffer.insert<43, 1, 63, uint64_t>(literal_0b0 );
                 }
 
-                if ((l_def_SAFE_MODE == literal_1))
+                if (((l_def_SAFE_MODE == literal_1) || (l_def_CORE_FLOOR_RATIO_2_8 == literal_1)))
+                {
+                    l_scom_buffer.insert<44, 2, 62, uint64_t>(literal_0b00 );
+                }
+                else if ((l_def_CORE_FLOOR_RATIO_4_8 == literal_1))
                 {
-                    l_scom_buffer.insert<37, 2, 62, uint64_t>(literal_0b00 );
+                    l_scom_buffer.insert<44, 2, 62, uint64_t>(literal_0b11 );
                 }
                 else if ((l_def_TRUE == literal_1))
                 {
-                    l_scom_buffer.insert<37, 2, 62, uint64_t>(literal_0b11 );
+                    l_scom_buffer.insert<44, 2, 62, uint64_t>(literal_0b10 );
                 }
 
                 if ((l_def_TRUE == literal_1))
                 {
-                    l_scom_buffer.insert<39, 1, 63, uint64_t>(literal_0b0 );
+                    l_scom_buffer.insert<46, 2, 62, uint64_t>(literal_0b00 );
                 }
 
                 if ((l_def_TRUE == literal_1))
                 {
-                    l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_0b0 );
+                    l_scom_buffer.insert<48, 1, 63, uint64_t>(literal_0b0 );
                 }
 
-                if ((l_def_TRUE == literal_1))
+                if ((l_def_SAFE_MODE == literal_1))
                 {
-                    l_scom_buffer.insert<41, 1, 63, uint64_t>(literal_0b1 );
+                    l_scom_buffer.insert<49, 1, 63, uint64_t>(literal_0b0 );
                 }
-
-                if ((l_def_TRUE == literal_1))
+                else if ((l_def_TRUE == literal_1))
                 {
-                    l_scom_buffer.insert<42, 1, 63, uint64_t>(literal_0b1 );
+                    l_scom_buffer.insert<49, 1, 63, uint64_t>(literal_0b1 );
                 }
 
                 if ((l_def_TRUE == literal_1))
                 {
-                    l_scom_buffer.insert<43, 1, 63, uint64_t>(literal_0b0 );
+                    l_scom_buffer.insert<50, 1, 63, uint64_t>(literal_0b0 );
                 }
 
-                if (((l_def_SAFE_MODE == literal_1) || (l_def_CORE_CEILING_RATIO_8_8 == literal_1)))
+                if ((l_def_SAFE_MODE == literal_1))
                 {
-                    l_scom_buffer.insert<44, 2, 62, uint64_t>(literal_0b00 );
+                    l_scom_buffer.insert<51, 2, 62, uint64_t>(literal_0b00 );
                 }
                 else if ((l_def_TRUE == literal_1))
                 {
-                    l_scom_buffer.insert<44, 2, 62, uint64_t>(literal_0b11 );
+                    l_scom_buffer.insert<51, 2, 62, uint64_t>(literal_0b01 );
                 }
 
                 if ((l_def_TRUE == literal_1))
                 {
-                    l_scom_buffer.insert<46, 1, 63, uint64_t>(literal_0b0 );
+                    l_scom_buffer.insert<53, 1, 63, uint64_t>(literal_0b0 );
                 }
 
                 if ((l_def_TRUE == literal_1))
                 {
-                    l_scom_buffer.insert<47, 1, 63, uint64_t>(literal_0b0 );
+                    l_scom_buffer.insert<54, 1, 63, uint64_t>(literal_0b0 );
                 }
 
                 if ((l_def_TRUE == literal_1))
                 {
-                    l_scom_buffer.insert<48, 2, 62, uint64_t>(literal_0b00 );
+                    l_scom_buffer.insert<55, 1, 63, uint64_t>(literal_0b0 );
                 }
 
                 if ((l_def_TRUE == literal_1))
                 {
-                    l_scom_buffer.insert<50, 1, 63, uint64_t>(literal_0b0 );
+                    l_scom_buffer.insert<56, 1, 63, uint64_t>(literal_0b0 );
                 }
 
                 if ((l_def_TRUE == literal_1))
                 {
-                    l_scom_buffer.insert<51, 1, 63, uint64_t>(literal_0b0 );
+                    l_scom_buffer.insert<57, 2, 62, uint64_t>(literal_0b00 );
                 }
 
                 if ((l_def_TRUE == literal_1))
                 {
-                    l_scom_buffer.insert<52, 1, 63, uint64_t>(literal_0b0 );
+                    l_scom_buffer.insert<59, 1, 63, uint64_t>(literal_0b0 );
                 }
 
                 if ((l_def_TRUE == literal_1))
                 {
-                    l_scom_buffer.insert<53, 1, 63, uint64_t>(literal_0b0 );
+                    l_scom_buffer.insert<60, 2, 62, uint64_t>(literal_0b00 );
+                }
+
+                if ((l_def_TRUE == literal_1))
+                {
+                    l_scom_buffer.insert<62, 1, 63, uint64_t>(literal_0b0 );
                 }
 
                 if ((l_def_TRUE == literal_1))
                 {
-                    l_scom_buffer.insert<54, 10, 54, uint64_t>(literal_0x000 );
+                    l_scom_buffer.insert<63, 1, 63, uint64_t>(literal_0b0 );
                 }
 
-                FAPI_TRY(fapi2::putScom(TGT0, 0x90000f4005011811ull, l_scom_buffer));
-                FAPI_TRY(fapi2::putScom(TGT0, 0x90000f4005012011ull, l_scom_buffer));
+                FAPI_TRY(fapi2::putScom(TGT0, 0x90000e6105011811ull, l_scom_buffer));
+                FAPI_TRY(fapi2::putScom(TGT0, 0x90000e6105012011ull, l_scom_buffer));
             }
         }
 
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioe_tl_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioe_tl_scom.C
index 0df821fc6..81907e9b0 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioe_tl_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioe_tl_scom.C
@@ -33,22 +33,23 @@ constexpr uint64_t literal_0 = 0;
 constexpr uint64_t literal_0x1 = 0x1;
 constexpr uint64_t literal_0x20 = 0x20;
 constexpr uint64_t literal_1 = 1;
-constexpr uint64_t literal_12 = 12;
 constexpr uint64_t literal_10 = 10;
-constexpr uint64_t literal_0b0010001 = 0b0010001;
-constexpr uint64_t literal_11 = 11;
-constexpr uint64_t literal_0b0010000 = 0b0010000;
-constexpr uint64_t literal_0b0001111 = 0b0001111;
-constexpr uint64_t literal_0b0001110 = 0b0001110;
-constexpr uint64_t literal_0b0001101 = 0b0001101;
-constexpr uint64_t literal_13 = 13;
-constexpr uint64_t literal_0b0001100 = 0b0001100;
+constexpr uint64_t literal_82 = 82;
+constexpr uint64_t literal_0x15 = 0x15;
+constexpr uint64_t literal_5 = 5;
+constexpr uint64_t literal_100 = 100;
+constexpr uint64_t literal_1075 = 1075;
+constexpr uint64_t literal_0x1A = 0x1A;
+constexpr uint64_t literal_0x19 = 0x19;
 constexpr uint64_t literal_2 = 2;
+constexpr uint64_t literal_0x10 = 0x10;
 constexpr uint64_t literal_0x1F = 0x1F;
 constexpr uint64_t literal_0x3F = 0x3F;
 constexpr uint64_t literal_0x40 = 0x40;
 constexpr uint64_t literal_0x3C = 0x3C;
 constexpr uint64_t literal_0b0101 = 0b0101;
+constexpr uint64_t literal_0b0100 = 0b0100;
+constexpr uint64_t literal_0b0001 = 0b0001;
 
 fapi2::ReturnCode p9_fbc_ioe_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT0,
                                      const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT1)
@@ -62,18 +63,26 @@ fapi2::ReturnCode p9_fbc_ioe_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
         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_X0_ENABLED = (l_TGT0_ATTR_PROC_FABRIC_X_ATTACHED_CHIP_CNFG[literal_0] != literal_0);
-        fapi2::ATTR_FREQ_PB_MHZ_Type l_TGT1_ATTR_FREQ_PB_MHZ;
-        FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_FREQ_PB_MHZ, TGT1, l_TGT1_ATTR_FREQ_PB_MHZ));
+        fapi2::ATTR_CHIP_EC_FEATURE_DD1_FBC_SETTINGS_Type l_TGT0_ATTR_CHIP_EC_FEATURE_DD1_FBC_SETTINGS;
+        FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CHIP_EC_FEATURE_DD1_FBC_SETTINGS, TGT0,
+                               l_TGT0_ATTR_CHIP_EC_FEATURE_DD1_FBC_SETTINGS));
+        uint64_t l_def_DD2X_PARTS = (l_TGT0_ATTR_CHIP_EC_FEATURE_DD1_FBC_SETTINGS != literal_1);
         fapi2::ATTR_FREQ_X_MHZ_Type l_TGT1_ATTR_FREQ_X_MHZ;
         FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_FREQ_X_MHZ, TGT1, l_TGT1_ATTR_FREQ_X_MHZ));
-        uint64_t l_def_X_RATIO_12_10 = ((literal_10 * l_TGT1_ATTR_FREQ_X_MHZ) >= (literal_12 * l_TGT1_ATTR_FREQ_PB_MHZ));
-        uint64_t l_def_X_RATIO_11_10 = ((literal_10 * l_TGT1_ATTR_FREQ_X_MHZ) >= (literal_11 * l_TGT1_ATTR_FREQ_PB_MHZ));
-        uint64_t l_def_X_RATIO_10_10 = ((literal_10 * l_TGT1_ATTR_FREQ_X_MHZ) >= (literal_10 * l_TGT1_ATTR_FREQ_PB_MHZ));
-        uint64_t l_def_X_RATIO_10_11 = ((literal_11 * l_TGT1_ATTR_FREQ_X_MHZ) >= (literal_10 * l_TGT1_ATTR_FREQ_PB_MHZ));
-        uint64_t l_def_X_RATIO_10_12 = ((literal_12 * l_TGT1_ATTR_FREQ_X_MHZ) >= (literal_10 * l_TGT1_ATTR_FREQ_PB_MHZ));
-        uint64_t l_def_X_RATIO_10_13 = ((literal_13 * l_TGT1_ATTR_FREQ_X_MHZ) >= (literal_10 * l_TGT1_ATTR_FREQ_PB_MHZ));
+        uint64_t l_def_DD2_LO_LIMIT_D = (l_TGT1_ATTR_FREQ_X_MHZ * literal_10);
+        fapi2::ATTR_FREQ_PB_MHZ_Type l_TGT1_ATTR_FREQ_PB_MHZ;
+        FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_FREQ_PB_MHZ, TGT1, l_TGT1_ATTR_FREQ_PB_MHZ));
+        uint64_t l_def_DD2_LO_LIMIT_N = (l_TGT1_ATTR_FREQ_PB_MHZ * literal_82);
+        uint64_t l_def_DD1_LO_LIMIT_D = (l_TGT1_ATTR_FREQ_X_MHZ * literal_100);
+        uint64_t l_def_DD1_LO_LIMIT_N = (l_TGT1_ATTR_FREQ_PB_MHZ * literal_1075);
+        uint64_t l_def_DD1_LO_LIMIT_R = (l_def_DD1_LO_LIMIT_N % l_def_DD1_LO_LIMIT_D);
+        uint64_t l_def_DD1_PARTS = (l_TGT0_ATTR_CHIP_EC_FEATURE_DD1_FBC_SETTINGS == literal_1);
         uint64_t l_def_X1_ENABLED = (l_TGT0_ATTR_PROC_FABRIC_X_ATTACHED_CHIP_CNFG[literal_1] != literal_0);
         uint64_t l_def_X2_ENABLED = (l_TGT0_ATTR_PROC_FABRIC_X_ATTACHED_CHIP_CNFG[literal_2] != literal_0);
+        fapi2::ATTR_PROC_FABRIC_SMP_OPTICS_MODE_Type l_TGT1_ATTR_PROC_FABRIC_SMP_OPTICS_MODE;
+        FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_PROC_FABRIC_SMP_OPTICS_MODE, TGT1, l_TGT1_ATTR_PROC_FABRIC_SMP_OPTICS_MODE));
+        uint64_t l_def_OPTICS_IS_A_BUS = (l_TGT1_ATTR_PROC_FABRIC_SMP_OPTICS_MODE ==
+                                          fapi2::ENUM_ATTR_PROC_FABRIC_SMP_OPTICS_MODE_OPTICS_IS_A_BUS);
         fapi2::ATTR_CHIP_EC_FEATURE_HW384245_Type l_TGT0_ATTR_CHIP_EC_FEATURE_HW384245;
         FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CHIP_EC_FEATURE_HW384245, TGT0, l_TGT0_ATTR_CHIP_EC_FEATURE_HW384245));
         fapi2::buffer<uint64_t> l_scom_buffer;
@@ -90,29 +99,21 @@ fapi2::ReturnCode p9_fbc_ioe_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                 l_scom_buffer.insert<12, 8, 56, uint64_t>(literal_0x20 );
             }
 
-            if ((l_def_X0_ENABLED && (l_def_X_RATIO_12_10 == literal_1)))
-            {
-                l_scom_buffer.insert<4, 8, 56, uint64_t>(literal_0b0010001 );
-            }
-            else if ((l_def_X0_ENABLED && (l_def_X_RATIO_11_10 == literal_1)))
-            {
-                l_scom_buffer.insert<4, 8, 56, uint64_t>(literal_0b0010000 );
-            }
-            else if ((l_def_X0_ENABLED && (l_def_X_RATIO_10_10 == literal_1)))
+            if ((l_def_X0_ENABLED && l_def_DD2X_PARTS))
             {
-                l_scom_buffer.insert<4, 8, 56, uint64_t>(literal_0b0001111 );
+                l_scom_buffer.insert<4, 8, 56, uint64_t>((literal_0x15 - (l_def_DD2_LO_LIMIT_N / l_def_DD2_LO_LIMIT_D)) );
             }
-            else if ((l_def_X0_ENABLED && (l_def_X_RATIO_10_11 == literal_1)))
+            else if (((l_def_X0_ENABLED && l_def_DD1_PARTS) && (l_def_DD1_LO_LIMIT_R < literal_5)))
             {
-                l_scom_buffer.insert<4, 8, 56, uint64_t>(literal_0b0001110 );
+                l_scom_buffer.insert<4, 8, 56, uint64_t>((literal_0x1A - (l_def_DD1_LO_LIMIT_N / l_def_DD1_LO_LIMIT_D)) );
             }
-            else if ((l_def_X0_ENABLED && (l_def_X_RATIO_10_12 == literal_1)))
+            else if (((l_def_X0_ENABLED && l_def_DD1_PARTS) && (l_def_DD1_LO_LIMIT_R == literal_5)))
             {
-                l_scom_buffer.insert<4, 8, 56, uint64_t>(literal_0b0001101 );
+                l_scom_buffer.insert<4, 8, 56, uint64_t>((literal_0x19 - (l_def_DD1_LO_LIMIT_N / l_def_DD1_LO_LIMIT_D)) );
             }
-            else if ((l_def_X0_ENABLED && (l_def_X_RATIO_10_13 == literal_1)))
+            else if (((l_def_X0_ENABLED && l_def_DD1_PARTS) && (l_def_DD1_LO_LIMIT_R > literal_5)))
             {
-                l_scom_buffer.insert<4, 8, 56, uint64_t>(literal_0b0001100 );
+                l_scom_buffer.insert<4, 8, 56, uint64_t>((literal_0x19 - (l_def_DD1_LO_LIMIT_N / l_def_DD1_LO_LIMIT_D)) );
             }
 
             if (l_def_X0_ENABLED)
@@ -120,29 +121,21 @@ fapi2::ReturnCode p9_fbc_ioe_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                 l_scom_buffer.insert<44, 8, 56, uint64_t>(literal_0x20 );
             }
 
-            if ((l_def_X0_ENABLED && (l_def_X_RATIO_12_10 == literal_1)))
-            {
-                l_scom_buffer.insert<36, 8, 56, uint64_t>(literal_0b0010001 );
-            }
-            else if ((l_def_X0_ENABLED && (l_def_X_RATIO_11_10 == literal_1)))
+            if ((l_def_X0_ENABLED && l_def_DD2X_PARTS))
             {
-                l_scom_buffer.insert<36, 8, 56, uint64_t>(literal_0b0010000 );
+                l_scom_buffer.insert<36, 8, 56, uint64_t>((literal_0x15 - (l_def_DD2_LO_LIMIT_N / l_def_DD2_LO_LIMIT_D)) );
             }
-            else if ((l_def_X0_ENABLED && (l_def_X_RATIO_10_10 == literal_1)))
+            else if (((l_def_X0_ENABLED && l_def_DD1_PARTS) && (l_def_DD1_LO_LIMIT_R < literal_5)))
             {
-                l_scom_buffer.insert<36, 8, 56, uint64_t>(literal_0b0001111 );
+                l_scom_buffer.insert<36, 8, 56, uint64_t>((literal_0x1A - (l_def_DD1_LO_LIMIT_N / l_def_DD1_LO_LIMIT_D)) );
             }
-            else if ((l_def_X0_ENABLED && (l_def_X_RATIO_10_11 == literal_1)))
+            else if (((l_def_X0_ENABLED && l_def_DD1_PARTS) && (l_def_DD1_LO_LIMIT_R == literal_5)))
             {
-                l_scom_buffer.insert<36, 8, 56, uint64_t>(literal_0b0001110 );
+                l_scom_buffer.insert<36, 8, 56, uint64_t>((literal_0x19 - (l_def_DD1_LO_LIMIT_N / l_def_DD1_LO_LIMIT_D)) );
             }
-            else if ((l_def_X0_ENABLED && (l_def_X_RATIO_10_12 == literal_1)))
+            else if (((l_def_X0_ENABLED && l_def_DD1_PARTS) && (l_def_DD1_LO_LIMIT_R > literal_5)))
             {
-                l_scom_buffer.insert<36, 8, 56, uint64_t>(literal_0b0001101 );
-            }
-            else if ((l_def_X0_ENABLED && (l_def_X_RATIO_10_13 == literal_1)))
-            {
-                l_scom_buffer.insert<36, 8, 56, uint64_t>(literal_0b0001100 );
+                l_scom_buffer.insert<36, 8, 56, uint64_t>((literal_0x19 - (l_def_DD1_LO_LIMIT_N / l_def_DD1_LO_LIMIT_D)) );
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x501340aull, l_scom_buffer));
@@ -160,29 +153,21 @@ fapi2::ReturnCode p9_fbc_ioe_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                 l_scom_buffer.insert<12, 8, 56, uint64_t>(literal_0x20 );
             }
 
-            if ((l_def_X1_ENABLED && (l_def_X_RATIO_12_10 == literal_1)))
-            {
-                l_scom_buffer.insert<4, 8, 56, uint64_t>(literal_0b0010001 );
-            }
-            else if ((l_def_X1_ENABLED && (l_def_X_RATIO_11_10 == literal_1)))
-            {
-                l_scom_buffer.insert<4, 8, 56, uint64_t>(literal_0b0010000 );
-            }
-            else if ((l_def_X1_ENABLED && (l_def_X_RATIO_10_10 == literal_1)))
+            if ((l_def_X1_ENABLED && l_def_DD2X_PARTS))
             {
-                l_scom_buffer.insert<4, 8, 56, uint64_t>(literal_0b0001111 );
+                l_scom_buffer.insert<4, 8, 56, uint64_t>((literal_0x15 - (l_def_DD2_LO_LIMIT_N / l_def_DD2_LO_LIMIT_D)) );
             }
-            else if ((l_def_X1_ENABLED && (l_def_X_RATIO_10_11 == literal_1)))
+            else if (((l_def_X1_ENABLED && l_def_DD1_PARTS) && (l_def_DD1_LO_LIMIT_R < literal_5)))
             {
-                l_scom_buffer.insert<4, 8, 56, uint64_t>(literal_0b0001110 );
+                l_scom_buffer.insert<4, 8, 56, uint64_t>((literal_0x1A - (l_def_DD1_LO_LIMIT_N / l_def_DD1_LO_LIMIT_D)) );
             }
-            else if ((l_def_X1_ENABLED && (l_def_X_RATIO_10_12 == literal_1)))
+            else if (((l_def_X1_ENABLED && l_def_DD1_PARTS) && (l_def_DD1_LO_LIMIT_R == literal_5)))
             {
-                l_scom_buffer.insert<4, 8, 56, uint64_t>(literal_0b0001101 );
+                l_scom_buffer.insert<4, 8, 56, uint64_t>((literal_0x19 - (l_def_DD1_LO_LIMIT_N / l_def_DD1_LO_LIMIT_D)) );
             }
-            else if ((l_def_X1_ENABLED && (l_def_X_RATIO_10_13 == literal_1)))
+            else if (((l_def_X1_ENABLED && l_def_DD1_PARTS) && (l_def_DD1_LO_LIMIT_R > literal_5)))
             {
-                l_scom_buffer.insert<4, 8, 56, uint64_t>(literal_0b0001100 );
+                l_scom_buffer.insert<4, 8, 56, uint64_t>((literal_0x19 - (l_def_DD1_LO_LIMIT_N / l_def_DD1_LO_LIMIT_D)) );
             }
 
             if (l_def_X1_ENABLED)
@@ -190,29 +175,21 @@ fapi2::ReturnCode p9_fbc_ioe_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                 l_scom_buffer.insert<44, 8, 56, uint64_t>(literal_0x20 );
             }
 
-            if ((l_def_X1_ENABLED && (l_def_X_RATIO_12_10 == literal_1)))
-            {
-                l_scom_buffer.insert<36, 8, 56, uint64_t>(literal_0b0010001 );
-            }
-            else if ((l_def_X1_ENABLED && (l_def_X_RATIO_11_10 == literal_1)))
-            {
-                l_scom_buffer.insert<36, 8, 56, uint64_t>(literal_0b0010000 );
-            }
-            else if ((l_def_X1_ENABLED && (l_def_X_RATIO_10_10 == literal_1)))
+            if ((l_def_X1_ENABLED && l_def_DD2X_PARTS))
             {
-                l_scom_buffer.insert<36, 8, 56, uint64_t>(literal_0b0001111 );
+                l_scom_buffer.insert<36, 8, 56, uint64_t>((literal_0x15 - (l_def_DD2_LO_LIMIT_N / l_def_DD2_LO_LIMIT_D)) );
             }
-            else if ((l_def_X1_ENABLED && (l_def_X_RATIO_10_11 == literal_1)))
+            else if (((l_def_X1_ENABLED && l_def_DD1_PARTS) && (l_def_DD1_LO_LIMIT_R < literal_5)))
             {
-                l_scom_buffer.insert<36, 8, 56, uint64_t>(literal_0b0001110 );
+                l_scom_buffer.insert<36, 8, 56, uint64_t>((literal_0x1A - (l_def_DD1_LO_LIMIT_N / l_def_DD1_LO_LIMIT_D)) );
             }
-            else if ((l_def_X1_ENABLED && (l_def_X_RATIO_10_12 == literal_1)))
+            else if (((l_def_X1_ENABLED && l_def_DD1_PARTS) && (l_def_DD1_LO_LIMIT_R == literal_5)))
             {
-                l_scom_buffer.insert<36, 8, 56, uint64_t>(literal_0b0001101 );
+                l_scom_buffer.insert<36, 8, 56, uint64_t>((literal_0x19 - (l_def_DD1_LO_LIMIT_N / l_def_DD1_LO_LIMIT_D)) );
             }
-            else if ((l_def_X1_ENABLED && (l_def_X_RATIO_10_13 == literal_1)))
+            else if (((l_def_X1_ENABLED && l_def_DD1_PARTS) && (l_def_DD1_LO_LIMIT_R > literal_5)))
             {
-                l_scom_buffer.insert<36, 8, 56, uint64_t>(literal_0b0001100 );
+                l_scom_buffer.insert<36, 8, 56, uint64_t>((literal_0x19 - (l_def_DD1_LO_LIMIT_N / l_def_DD1_LO_LIMIT_D)) );
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x501340bull, l_scom_buffer));
@@ -230,29 +207,21 @@ fapi2::ReturnCode p9_fbc_ioe_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                 l_scom_buffer.insert<12, 8, 56, uint64_t>(literal_0x20 );
             }
 
-            if ((l_def_X2_ENABLED && (l_def_X_RATIO_12_10 == literal_1)))
+            if ((l_def_X2_ENABLED && l_def_DD2X_PARTS))
             {
-                l_scom_buffer.insert<4, 8, 56, uint64_t>(literal_0b0010001 );
+                l_scom_buffer.insert<4, 8, 56, uint64_t>((literal_0x15 - (l_def_DD2_LO_LIMIT_N / l_def_DD2_LO_LIMIT_D)) );
             }
-            else if ((l_def_X2_ENABLED && (l_def_X_RATIO_11_10 == literal_1)))
+            else if (((l_def_X2_ENABLED && l_def_DD1_PARTS) && (l_def_DD1_LO_LIMIT_R < literal_5)))
             {
-                l_scom_buffer.insert<4, 8, 56, uint64_t>(literal_0b0010000 );
+                l_scom_buffer.insert<4, 8, 56, uint64_t>((literal_0x1A - (l_def_DD1_LO_LIMIT_N / l_def_DD1_LO_LIMIT_D)) );
             }
-            else if ((l_def_X2_ENABLED && (l_def_X_RATIO_10_10 == literal_1)))
+            else if (((l_def_X2_ENABLED && l_def_DD1_PARTS) && (l_def_DD1_LO_LIMIT_R == literal_5)))
             {
-                l_scom_buffer.insert<4, 8, 56, uint64_t>(literal_0b0001111 );
+                l_scom_buffer.insert<4, 8, 56, uint64_t>((literal_0x19 - (l_def_DD1_LO_LIMIT_N / l_def_DD1_LO_LIMIT_D)) );
             }
-            else if ((l_def_X2_ENABLED && (l_def_X_RATIO_10_11 == literal_1)))
+            else if (((l_def_X2_ENABLED && l_def_DD1_PARTS) && (l_def_DD1_LO_LIMIT_R > literal_5)))
             {
-                l_scom_buffer.insert<4, 8, 56, uint64_t>(literal_0b0001110 );
-            }
-            else if ((l_def_X2_ENABLED && (l_def_X_RATIO_10_12 == literal_1)))
-            {
-                l_scom_buffer.insert<4, 8, 56, uint64_t>(literal_0b0001101 );
-            }
-            else if ((l_def_X2_ENABLED && (l_def_X_RATIO_10_13 == literal_1)))
-            {
-                l_scom_buffer.insert<4, 8, 56, uint64_t>(literal_0b0001100 );
+                l_scom_buffer.insert<4, 8, 56, uint64_t>((literal_0x19 - (l_def_DD1_LO_LIMIT_N / l_def_DD1_LO_LIMIT_D)) );
             }
 
             if (l_def_X2_ENABLED)
@@ -260,29 +229,21 @@ fapi2::ReturnCode p9_fbc_ioe_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                 l_scom_buffer.insert<44, 8, 56, uint64_t>(literal_0x20 );
             }
 
-            if ((l_def_X2_ENABLED && (l_def_X_RATIO_12_10 == literal_1)))
-            {
-                l_scom_buffer.insert<36, 8, 56, uint64_t>(literal_0b0010001 );
-            }
-            else if ((l_def_X2_ENABLED && (l_def_X_RATIO_11_10 == literal_1)))
-            {
-                l_scom_buffer.insert<36, 8, 56, uint64_t>(literal_0b0010000 );
-            }
-            else if ((l_def_X2_ENABLED && (l_def_X_RATIO_10_10 == literal_1)))
+            if ((l_def_X2_ENABLED && l_def_DD2X_PARTS))
             {
-                l_scom_buffer.insert<36, 8, 56, uint64_t>(literal_0b0001111 );
+                l_scom_buffer.insert<36, 8, 56, uint64_t>((literal_0x15 - (l_def_DD2_LO_LIMIT_N / l_def_DD2_LO_LIMIT_D)) );
             }
-            else if ((l_def_X2_ENABLED && (l_def_X_RATIO_10_11 == literal_1)))
+            else if (((l_def_X2_ENABLED && l_def_DD1_PARTS) && (l_def_DD1_LO_LIMIT_R < literal_5)))
             {
-                l_scom_buffer.insert<36, 8, 56, uint64_t>(literal_0b0001110 );
+                l_scom_buffer.insert<36, 8, 56, uint64_t>((literal_0x1A - (l_def_DD1_LO_LIMIT_N / l_def_DD1_LO_LIMIT_D)) );
             }
-            else if ((l_def_X2_ENABLED && (l_def_X_RATIO_10_12 == literal_1)))
+            else if (((l_def_X2_ENABLED && l_def_DD1_PARTS) && (l_def_DD1_LO_LIMIT_R == literal_5)))
             {
-                l_scom_buffer.insert<36, 8, 56, uint64_t>(literal_0b0001101 );
+                l_scom_buffer.insert<36, 8, 56, uint64_t>((literal_0x19 - (l_def_DD1_LO_LIMIT_N / l_def_DD1_LO_LIMIT_D)) );
             }
-            else if ((l_def_X2_ENABLED && (l_def_X_RATIO_10_13 == literal_1)))
+            else if (((l_def_X2_ENABLED && l_def_DD1_PARTS) && (l_def_DD1_LO_LIMIT_R > literal_5)))
             {
-                l_scom_buffer.insert<36, 8, 56, uint64_t>(literal_0b0001100 );
+                l_scom_buffer.insert<36, 8, 56, uint64_t>((literal_0x19 - (l_def_DD1_LO_LIMIT_N / l_def_DD1_LO_LIMIT_D)) );
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x501340cull, l_scom_buffer));
@@ -290,7 +251,11 @@ fapi2::ReturnCode p9_fbc_ioe_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x5013410ull, l_scom_buffer ));
 
-            if (l_def_X0_ENABLED)
+            if ((l_def_X0_ENABLED && l_def_OPTICS_IS_A_BUS))
+            {
+                l_scom_buffer.insert<24, 5, 59, uint64_t>(literal_0x10 );
+            }
+            else if (l_def_X0_ENABLED)
             {
                 l_scom_buffer.insert<24, 5, 59, uint64_t>(literal_0x1F );
             }
@@ -323,7 +288,11 @@ fapi2::ReturnCode p9_fbc_ioe_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x5013411ull, l_scom_buffer ));
 
-            if (l_def_X1_ENABLED)
+            if ((l_def_X0_ENABLED && l_def_OPTICS_IS_A_BUS))
+            {
+                l_scom_buffer.insert<24, 5, 59, uint64_t>(literal_0x10 );
+            }
+            else if (l_def_X1_ENABLED)
             {
                 l_scom_buffer.insert<24, 5, 59, uint64_t>(literal_0x1F );
             }
@@ -356,7 +325,11 @@ fapi2::ReturnCode p9_fbc_ioe_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x5013412ull, l_scom_buffer ));
 
-            if (l_def_X2_ENABLED)
+            if ((l_def_X0_ENABLED && l_def_OPTICS_IS_A_BUS))
+            {
+                l_scom_buffer.insert<24, 5, 59, uint64_t>(literal_0x10 );
+            }
+            else if (l_def_X2_ENABLED)
             {
                 l_scom_buffer.insert<24, 5, 59, uint64_t>(literal_0x1F );
             }
@@ -426,26 +399,26 @@ fapi2::ReturnCode p9_fbc_ioe_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
 
             if ((( ! l_def_X0_ENABLED) && l_def_X1_ENABLED))
             {
-                l_scom_buffer.insert<16, 4, 60, uint64_t>(literal_0b0101 );
-                l_scom_buffer.insert<24, 4, 60, uint64_t>(literal_0b0101 );
+                l_scom_buffer.insert<16, 4, 60, uint64_t>(literal_0b0100 );
+                l_scom_buffer.insert<24, 4, 60, uint64_t>(literal_0b0100 );
             }
 
             if ((( ! l_def_X0_ENABLED) && l_def_X1_ENABLED))
             {
-                l_scom_buffer.insert<20, 4, 60, uint64_t>(literal_0b0101 );
-                l_scom_buffer.insert<28, 4, 60, uint64_t>(literal_0b0101 );
+                l_scom_buffer.insert<20, 4, 60, uint64_t>(literal_0b0001 );
+                l_scom_buffer.insert<28, 4, 60, uint64_t>(literal_0b0001 );
             }
 
             if (((( ! l_def_X0_ENABLED) && ( ! l_def_X1_ENABLED)) && l_def_X2_ENABLED))
             {
-                l_scom_buffer.insert<32, 4, 60, uint64_t>(literal_0b0101 );
-                l_scom_buffer.insert<40, 4, 60, uint64_t>(literal_0b0101 );
+                l_scom_buffer.insert<32, 4, 60, uint64_t>(literal_0b0001 );
+                l_scom_buffer.insert<40, 4, 60, uint64_t>(literal_0b0001 );
             }
 
             if (((( ! l_def_X0_ENABLED) && ( ! l_def_X1_ENABLED)) && l_def_X2_ENABLED))
             {
-                l_scom_buffer.insert<36, 4, 60, uint64_t>(literal_0b0101 );
-                l_scom_buffer.insert<44, 4, 60, uint64_t>(literal_0b0101 );
+                l_scom_buffer.insert<36, 4, 60, uint64_t>(literal_0b0001 );
+                l_scom_buffer.insert<44, 4, 60, uint64_t>(literal_0b0001 );
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x5013424ull, l_scom_buffer));
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 e3b70d941..3076dccd5 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
@@ -37,9 +37,30 @@ constexpr uint64_t literal_5 = 5;
 constexpr uint64_t literal_1 = 1;
 constexpr uint64_t literal_4 = 4;
 constexpr uint64_t literal_0xFFFFFFFFFFFFFFFF = 0xFFFFFFFFFFFFFFFF;
-constexpr uint64_t literal_0b0101 = 0b0101;
+constexpr uint64_t literal_0x1 = 0x1;
+constexpr uint64_t literal_0x40 = 0x40;
+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_12 = 12;
+constexpr uint64_t literal_0x2A = 0x2A;
+constexpr uint64_t literal_0x2C = 0x2C;
+constexpr uint64_t literal_74 = 74;
+constexpr uint64_t literal_0x1B = 0x1B;
+constexpr uint64_t literal_0x1C = 0x1C;
+constexpr uint64_t literal_95 = 95;
+constexpr uint64_t literal_0x22 = 0x22;
+constexpr uint64_t literal_0x24 = 0x24;
+constexpr uint64_t literal_0x10 = 0x10;
+constexpr uint64_t literal_0x1F = 0x1F;
+constexpr uint64_t literal_0x3C = 0x3C;
+constexpr uint64_t literal_0x0E = 0x0E;
+constexpr uint64_t literal_0b0001 = 0b0001;
+constexpr uint64_t literal_0b0100 = 0b0100;
 
-fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT0)
+fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT0,
+                                     const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT1)
 {
     {
         fapi2::ATTR_EC_Type   l_chip_ec;
@@ -60,6 +81,24 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                                             || (l_TGT0_ATTR_PROC_FABRIC_A_ATTACHED_CHIP_CNFG[literal_1] != literal_0));
         uint64_t l_def_OBUS0_FBC_ENABLED = ((l_TGT0_ATTR_PROC_FABRIC_X_ATTACHED_CHIP_CNFG[literal_3] != literal_0)
                                             || (l_TGT0_ATTR_PROC_FABRIC_A_ATTACHED_CHIP_CNFG[literal_0] != literal_0));
+        fapi2::ATTR_FREQ_A_MHZ_Type l_TGT1_ATTR_FREQ_A_MHZ;
+        FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_FREQ_A_MHZ, TGT1, l_TGT1_ATTR_FREQ_A_MHZ));
+        fapi2::ATTR_FREQ_PB_MHZ_Type l_TGT1_ATTR_FREQ_PB_MHZ;
+        FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_FREQ_PB_MHZ, TGT1, l_TGT1_ATTR_FREQ_PB_MHZ));
+        uint64_t l_def_LO_LIMIT_Q = (l_TGT1_ATTR_FREQ_PB_MHZ / l_TGT1_ATTR_FREQ_A_MHZ);
+        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_LO_LIMIT_R = (l_TGT1_ATTR_FREQ_PB_MHZ % l_TGT1_ATTR_FREQ_A_MHZ);
+        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_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_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;
+        FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_PROC_FABRIC_SMP_OPTICS_MODE, TGT1, l_TGT1_ATTR_PROC_FABRIC_SMP_OPTICS_MODE));
+        uint64_t l_def_OPTICS_IS_A_BUS = (l_TGT1_ATTR_PROC_FABRIC_SMP_OPTICS_MODE ==
+                                          fapi2::ENUM_ATTR_PROC_FABRIC_SMP_OPTICS_MODE_OPTICS_IS_A_BUS);
         fapi2::ATTR_PROC_FABRIC_OPTICS_CONFIG_MODE_Type l_TGT0_ATTR_PROC_FABRIC_OPTICS_CONFIG_MODE;
         FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_PROC_FABRIC_OPTICS_CONFIG_MODE, TGT0, l_TGT0_ATTR_PROC_FABRIC_OPTICS_CONFIG_MODE));
         uint64_t l_def_NVLINK_ACTIVE = ((((l_TGT0_ATTR_PROC_FABRIC_OPTICS_CONFIG_MODE[literal_0] ==
@@ -79,6 +118,426 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
             FAPI_TRY(fapi2::putScom(TGT0, 0x5013803ull, l_scom_buffer));
         }
         {
+            FAPI_TRY(fapi2::getScom( TGT0, 0x501380aull, l_scom_buffer ));
+
+            if (l_def_OBUS0_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<22, 2, 62, uint64_t>(literal_0x1 );
+            }
+
+            if (l_def_OBUS0_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<12, 8, 56, uint64_t>(literal_0x40 );
+            }
+
+            if ((l_def_OBUS0_FBC_ENABLED && (l_def_LO_LIMIT_Q > literal_1)))
+            {
+                l_scom_buffer.insert<4, 8, 56, uint64_t>((literal_0x36 - (l_def_OBUS0_LO_LIMIT_N / l_def_OBUS0_LO_LIMIT_D)) );
+            }
+            else if (((l_def_OBUS0_FBC_ENABLED && (l_def_LO_LIMIT_Q == literal_1)) && (l_def_LO_LIMIT_R > literal_2)))
+            {
+                l_scom_buffer.insert<4, 8, 56, uint64_t>((literal_0x36 - (l_def_OBUS0_LO_LIMIT_N / l_def_OBUS0_LO_LIMIT_D)) );
+            }
+            else if (l_def_OBUS0_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<4, 8, 56, uint64_t>((literal_0x37 - (l_def_OBUS0_LO_LIMIT_N / l_def_OBUS0_LO_LIMIT_D)) );
+            }
+
+            if (l_def_OBUS0_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<44, 8, 56, uint64_t>(literal_0x40 );
+            }
+
+            if ((l_def_OBUS0_FBC_ENABLED && (l_def_LO_LIMIT_Q > literal_1)))
+            {
+                l_scom_buffer.insert<36, 8, 56, uint64_t>((literal_0x36 - (l_def_OBUS0_LO_LIMIT_N / l_def_OBUS0_LO_LIMIT_D)) );
+            }
+            else if (((l_def_OBUS0_FBC_ENABLED && (l_def_LO_LIMIT_Q == literal_1)) && (l_def_LO_LIMIT_R > literal_2)))
+            {
+                l_scom_buffer.insert<36, 8, 56, uint64_t>((literal_0x36 - (l_def_OBUS0_LO_LIMIT_N / l_def_OBUS0_LO_LIMIT_D)) );
+            }
+            else if (l_def_OBUS0_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<36, 8, 56, uint64_t>((literal_0x37 - (l_def_OBUS0_LO_LIMIT_N / l_def_OBUS0_LO_LIMIT_D)) );
+            }
+
+            FAPI_TRY(fapi2::putScom(TGT0, 0x501380aull, l_scom_buffer));
+        }
+        {
+            FAPI_TRY(fapi2::getScom( TGT0, 0x501380bull, l_scom_buffer ));
+
+            if (l_def_OBUS1_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<22, 2, 62, uint64_t>(literal_0x1 );
+            }
+
+            if (l_def_OBUS1_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<12, 8, 56, uint64_t>(literal_0x40 );
+            }
+
+            if ((l_def_OBUS1_FBC_ENABLED && (l_def_LO_LIMIT_Q > literal_1)))
+            {
+                l_scom_buffer.insert<4, 8, 56, uint64_t>((literal_0x2A - (l_def_OBUS1_LO_LIMIT_N / l_def_OBUS1_LO_LIMIT_D)) );
+            }
+            else if (((l_def_OBUS1_FBC_ENABLED && (l_def_LO_LIMIT_Q == literal_1)) && (l_def_LO_LIMIT_R > literal_2)))
+            {
+                l_scom_buffer.insert<4, 8, 56, uint64_t>((literal_0x2A - (l_def_OBUS1_LO_LIMIT_N / l_def_OBUS1_LO_LIMIT_D)) );
+            }
+            else if (l_def_OBUS1_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<4, 8, 56, uint64_t>((literal_0x2C - (l_def_OBUS1_LO_LIMIT_N / l_def_OBUS1_LO_LIMIT_D)) );
+            }
+
+            if (l_def_OBUS1_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<44, 8, 56, uint64_t>(literal_0x40 );
+            }
+
+            if ((l_def_OBUS1_FBC_ENABLED && (l_def_LO_LIMIT_Q > literal_1)))
+            {
+                l_scom_buffer.insert<36, 8, 56, uint64_t>((literal_0x2A - (l_def_OBUS1_LO_LIMIT_N / l_def_OBUS1_LO_LIMIT_D)) );
+            }
+            else if (((l_def_OBUS1_FBC_ENABLED && (l_def_LO_LIMIT_Q == literal_1)) && (l_def_LO_LIMIT_R > literal_2)))
+            {
+                l_scom_buffer.insert<36, 8, 56, uint64_t>((literal_0x2A - (l_def_OBUS1_LO_LIMIT_N / l_def_OBUS1_LO_LIMIT_D)) );
+            }
+            else if (l_def_OBUS1_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<36, 8, 56, uint64_t>((literal_0x2C - (l_def_OBUS1_LO_LIMIT_N / l_def_OBUS1_LO_LIMIT_D)) );
+            }
+
+            FAPI_TRY(fapi2::putScom(TGT0, 0x501380bull, l_scom_buffer));
+        }
+        {
+            FAPI_TRY(fapi2::getScom( TGT0, 0x501380cull, l_scom_buffer ));
+
+            if (l_def_OBUS2_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<22, 2, 62, uint64_t>(literal_0x1 );
+            }
+
+            if (l_def_OBUS2_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<12, 8, 56, uint64_t>(literal_0x40 );
+            }
+
+            if ((l_def_OBUS2_FBC_ENABLED && (l_def_LO_LIMIT_Q > literal_1)))
+            {
+                l_scom_buffer.insert<4, 8, 56, uint64_t>((literal_0x1B - (l_def_OBUS2_LO_LIMIT_N / l_def_OBUS2_LO_LIMIT_D)) );
+            }
+            else if (((l_def_OBUS2_FBC_ENABLED && (l_def_LO_LIMIT_Q == literal_1)) && (l_def_LO_LIMIT_R > literal_2)))
+            {
+                l_scom_buffer.insert<4, 8, 56, uint64_t>((literal_0x1B - (l_def_OBUS2_LO_LIMIT_N / l_def_OBUS2_LO_LIMIT_D)) );
+            }
+            else if (l_def_OBUS2_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<4, 8, 56, uint64_t>((literal_0x1C - (l_def_OBUS2_LO_LIMIT_N / l_def_OBUS2_LO_LIMIT_D)) );
+            }
+
+            if (l_def_OBUS2_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<44, 8, 56, uint64_t>(literal_0x40 );
+            }
+
+            if ((l_def_OBUS2_FBC_ENABLED && (l_def_LO_LIMIT_Q > literal_1)))
+            {
+                l_scom_buffer.insert<36, 8, 56, uint64_t>((literal_0x1B - (l_def_OBUS2_LO_LIMIT_N / l_def_OBUS2_LO_LIMIT_D)) );
+            }
+            else if (((l_def_OBUS2_FBC_ENABLED && (l_def_LO_LIMIT_Q == literal_1)) && (l_def_LO_LIMIT_R > literal_2)))
+            {
+                l_scom_buffer.insert<36, 8, 56, uint64_t>((literal_0x1B - (l_def_OBUS2_LO_LIMIT_N / l_def_OBUS2_LO_LIMIT_D)) );
+            }
+            else if (l_def_OBUS2_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<36, 8, 56, uint64_t>((literal_0x1C - (l_def_OBUS2_LO_LIMIT_N / l_def_OBUS2_LO_LIMIT_D)) );
+            }
+
+            FAPI_TRY(fapi2::putScom(TGT0, 0x501380cull, l_scom_buffer));
+        }
+        {
+            FAPI_TRY(fapi2::getScom( TGT0, 0x501380dull, l_scom_buffer ));
+
+            if (l_def_OBUS3_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<22, 2, 62, uint64_t>(literal_0x1 );
+            }
+
+            if (l_def_OBUS3_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<12, 8, 56, uint64_t>(literal_0x40 );
+            }
+
+            if ((l_def_OBUS3_FBC_ENABLED && (l_def_LO_LIMIT_Q > literal_1)))
+            {
+                l_scom_buffer.insert<4, 8, 56, uint64_t>((literal_0x22 - (l_def_OBUS3_LO_LIMIT_N / l_def_OBUS3_LO_LIMIT_D)) );
+            }
+            else if (((l_def_OBUS3_FBC_ENABLED && (l_def_LO_LIMIT_Q == literal_1)) && (l_def_LO_LIMIT_R > literal_2)))
+            {
+                l_scom_buffer.insert<4, 8, 56, uint64_t>((literal_0x22 - (l_def_OBUS3_LO_LIMIT_N / l_def_OBUS3_LO_LIMIT_D)) );
+            }
+            else if (l_def_OBUS3_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<4, 8, 56, uint64_t>((literal_0x24 - (l_def_OBUS3_LO_LIMIT_N / l_def_OBUS3_LO_LIMIT_D)) );
+            }
+
+            if (l_def_OBUS3_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<44, 8, 56, uint64_t>(literal_0x40 );
+            }
+
+            if ((l_def_OBUS3_FBC_ENABLED && (l_def_LO_LIMIT_Q > literal_1)))
+            {
+                l_scom_buffer.insert<36, 8, 56, uint64_t>((literal_0x22 - (l_def_OBUS3_LO_LIMIT_N / l_def_OBUS3_LO_LIMIT_D)) );
+            }
+            else if (((l_def_OBUS3_FBC_ENABLED && (l_def_LO_LIMIT_Q == literal_1)) && (l_def_LO_LIMIT_R > literal_2)))
+            {
+                l_scom_buffer.insert<36, 8, 56, uint64_t>((literal_0x22 - (l_def_OBUS3_LO_LIMIT_N / l_def_OBUS3_LO_LIMIT_D)) );
+            }
+            else if (l_def_OBUS3_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<36, 8, 56, uint64_t>((literal_0x24 - (l_def_OBUS3_LO_LIMIT_N / l_def_OBUS3_LO_LIMIT_D)) );
+            }
+
+            FAPI_TRY(fapi2::putScom(TGT0, 0x501380dull, l_scom_buffer));
+        }
+        {
+            FAPI_TRY(fapi2::getScom( TGT0, 0x5013810ull, l_scom_buffer ));
+
+            if ((l_def_OBUS0_FBC_ENABLED && l_def_OPTICS_IS_A_BUS))
+            {
+                l_scom_buffer.insert<24, 5, 59, uint64_t>(literal_0x10 );
+            }
+            else if (l_def_OBUS0_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<24, 5, 59, uint64_t>(literal_0x1F );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) )
+            {
+                if (l_def_OBUS0_FBC_ENABLED)
+                {
+                    l_scom_buffer.insert<9, 7, 57, uint64_t>(literal_0x3C );
+                }
+            }
+            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            {
+                if (l_def_OBUS0_FBC_ENABLED)
+                {
+                    l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x3C );
+                }
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) )
+            {
+                if (l_def_OBUS0_FBC_ENABLED)
+                {
+                    l_scom_buffer.insert<17, 7, 57, uint64_t>(literal_0x3C );
+                }
+            }
+            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            {
+                if (l_def_OBUS0_FBC_ENABLED)
+                {
+                    l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x3C );
+                }
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) )
+            {
+                if (l_def_OBUS0_FBC_ENABLED)
+                {
+                    l_scom_buffer.insert<41, 7, 57, uint64_t>(literal_0x3C );
+                }
+            }
+            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            {
+                if (l_def_OBUS0_FBC_ENABLED)
+                {
+                    l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x3C );
+                }
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) )
+            {
+                if (l_def_OBUS0_FBC_ENABLED)
+                {
+                    l_scom_buffer.insert<49, 7, 57, uint64_t>(literal_0x3C );
+                }
+            }
+            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            {
+                if (l_def_OBUS0_FBC_ENABLED)
+                {
+                    l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x3C );
+                }
+            }
+
+            FAPI_TRY(fapi2::putScom(TGT0, 0x5013810ull, l_scom_buffer));
+        }
+        {
+            FAPI_TRY(fapi2::getScom( TGT0, 0x5013811ull, l_scom_buffer ));
+
+            if ((l_def_OBUS1_FBC_ENABLED && l_def_OPTICS_IS_A_BUS))
+            {
+                l_scom_buffer.insert<24, 5, 59, uint64_t>(literal_0x10 );
+            }
+            else if (l_def_OBUS1_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<24, 5, 59, uint64_t>(literal_0x1F );
+            }
+
+            if (l_def_OBUS1_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<1, 7, 57, uint64_t>(literal_0x40 );
+            }
+
+            if (l_def_OBUS1_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<9, 7, 57, uint64_t>(literal_0x3C );
+            }
+
+            if (l_def_OBUS1_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<17, 7, 57, uint64_t>(literal_0x3C );
+            }
+
+            if (l_def_OBUS1_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<33, 7, 57, uint64_t>(literal_0x40 );
+            }
+
+            if (l_def_OBUS1_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<41, 7, 57, uint64_t>(literal_0x3C );
+            }
+
+            if (l_def_OBUS1_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<49, 7, 57, uint64_t>(literal_0x3C );
+            }
+
+            FAPI_TRY(fapi2::putScom(TGT0, 0x5013811ull, l_scom_buffer));
+        }
+        {
+            FAPI_TRY(fapi2::getScom( TGT0, 0x5013812ull, l_scom_buffer ));
+
+            if ((l_def_OBUS2_FBC_ENABLED && l_def_OPTICS_IS_A_BUS))
+            {
+                l_scom_buffer.insert<24, 5, 59, uint64_t>(literal_0x10 );
+            }
+            else if (l_def_OBUS2_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<24, 5, 59, uint64_t>(literal_0x1F );
+            }
+
+            if (l_def_OBUS2_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<1, 7, 57, uint64_t>(literal_0x40 );
+            }
+
+            if (l_def_OBUS2_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<9, 7, 57, uint64_t>(literal_0x3C );
+            }
+
+            if (l_def_OBUS2_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<17, 7, 57, uint64_t>(literal_0x3C );
+            }
+
+            if (l_def_OBUS2_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<33, 7, 57, uint64_t>(literal_0x40 );
+            }
+
+            if (l_def_OBUS2_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<41, 7, 57, uint64_t>(literal_0x3C );
+            }
+
+            if (l_def_OBUS2_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<49, 7, 57, uint64_t>(literal_0x3C );
+            }
+
+            FAPI_TRY(fapi2::putScom(TGT0, 0x5013812ull, l_scom_buffer));
+        }
+        {
+            FAPI_TRY(fapi2::getScom( TGT0, 0x5013813ull, l_scom_buffer ));
+
+            if ((l_def_OBUS3_FBC_ENABLED && l_def_OPTICS_IS_A_BUS))
+            {
+                l_scom_buffer.insert<24, 5, 59, uint64_t>(literal_0x0E );
+            }
+            else if (l_def_OBUS3_FBC_ENABLED)
+            {
+                l_scom_buffer.insert<24, 5, 59, uint64_t>(literal_0x1C );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) )
+            {
+                if (l_def_OBUS3_FBC_ENABLED)
+                {
+                    l_scom_buffer.insert<9, 7, 57, uint64_t>(literal_0x3C );
+                }
+            }
+            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            {
+                if (l_def_OBUS3_FBC_ENABLED)
+                {
+                    l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x3C );
+                }
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) )
+            {
+                if (l_def_OBUS3_FBC_ENABLED)
+                {
+                    l_scom_buffer.insert<17, 7, 57, uint64_t>(literal_0x3C );
+                }
+            }
+            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            {
+                if (l_def_OBUS3_FBC_ENABLED)
+                {
+                    l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x3C );
+                }
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) )
+            {
+                if (l_def_OBUS3_FBC_ENABLED)
+                {
+                    l_scom_buffer.insert<41, 7, 57, uint64_t>(literal_0x3C );
+                }
+            }
+            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            {
+                if (l_def_OBUS3_FBC_ENABLED)
+                {
+                    l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x3C );
+                }
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) )
+            {
+                if (l_def_OBUS3_FBC_ENABLED)
+                {
+                    l_scom_buffer.insert<49, 7, 57, uint64_t>(literal_0x3C );
+                }
+            }
+            else if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            {
+                if (l_def_OBUS3_FBC_ENABLED)
+                {
+                    l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x3C );
+                }
+            }
+
+            FAPI_TRY(fapi2::putScom(TGT0, 0x5013813ull, l_scom_buffer));
+        }
+        {
             FAPI_TRY(fapi2::getScom( TGT0, 0x5013823ull, l_scom_buffer ));
 
             if (l_def_OBUS0_FBC_ENABLED)
@@ -130,52 +589,52 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
 
             if (l_def_OBUS0_FBC_ENABLED)
             {
-                l_scom_buffer.insert<0, 4, 60, uint64_t>(literal_0b0101 );
-                l_scom_buffer.insert<8, 4, 60, uint64_t>(literal_0b0101 );
+                l_scom_buffer.insert<0, 4, 60, uint64_t>(literal_0b0001 );
+                l_scom_buffer.insert<8, 4, 60, uint64_t>(literal_0b0001 );
             }
 
             if (l_def_OBUS0_FBC_ENABLED)
             {
-                l_scom_buffer.insert<4, 4, 60, uint64_t>(literal_0b0101 );
-                l_scom_buffer.insert<12, 4, 60, uint64_t>(literal_0b0101 );
+                l_scom_buffer.insert<4, 4, 60, uint64_t>(literal_0b0100 );
+                l_scom_buffer.insert<12, 4, 60, uint64_t>(literal_0b0100 );
             }
 
             if ((( ! l_def_OBUS0_FBC_ENABLED) && l_def_OBUS1_FBC_ENABLED))
             {
-                l_scom_buffer.insert<16, 4, 60, uint64_t>(literal_0b0101 );
-                l_scom_buffer.insert<24, 4, 60, uint64_t>(literal_0b0101 );
+                l_scom_buffer.insert<16, 4, 60, uint64_t>(literal_0b0001 );
+                l_scom_buffer.insert<24, 4, 60, uint64_t>(literal_0b0001 );
             }
 
             if ((( ! l_def_OBUS0_FBC_ENABLED) && l_def_OBUS1_FBC_ENABLED))
             {
-                l_scom_buffer.insert<20, 4, 60, uint64_t>(literal_0b0101 );
-                l_scom_buffer.insert<28, 4, 60, uint64_t>(literal_0b0101 );
+                l_scom_buffer.insert<20, 4, 60, uint64_t>(literal_0b0100 );
+                l_scom_buffer.insert<28, 4, 60, uint64_t>(literal_0b0100 );
             }
 
             if (((( ! l_def_OBUS0_FBC_ENABLED) && ( ! l_def_OBUS1_FBC_ENABLED)) && l_def_OBUS2_FBC_ENABLED))
             {
-                l_scom_buffer.insert<32, 4, 60, uint64_t>(literal_0b0101 );
-                l_scom_buffer.insert<40, 4, 60, uint64_t>(literal_0b0101 );
+                l_scom_buffer.insert<32, 4, 60, uint64_t>(literal_0b0001 );
+                l_scom_buffer.insert<40, 4, 60, uint64_t>(literal_0b0001 );
             }
 
             if (((( ! l_def_OBUS0_FBC_ENABLED) && ( ! l_def_OBUS1_FBC_ENABLED)) && l_def_OBUS2_FBC_ENABLED))
             {
-                l_scom_buffer.insert<36, 4, 60, uint64_t>(literal_0b0101 );
-                l_scom_buffer.insert<44, 4, 60, uint64_t>(literal_0b0101 );
+                l_scom_buffer.insert<36, 4, 60, uint64_t>(literal_0b0100 );
+                l_scom_buffer.insert<44, 4, 60, uint64_t>(literal_0b0100 );
             }
 
             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<48, 4, 60, uint64_t>(literal_0b0101 );
-                l_scom_buffer.insert<56, 4, 60, uint64_t>(literal_0b0101 );
+                l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0001 );
+                l_scom_buffer.insert<56, 4, 60, uint64_t>(literal_0b0001 );
             }
 
             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<52, 4, 60, uint64_t>(literal_0b0101 );
-                l_scom_buffer.insert<60, 4, 60, uint64_t>(literal_0b0101 );
+                l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b0100 );
+                l_scom_buffer.insert<60, 4, 60, uint64_t>(literal_0b0100 );
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x5013824ull, l_scom_buffer));
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_tl_scom.H b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_tl_scom.H
index 4317ed877..ac878fea1 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_tl_scom.H
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_tl_scom.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016                             */
+/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -31,12 +31,14 @@
 #include <fapi2.H>
 
 
-typedef fapi2::ReturnCode (*p9_fbc_ioo_tl_scom_FP_t)(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&);
+typedef fapi2::ReturnCode (*p9_fbc_ioo_tl_scom_FP_t)(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&,
+        const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>&);
 
 extern "C"
 {
 
-    fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT0);
+    fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT0,
+                                         const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT1);
 
 }
 
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_no_hp_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_no_hp_scom.C
index 6db6d96fe..cd52c8dae 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_no_hp_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_no_hp_scom.C
@@ -37,44 +37,40 @@ constexpr uint64_t literal_6 = 6;
 constexpr uint64_t literal_5 = 5;
 constexpr uint64_t literal_4 = 4;
 constexpr uint64_t literal_0x0 = 0x0;
-constexpr uint64_t literal_0x1 = 0x1;
-constexpr uint64_t literal_0x2 = 0x2;
 constexpr uint64_t literal_0x3 = 0x3;
 constexpr uint64_t literal_0x4 = 0x4;
 constexpr uint64_t literal_0x6 = 0x6;
+constexpr uint64_t literal_0x17 = 0x17;
+constexpr uint64_t literal_0x28 = 0x28;
+constexpr uint64_t literal_0x1C = 0x1C;
+constexpr uint64_t literal_0x32 = 0x32;
+constexpr uint64_t literal_0x24 = 0x24;
+constexpr uint64_t literal_0x40 = 0x40;
+constexpr uint64_t literal_0x34 = 0x34;
+constexpr uint64_t literal_0x5C = 0x5C;
+constexpr uint64_t literal_0x48 = 0x48;
+constexpr uint64_t literal_0x80 = 0x80;
 constexpr uint64_t literal_0x5 = 0x5;
-constexpr uint64_t literal_0x9 = 0x9;
-constexpr uint64_t literal_0xB = 0xB;
-constexpr uint64_t literal_0x13 = 0x13;
-constexpr uint64_t literal_0x7 = 0x7;
-constexpr uint64_t literal_0xA = 0xA;
-constexpr uint64_t literal_0xF = 0xF;
+constexpr uint64_t literal_0x8 = 0x8;
+constexpr uint64_t literal_0x19 = 0x19;
+constexpr uint64_t literal_0x2F = 0x2F;
 constexpr uint64_t literal_0x1F = 0x1F;
+constexpr uint64_t literal_0x3B = 0x3B;
+constexpr uint64_t literal_0x4C = 0x4C;
+constexpr uint64_t literal_0x3A = 0x3A;
+constexpr uint64_t literal_0x6D = 0x6D;
+constexpr uint64_t literal_0x50 = 0x50;
+constexpr uint64_t literal_0x98 = 0x98;
 constexpr uint64_t literal_0xD = 0xD;
-constexpr uint64_t literal_0x12 = 0x12;
-constexpr uint64_t literal_0x17 = 0x17;
-constexpr uint64_t literal_0x1B = 0x1B;
-constexpr uint64_t literal_0x27 = 0x27;
-constexpr uint64_t literal_0x2F = 0x2F;
-constexpr uint64_t literal_0x37 = 0x37;
-constexpr uint64_t literal_0x8 = 0x8;
-constexpr uint64_t literal_0x1E = 0x1E;
-constexpr uint64_t literal_0x1A = 0x1A;
-constexpr uint64_t literal_0x15 = 0x15;
-constexpr uint64_t literal_0x2B = 0x2B;
-constexpr uint64_t literal_0x4F = 0x4F;
-constexpr uint64_t literal_0xE = 0xE;
+constexpr uint64_t literal_0xA = 0xA;
+constexpr uint64_t literal_0x10 = 0x10;
 constexpr uint64_t literal_0xC = 0xC;
-constexpr uint64_t literal_0x11 = 0x11;
-constexpr uint64_t literal_0x23 = 0x23;
-constexpr uint64_t literal_0x47 = 0x47;
-constexpr uint64_t literal_0x3F = 0x3F;
-constexpr uint64_t literal_0x19 = 0x19;
+constexpr uint64_t literal_0x14 = 0x14;
+constexpr uint64_t literal_0x12 = 0x12;
 constexpr uint64_t literal_0x1D = 0x1D;
-constexpr uint64_t literal_0x3A = 0x3A;
-constexpr uint64_t literal_0x57 = 0x57;
-constexpr uint64_t literal_0x5F = 0x5F;
-constexpr uint64_t literal_0xAF = 0xAF;
+constexpr uint64_t literal_0x18 = 0x18;
+constexpr uint64_t literal_0x7 = 0x7;
+constexpr uint64_t literal_0x25 = 0x25;
 
 fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT0,
                                     const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT1)
@@ -97,8 +93,6 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
                                                l_TGT0_ATTR_PROC_FABRIC_X_ATTACHED_CHIP_CNFG[literal_1]) + l_TGT0_ATTR_PROC_FABRIC_X_ATTACHED_CHIP_CNFG[literal_2]) +
                                              l_TGT0_ATTR_PROC_FABRIC_X_ATTACHED_CHIP_CNFG[literal_3]) + l_TGT0_ATTR_PROC_FABRIC_X_ATTACHED_CHIP_CNFG[literal_4]) +
                                            l_TGT0_ATTR_PROC_FABRIC_X_ATTACHED_CHIP_CNFG[literal_5]) + l_TGT0_ATTR_PROC_FABRIC_X_ATTACHED_CHIP_CNFG[literal_6]);
-        fapi2::ATTR_CHIP_EC_FEATURE_HW383616_Type l_TGT0_ATTR_CHIP_EC_FEATURE_HW383616;
-        FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CHIP_EC_FEATURE_HW383616, TGT0, l_TGT0_ATTR_CHIP_EC_FEATURE_HW383616));
         fapi2::ATTR_PROC_FABRIC_PUMP_MODE_Type l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE;
         FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_PROC_FABRIC_PUMP_MODE, TGT1, l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE));
         fapi2::buffer<uint64_t> l_scom_buffer;
@@ -116,27 +110,31 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
                 l_scom_buffer.insert<4, 1, 61, uint64_t>(l_PB_COM_PB_CFG_CHIP_IS_SYSTEM_OFF );
             }
 
-            if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW383616 != literal_0))
+            if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
+                 || ((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
+                     && (l_def_NUM_X_LINKS_CFG > literal_3))))
+            {
+                constexpr auto l_PB_COM_PB_CFG_SP_HW_MARK_CNT_31 = 0x7cf9f;
+                l_scom_buffer.insert<16, 7, 43, uint64_t>(l_PB_COM_PB_CFG_SP_HW_MARK_CNT_31 );
+            }
+            else if (literal_1)
             {
                 constexpr auto l_PB_COM_PB_CFG_SP_HW_MARK_CNT_63 = 0xfdfbf;
                 l_scom_buffer.insert<16, 7, 43, uint64_t>(l_PB_COM_PB_CFG_SP_HW_MARK_CNT_63 );
             }
-            else if (( true ))
+
+            if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
+                 || ((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
+                     && (l_def_NUM_X_LINKS_CFG > literal_3))))
             {
-                constexpr auto l_PB_COM_PB_CFG_SP_HW_MARK_CNT_64 = 0x102040;
-                l_scom_buffer.insert<16, 7, 43, uint64_t>(l_PB_COM_PB_CFG_SP_HW_MARK_CNT_64 );
+                constexpr auto l_PB_COM_PB_CFG_GP_HW_MARK_CNT_32 = 0x81020;
+                l_scom_buffer.insert<23, 7, 43, uint64_t>(l_PB_COM_PB_CFG_GP_HW_MARK_CNT_32 );
             }
-
-            if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW383616 != literal_0))
+            else if (literal_1)
             {
                 constexpr auto l_PB_COM_PB_CFG_GP_HW_MARK_CNT_63 = 0xfdfbf;
                 l_scom_buffer.insert<23, 7, 43, uint64_t>(l_PB_COM_PB_CFG_GP_HW_MARK_CNT_63 );
             }
-            else if (( true ))
-            {
-                constexpr auto l_PB_COM_PB_CFG_GP_HW_MARK_CNT_64 = 0x102040;
-                l_scom_buffer.insert<23, 7, 43, uint64_t>(l_PB_COM_PB_CFG_GP_HW_MARK_CNT_64 );
-            }
 
             constexpr auto l_PB_COM_PB_CFG_LCL_HW_MARK_CNT_42 = 0x2aaaa;
             l_scom_buffer.insert<30, 6, 46, uint64_t>(l_PB_COM_PB_CFG_LCL_HW_MARK_CNT_42 );
@@ -156,27 +154,31 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
                 l_scom_buffer.insert<4, 1, 62, uint64_t>(l_PB_COM_PB_CFG_CHIP_IS_SYSTEM_OFF );
             }
 
-            if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW383616 != literal_0))
+            if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
+                 || ((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
+                     && (l_def_NUM_X_LINKS_CFG > literal_3))))
+            {
+                constexpr auto l_PB_COM_PB_CFG_SP_HW_MARK_CNT_31 = 0x7cf9f;
+                l_scom_buffer.insert<16, 7, 50, uint64_t>(l_PB_COM_PB_CFG_SP_HW_MARK_CNT_31 );
+            }
+            else if (literal_1)
             {
                 constexpr auto l_PB_COM_PB_CFG_SP_HW_MARK_CNT_63 = 0xfdfbf;
                 l_scom_buffer.insert<16, 7, 50, uint64_t>(l_PB_COM_PB_CFG_SP_HW_MARK_CNT_63 );
             }
-            else if (( true ))
+
+            if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
+                 || ((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
+                     && (l_def_NUM_X_LINKS_CFG > literal_3))))
             {
-                constexpr auto l_PB_COM_PB_CFG_SP_HW_MARK_CNT_64 = 0x102040;
-                l_scom_buffer.insert<16, 7, 50, uint64_t>(l_PB_COM_PB_CFG_SP_HW_MARK_CNT_64 );
+                constexpr auto l_PB_COM_PB_CFG_GP_HW_MARK_CNT_32 = 0x81020;
+                l_scom_buffer.insert<23, 7, 50, uint64_t>(l_PB_COM_PB_CFG_GP_HW_MARK_CNT_32 );
             }
-
-            if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW383616 != literal_0))
+            else if (literal_1)
             {
                 constexpr auto l_PB_COM_PB_CFG_GP_HW_MARK_CNT_63 = 0xfdfbf;
                 l_scom_buffer.insert<23, 7, 50, uint64_t>(l_PB_COM_PB_CFG_GP_HW_MARK_CNT_63 );
             }
-            else if (( true ))
-            {
-                constexpr auto l_PB_COM_PB_CFG_GP_HW_MARK_CNT_64 = 0x102040;
-                l_scom_buffer.insert<23, 7, 50, uint64_t>(l_PB_COM_PB_CFG_GP_HW_MARK_CNT_64 );
-            }
 
             constexpr auto l_PB_COM_PB_CFG_LCL_HW_MARK_CNT_42 = 0x2aaaa;
             l_scom_buffer.insert<30, 6, 52, uint64_t>(l_PB_COM_PB_CFG_LCL_HW_MARK_CNT_42 );
@@ -197,12 +199,12 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x1 );
+                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x3 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x2 );
+                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x3 );
             }
 
             if ((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP))
@@ -217,12 +219,12 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x1 );
+                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x4 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x2 );
+                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x4 );
             }
 
             if ((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP))
@@ -237,12 +239,12 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x1 );
+                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x6 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x3 );
+                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x6 );
             }
 
             if ((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP))
@@ -257,12 +259,12 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x2 );
+                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x17 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x3 );
+                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x28 );
             }
 
             if ((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP))
@@ -277,12 +279,12 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x2 );
+                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x1C );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x4 );
+                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x32 );
             }
 
             if ((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP))
@@ -297,12 +299,12 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x3 );
+                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x24 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x6 );
+                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x40 );
             }
 
             if ((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP))
@@ -317,12 +319,12 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x5 );
+                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x34 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x9 );
+                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x5C );
             }
 
             if ((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP))
@@ -337,12 +339,12 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0xB );
+                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x48 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x13 );
+                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x80 );
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x5011c26ull, l_scom_buffer));
@@ -362,12 +364,12 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x1 );
+                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x4 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x3 );
+                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x4 );
             }
 
             if ((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP))
@@ -382,12 +384,12 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x2 );
+                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x5 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x4 );
+                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x5 );
             }
 
             if ((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP))
@@ -402,12 +404,12 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x2 );
+                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x8 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x5 );
+                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x8 );
             }
 
             if ((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP))
@@ -422,12 +424,12 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x3 );
+                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x19 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x6 );
+                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x2F );
             }
 
             if ((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP))
@@ -442,12 +444,12 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x3 );
+                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x1F );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x7 );
+                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x3B );
             }
 
             if ((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP))
@@ -462,12 +464,12 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x5 );
+                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x28 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0xA );
+                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x4C );
             }
 
             if ((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP))
@@ -482,12 +484,12 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x7 );
+                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x3A );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0xF );
+                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x6D );
             }
 
             if ((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP))
@@ -502,12 +504,12 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0xF );
+                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x50 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x1F );
+                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x98 );
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x5011c27ull, l_scom_buffer));
@@ -523,32 +525,32 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x1 );
+                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x3 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_2)) && (l_def_NUM_X_LINKS_CFG < literal_4)))
             {
-                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x2 );
+                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x3 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
-                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x4 );
+                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x3 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG == literal_0)))
             {
-                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x4 );
+                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x3 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x5 );
+                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x3 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x6 );
+                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x3 );
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
@@ -559,32 +561,32 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x2 );
+                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x4 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_2)) && (l_def_NUM_X_LINKS_CFG < literal_4)))
             {
-                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x3 );
+                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x4 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
-                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x5 );
+                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x4 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG == literal_0)))
             {
-                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x5 );
+                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x4 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x6 );
+                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x4 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x7 );
+                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x4 );
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
@@ -595,12 +597,12 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x2 );
+                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x6 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_2)) && (l_def_NUM_X_LINKS_CFG < literal_4)))
             {
-                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x3 );
+                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x6 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_3)))
@@ -615,12 +617,12 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x7 );
+                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x6 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x9 );
+                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x6 );
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
@@ -631,32 +633,32 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x3 );
+                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x8 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_2)) && (l_def_NUM_X_LINKS_CFG < literal_4)))
             {
-                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x4 );
+                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0xD );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
-                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x7 );
+                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x17 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG == literal_0)))
             {
-                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x7 );
+                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0xD );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x9 );
+                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x17 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0xB );
+                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x28 );
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
@@ -667,32 +669,32 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x3 );
+                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0xA );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_2)) && (l_def_NUM_X_LINKS_CFG < literal_4)))
             {
-                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x5 );
+                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x10 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
-                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x9 );
+                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x1C );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG == literal_0)))
             {
-                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x9 );
+                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x10 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0xB );
+                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x1C );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0xD );
+                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x32 );
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
@@ -703,32 +705,32 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x5 );
+                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0xC );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_2)) && (l_def_NUM_X_LINKS_CFG < literal_4)))
             {
-                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x7 );
+                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x14 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
-                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0xD );
+                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x24 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG == literal_0)))
             {
-                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0xD );
+                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x14 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0xF );
+                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x24 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x12 );
+                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x40 );
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
@@ -739,32 +741,32 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x7 );
+                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x12 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_2)) && (l_def_NUM_X_LINKS_CFG < literal_4)))
             {
-                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0xB );
+                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x1D );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
-                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x13 );
+                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x34 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG == literal_0)))
             {
-                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x13 );
+                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x1D );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x17 );
+                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x34 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x1B );
+                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x5C );
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
@@ -775,32 +777,32 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0xF );
+                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x18 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_2)) && (l_def_NUM_X_LINKS_CFG < literal_4)))
             {
-                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x17 );
+                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x28 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
-                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x27 );
+                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x48 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG == literal_0)))
             {
-                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x27 );
+                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x28 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x2F );
+                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x48 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x37 );
+                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x80 );
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x5011c28ull, l_scom_buffer));
@@ -816,32 +818,32 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x2 );
+                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x4 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_2)) && (l_def_NUM_X_LINKS_CFG < literal_4)))
             {
-                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x3 );
+                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x4 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
-                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x5 );
+                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x4 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG == literal_0)))
             {
-                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x5 );
+                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x4 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x6 );
+                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x4 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x9 );
+                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x4 );
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
@@ -852,32 +854,32 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x3 );
+                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x5 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_2)) && (l_def_NUM_X_LINKS_CFG < literal_4)))
             {
-                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x4 );
+                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x5 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
-                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x6 );
+                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x5 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG == literal_0)))
             {
-                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x6 );
+                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x5 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x7 );
+                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x5 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0xB );
+                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x5 );
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
@@ -888,32 +890,32 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x3 );
+                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x8 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_2)) && (l_def_NUM_X_LINKS_CFG < literal_4)))
             {
-                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x5 );
+                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x8 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
-                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x7 );
+                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x8 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG == literal_0)))
             {
-                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x7 );
+                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x8 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x9 );
+                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x8 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0xD );
+                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x8 );
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
@@ -924,32 +926,32 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x4 );
+                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x8 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_2)) && (l_def_NUM_X_LINKS_CFG < literal_4)))
             {
-                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x6 );
+                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0xD );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
-                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x9 );
+                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x19 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG == literal_0)))
             {
-                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x8 );
+                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0xD );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0xB );
+                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x19 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0xF );
+                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x2F );
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
@@ -960,32 +962,32 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x5 );
+                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0xA );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_2)) && (l_def_NUM_X_LINKS_CFG < literal_4)))
             {
-                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x7 );
+                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x10 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
-                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0xB );
+                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x1F );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG == literal_0)))
             {
-                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0xA );
+                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x10 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0xD );
+                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x1F );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x13 );
+                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x3B );
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
@@ -996,32 +998,32 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x7 );
+                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0xC );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_2)) && (l_def_NUM_X_LINKS_CFG < literal_4)))
             {
-                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0xA );
+                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x14 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
-                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x1F );
+                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x28 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG == literal_0)))
             {
-                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x1E );
+                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x14 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x12 );
+                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x28 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x1A );
+                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x4C );
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
@@ -1032,32 +1034,32 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0xB );
+                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x12 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_2)) && (l_def_NUM_X_LINKS_CFG < literal_4)))
             {
-                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0xF );
+                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x1D );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
-                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x17 );
+                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x3A );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG == literal_0)))
             {
-                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x15 );
+                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x1D );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x1B );
+                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x3A );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x27 );
+                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x6D );
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
@@ -1068,32 +1070,32 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x17 );
+                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x18 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_2)) && (l_def_NUM_X_LINKS_CFG < literal_4)))
             {
-                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x1F );
+                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x28 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
-                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x2F );
+                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x50 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG == literal_0)))
             {
-                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x2B );
+                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x28 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x37 );
+                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x50 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x4F );
+                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x98 );
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x5011c29ull, l_scom_buffer));
@@ -1109,12 +1111,12 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x2 );
+                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x3 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_2)) && (l_def_NUM_X_LINKS_CFG < literal_4)))
             {
-                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x4 );
+                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x5 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_3)))
@@ -1124,17 +1126,17 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG == literal_0)))
             {
-                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x6 );
+                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x5 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x7 );
+                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x8 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x9 );
+                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x8 );
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
@@ -1145,17 +1147,17 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x3 );
+                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x4 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_2)) && (l_def_NUM_X_LINKS_CFG < literal_4)))
             {
-                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x5 );
+                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x7 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
-                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0xA );
+                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0xC );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG == literal_0)))
@@ -1165,12 +1167,12 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x9 );
+                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0xC );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0xB );
+                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x14 );
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
@@ -1181,32 +1183,32 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x3 );
+                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x6 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_2)) && (l_def_NUM_X_LINKS_CFG < literal_4)))
             {
-                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x6 );
+                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0xA );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
-                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0xB );
+                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x12 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG == literal_0)))
             {
-                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x9 );
+                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0xA );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0xA );
+                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x12 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0xD );
+                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x1F );
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
@@ -1217,32 +1219,32 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x4 );
+                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x8 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_2)) && (l_def_NUM_X_LINKS_CFG < literal_4)))
             {
-                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x7 );
+                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0xD );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
-                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0xE );
+                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x17 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG == literal_0)))
             {
-                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0xB );
+                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0xD );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0xC );
+                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x17 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0xF );
+                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x28 );
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
@@ -1253,32 +1255,32 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x5 );
+                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0xA );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_2)) && (l_def_NUM_X_LINKS_CFG < literal_4)))
             {
-                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x9 );
+                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x10 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
-                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x11 );
+                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x1C );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG == literal_0)))
             {
-                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0xD );
+                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x10 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0xF );
+                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x1C );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x13 );
+                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x32 );
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
@@ -1289,32 +1291,32 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x7 );
+                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0xC );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_2)) && (l_def_NUM_X_LINKS_CFG < literal_4)))
             {
-                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0xD );
+                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x14 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
-                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x17 );
+                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x24 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG == literal_0)))
             {
-                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x12 );
+                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x14 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x15 );
+                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x24 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x1A );
+                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x40 );
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
@@ -1325,32 +1327,32 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0xB );
+                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x12 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_2)) && (l_def_NUM_X_LINKS_CFG < literal_4)))
             {
-                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x13 );
+                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x1D );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
-                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x23 );
+                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x34 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG == literal_0)))
             {
-                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x1B );
+                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x1D );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x1F );
+                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x34 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x27 );
+                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x5C );
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
@@ -1361,32 +1363,32 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x17 );
+                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x18 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_2)) && (l_def_NUM_X_LINKS_CFG < literal_4)))
             {
-                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x27 );
+                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x28 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
-                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x47 );
+                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x48 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG == literal_0)))
             {
-                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x37 );
+                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x28 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x3F );
+                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x48 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x4F );
+                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x80 );
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x5011c2aull, l_scom_buffer));
@@ -1412,22 +1414,22 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
-                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x9 );
+                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0xA );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG == literal_0)))
             {
-                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x6 );
+                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x5 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0xB );
+                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0xA );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0x15 );
+                l_scom_buffer.insert<0, 8, 56, uint64_t>(literal_0xA );
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
@@ -1443,12 +1445,12 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_2)) && (l_def_NUM_X_LINKS_CFG < literal_4)))
             {
-                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x6 );
+                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x7 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
-                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0xB );
+                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0xD );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG == literal_0)))
@@ -1463,7 +1465,7 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x19 );
+                l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x18 );
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
@@ -1474,32 +1476,32 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x5 );
+                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x6 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_2)) && (l_def_NUM_X_LINKS_CFG < literal_4)))
             {
-                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x7 );
+                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0xA );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
-                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0xD );
+                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x14 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG == literal_0)))
             {
-                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x9 );
+                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0xA );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0xF );
+                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x14 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x1D );
+                l_scom_buffer.insert<16, 8, 56, uint64_t>(literal_0x25 );
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
@@ -1510,32 +1512,32 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x6 );
+                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x8 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_2)) && (l_def_NUM_X_LINKS_CFG < literal_4)))
             {
-                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x9 );
+                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0xD );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
-                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0xF );
+                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x19 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG == literal_0)))
             {
-                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0xB );
+                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0xD );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x13 );
+                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x19 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x23 );
+                l_scom_buffer.insert<24, 8, 56, uint64_t>(literal_0x2F );
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
@@ -1546,32 +1548,32 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x7 );
+                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0xA );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_2)) && (l_def_NUM_X_LINKS_CFG < literal_4)))
             {
-                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0xB );
+                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x10 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
-                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x13 );
+                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x1F );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG == literal_0)))
             {
-                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0xD );
+                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x10 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x17 );
+                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x1F );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x2B );
+                l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x3B );
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
@@ -1582,32 +1584,32 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0xA );
+                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0xC );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_2)) && (l_def_NUM_X_LINKS_CFG < literal_4)))
             {
-                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0xF );
+                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x14 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
-                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x1A );
+                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x28 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG == literal_0)))
             {
-                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x12 );
+                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x14 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x1F );
+                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x28 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x3A );
+                l_scom_buffer.insert<40, 8, 56, uint64_t>(literal_0x4C );
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
@@ -1618,32 +1620,32 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0xF );
+                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x12 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_2)) && (l_def_NUM_X_LINKS_CFG < literal_4)))
             {
-                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x17 );
+                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x1D );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
-                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x27 );
+                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x3A );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG == literal_0)))
             {
-                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x1B );
+                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x1D );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x2F );
+                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x3A );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x57 );
+                l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0x6D );
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
@@ -1654,32 +1656,32 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x1F );
+                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x18 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_2)) && (l_def_NUM_X_LINKS_CFG < literal_4)))
             {
-                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x2F );
+                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x28 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
-                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x4F );
+                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x50 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG == literal_0)))
             {
-                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x37 );
+                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x28 );
             }
             else if ((((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                        && (l_def_NUM_X_LINKS_CFG > literal_0)) && (l_def_NUM_X_LINKS_CFG < literal_3)))
             {
-                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x5F );
+                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x50 );
             }
             else if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
                       && (l_def_NUM_X_LINKS_CFG > literal_2)))
             {
-                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0xAF );
+                l_scom_buffer.insert<56, 8, 56, uint64_t>(literal_0x98 );
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x5011c2bull, l_scom_buffer));
@@ -1698,27 +1700,31 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
                 l_scom_buffer.insert<4, 1, 63, uint64_t>(l_PB_COM_PB_CFG_CHIP_IS_SYSTEM_OFF );
             }
 
-            if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW383616 != literal_0))
+            if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
+                 || ((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
+                     && (l_def_NUM_X_LINKS_CFG > literal_3))))
+            {
+                constexpr auto l_PB_COM_PB_CFG_SP_HW_MARK_CNT_31 = 0x7cf9f;
+                l_scom_buffer.insert<16, 7, 57, uint64_t>(l_PB_COM_PB_CFG_SP_HW_MARK_CNT_31 );
+            }
+            else if (literal_1)
             {
                 constexpr auto l_PB_COM_PB_CFG_SP_HW_MARK_CNT_63 = 0xfdfbf;
                 l_scom_buffer.insert<16, 7, 57, uint64_t>(l_PB_COM_PB_CFG_SP_HW_MARK_CNT_63 );
             }
-            else if (( true ))
+
+            if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
+                 || ((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
+                     && (l_def_NUM_X_LINKS_CFG > literal_3))))
             {
-                constexpr auto l_PB_COM_PB_CFG_SP_HW_MARK_CNT_64 = 0x102040;
-                l_scom_buffer.insert<16, 7, 57, uint64_t>(l_PB_COM_PB_CFG_SP_HW_MARK_CNT_64 );
+                constexpr auto l_PB_COM_PB_CFG_GP_HW_MARK_CNT_32 = 0x81020;
+                l_scom_buffer.insert<23, 7, 57, uint64_t>(l_PB_COM_PB_CFG_GP_HW_MARK_CNT_32 );
             }
-
-            if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW383616 != literal_0))
+            else if (literal_1)
             {
                 constexpr auto l_PB_COM_PB_CFG_GP_HW_MARK_CNT_63 = 0xfdfbf;
                 l_scom_buffer.insert<23, 7, 57, uint64_t>(l_PB_COM_PB_CFG_GP_HW_MARK_CNT_63 );
             }
-            else if (( true ))
-            {
-                constexpr auto l_PB_COM_PB_CFG_GP_HW_MARK_CNT_64 = 0x102040;
-                l_scom_buffer.insert<23, 7, 57, uint64_t>(l_PB_COM_PB_CFG_GP_HW_MARK_CNT_64 );
-            }
 
             constexpr auto l_PB_COM_PB_CFG_LCL_HW_MARK_CNT_42 = 0x2aaaa;
             l_scom_buffer.insert<30, 6, 58, uint64_t>(l_PB_COM_PB_CFG_LCL_HW_MARK_CNT_42 );