Add support for iterating over EC_LEVELS

    -Add support for looping over various EC levels for
     SCOM and Scan init files

Change-Id: I7463b71698856922829cddc0e4d8d179803a1db8
RTC:159043
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/31688
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Benjamin Gass <bgass@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/31874
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>

5 files changed, 1267 insertions, 517 deletions

diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_core_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_core_scom.C
index 41015b37..bf1dd25f 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_core_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_core_scom.C
@@ -29,9 +29,9 @@
 
 using namespace fapi2;
 
-constexpr auto literal_0x4301D70000AB7696 = 0x4301D70000AB7696;
 constexpr auto literal_0x0000000000000000 = 0x0000000000000000;
 constexpr auto literal_0xA858009775100008 = 0xA858009775100008;
+constexpr auto literal_0x4301D70000AB7696 = 0x4301D70000AB7696;
 
 fapi2::ReturnCode p9_core_scom(const fapi2::Target<fapi2::TARGET_TYPE_CORE>& TGT0)
 {
@@ -39,72 +39,81 @@ fapi2::ReturnCode p9_core_scom(const fapi2::Target<fapi2::TARGET_TYPE_CORE>& TGT
 
     do
     {
-        fapi2::buffer<uint64_t> l_scom_buffer;
         {
-            l_rc = fapi2::getScom( TGT0, 0x20010a43ull, l_scom_buffer );
-
-            if (l_rc)
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                FAPI_ERR("ERROR executing: getScom (0x20010a43ull)");
-                break;
-            }
+                l_rc = fapi2::getScom( TGT0, 0x20010a46ull, l_scom_buffer );
 
-            {
-                l_scom_buffer.insert<uint64_t> (literal_0x4301D70000AB7696, 0, 64, 0 );
-            }
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x20010a46ull)");
+                    break;
+                }
 
-            l_rc = fapi2::putScom(TGT0, 0x20010a43ull, l_scom_buffer);
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x0000000000000000, 0, 64, 0 );
+                }
 
-            if (l_rc)
-            {
-                FAPI_ERR("ERROR executing: putScom (0x20010a43ull)");
-                break;
+                l_rc = fapi2::putScom(TGT0, 0x20010a46ull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x20010a46ull)");
+                    break;
+                }
             }
         }
         {
-            l_rc = fapi2::getScom( TGT0, 0x20010a46ull, l_scom_buffer );
-
-            if (l_rc)
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                FAPI_ERR("ERROR executing: getScom (0x20010a46ull)");
-                break;
-            }
+                l_rc = fapi2::getScom( TGT0, 0x20010a47ull, l_scom_buffer );
 
-            {
-                l_scom_buffer.insert<uint64_t> (literal_0x0000000000000000, 0, 64, 0 );
-            }
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x20010a47ull)");
+                    break;
+                }
 
-            l_rc = fapi2::putScom(TGT0, 0x20010a46ull, l_scom_buffer);
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0xA858009775100008, 0, 64, 0 );
+                }
 
-            if (l_rc)
-            {
-                FAPI_ERR("ERROR executing: putScom (0x20010a46ull)");
-                break;
+                l_rc = fapi2::putScom(TGT0, 0x20010a47ull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x20010a47ull)");
+                    break;
+                }
             }
         }
         {
-            l_rc = fapi2::getScom( TGT0, 0x20010a47ull, l_scom_buffer );
-
-            if (l_rc)
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                FAPI_ERR("ERROR executing: getScom (0x20010a47ull)");
-                break;
-            }
+                l_rc = fapi2::getScom( TGT0, 0x20010a43ull, l_scom_buffer );
 
-            {
-                l_scom_buffer.insert<uint64_t> (literal_0xA858009775100008, 0, 64, 0 );
-            }
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x20010a43ull)");
+                    break;
+                }
 
-            l_rc = fapi2::putScom(TGT0, 0x20010a47ull, l_scom_buffer);
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x4301D70000AB7696, 0, 64, 0 );
+                }
 
-            if (l_rc)
-            {
-                FAPI_ERR("ERROR executing: putScom (0x20010a47ull)");
-                break;
+                l_rc = fapi2::putScom(TGT0, 0x20010a43ull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x20010a43ull)");
+                    break;
+                }
             }
         }
+
     }
-    while (0);
+    while(0);
 
     return l_rc;
 }
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_l2_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_l2_scom.C
index ded26be9..c93687c8 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_l2_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_l2_scom.C
@@ -29,11 +29,11 @@
 
 using namespace fapi2;
 
-constexpr auto literal_0b0001 = 0b0001;
-constexpr auto literal_0b0100 = 0b0100;
 constexpr auto literal_0 = 0;
 constexpr auto literal_0x001 = 0x001;
 constexpr auto literal_0b0000 = 0b0000;
+constexpr auto literal_0b0001 = 0b0001;
+constexpr auto literal_0b0100 = 0b0100;
 
 fapi2::ReturnCode p9_l2_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0,
                              const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT1)
@@ -42,7 +42,6 @@ fapi2::ReturnCode p9_l2_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0,
 
     do
     {
-        fapi2::buffer<uint64_t> l_scom_buffer;
         fapi2::ATTR_PROC_FABRIC_ADDR_BAR_MODE_Type l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE;
         l_rc = FAPI_ATTR_GET(fapi2::ATTR_PROC_FABRIC_ADDR_BAR_MODE, TGT1, l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE);
 
@@ -52,6 +51,40 @@ fapi2::ReturnCode p9_l2_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0,
             break;
         }
 
+        {
+            fapi2::buffer<uint64_t> l_scom_buffer;
+            {
+                l_rc = fapi2::getScom( TGT0, 0x1001080aull, l_scom_buffer );
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x1001080aull)");
+                    break;
+                }
+
+                {
+                    if ((l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_ADDR_BAR_MODE_SMALL_SYSTEM))
+                    {
+                        constexpr auto l_EXP_L2_L2MISC_L2CERRS_CFG_SYSMAP_SM_NOT_LG_SEL_ON = 0x1;
+                        l_scom_buffer.insert<uint64_t> (l_EXP_L2_L2MISC_L2CERRS_CFG_SYSMAP_SM_NOT_LG_SEL_ON, 23, 1, 63 );
+                    }
+                    else if ((l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_ADDR_BAR_MODE_LARGE_SYSTEM))
+                    {
+                        constexpr auto l_EXP_L2_L2MISC_L2CERRS_CFG_SYSMAP_SM_NOT_LG_SEL_OFF = 0x0;
+                        l_scom_buffer.insert<uint64_t> (l_EXP_L2_L2MISC_L2CERRS_CFG_SYSMAP_SM_NOT_LG_SEL_OFF, 23, 1, 63 );
+                    }
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x1001080aull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x1001080aull)");
+                    break;
+                }
+            }
+        }
+
         fapi2::ATTR_SYSTEM_IPL_PHASE_Type l_TGT1_ATTR_SYSTEM_IPL_PHASE;
         l_rc = FAPI_ATTR_GET(fapi2::ATTR_SYSTEM_IPL_PHASE, TGT1, l_TGT1_ATTR_SYSTEM_IPL_PHASE);
 
@@ -62,75 +95,60 @@ fapi2::ReturnCode p9_l2_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0,
         }
 
         {
-            l_rc = fapi2::getScom( TGT0, 0x1001080aull, l_scom_buffer );
-
-            if (l_rc)
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                FAPI_ERR("ERROR executing: getScom (0x1001080aull)");
-                break;
-            }
+                l_rc = fapi2::getScom( TGT0, 0x1001080aull, l_scom_buffer );
 
-            {
-                if ((l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_ADDR_BAR_MODE_SMALL_SYSTEM))
-                {
-                    constexpr auto l_EXP_L2_L2MISC_L2CERRS_CFG_SYSMAP_SM_NOT_LG_SEL_ON = 0x1;
-                    l_scom_buffer.insert<uint64_t> (l_EXP_L2_L2MISC_L2CERRS_CFG_SYSMAP_SM_NOT_LG_SEL_ON, 23, 1, 63 );
-                }
-                else if ((l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_ADDR_BAR_MODE_LARGE_SYSTEM))
+                if (l_rc)
                 {
-                    constexpr auto l_EXP_L2_L2MISC_L2CERRS_CFG_SYSMAP_SM_NOT_LG_SEL_OFF = 0x0;
-                    l_scom_buffer.insert<uint64_t> (l_EXP_L2_L2MISC_L2CERRS_CFG_SYSMAP_SM_NOT_LG_SEL_OFF, 23, 1, 63 );
+                    FAPI_ERR("ERROR executing: getScom (0x1001080aull)");
+                    break;
                 }
-            }
 
-            {
-                if ((l_TGT1_ATTR_SYSTEM_IPL_PHASE == fapi2::ENUM_ATTR_SYSTEM_IPL_PHASE_HB_RUNTIME))
                 {
-                    constexpr auto l_EXP_L2_L2MISC_L2CERRS_CFG_HASH_L3_ADDR_EN_ON = 0x1;
-                    l_scom_buffer.insert<uint64_t> (l_EXP_L2_L2MISC_L2CERRS_CFG_HASH_L3_ADDR_EN_ON, 21, 1, 63 );
+                    if ((l_TGT1_ATTR_SYSTEM_IPL_PHASE == fapi2::ENUM_ATTR_SYSTEM_IPL_PHASE_HB_RUNTIME))
+                    {
+                        constexpr auto l_EXP_L2_L2MISC_L2CERRS_CFG_HASH_L3_ADDR_EN_ON = 0x1;
+                        l_scom_buffer.insert<uint64_t> (l_EXP_L2_L2MISC_L2CERRS_CFG_HASH_L3_ADDR_EN_ON, 21, 1, 63 );
+                    }
                 }
-            }
 
-            {
-                if ((l_TGT1_ATTR_SYSTEM_IPL_PHASE == ENUM_ATTR_SYSTEM_IPL_PHASE_HB_RUNTIME))
+                l_rc = fapi2::putScom(TGT0, 0x1001080aull, l_scom_buffer);
+
+                if (l_rc)
                 {
-                    constexpr auto l_EXP_L2_L2MISC_L2CERRS_CFG_CAC_ERR_REPAIR_EN_ON = 0x1;
-                    l_scom_buffer.insert<uint64_t> (l_EXP_L2_L2MISC_L2CERRS_CFG_CAC_ERR_REPAIR_EN_ON, 15, 1, 63 );
+                    FAPI_ERR("ERROR executing: putScom (0x1001080aull)");
+                    break;
                 }
             }
-
-            l_rc = fapi2::putScom(TGT0, 0x1001080aull, l_scom_buffer);
-
-            if (l_rc)
-            {
-                FAPI_ERR("ERROR executing: putScom (0x1001080aull)");
-                break;
-            }
         }
 
         {
-            l_rc = fapi2::getScom( TGT0, 0x1001080bull, l_scom_buffer );
-
-            if (l_rc)
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                FAPI_ERR("ERROR executing: getScom (0x1001080bull)");
-                break;
-            }
+                l_rc = fapi2::getScom( TGT0, 0x1001080aull, l_scom_buffer );
 
-            {
-                l_scom_buffer.insert<uint64_t> (literal_0b0001, 4, 4, 60 );
-            }
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x1001080aull)");
+                    break;
+                }
 
-            {
-                l_scom_buffer.insert<uint64_t> (literal_0b0100, 8, 4, 60 );
-            }
+                {
+                    if ((l_TGT1_ATTR_SYSTEM_IPL_PHASE == ENUM_ATTR_SYSTEM_IPL_PHASE_HB_RUNTIME))
+                    {
+                        constexpr auto l_EXP_L2_L2MISC_L2CERRS_CFG_CAC_ERR_REPAIR_EN_ON = 0x1;
+                        l_scom_buffer.insert<uint64_t> (l_EXP_L2_L2MISC_L2CERRS_CFG_CAC_ERR_REPAIR_EN_ON, 15, 1, 63 );
+                    }
+                }
 
-            l_rc = fapi2::putScom(TGT0, 0x1001080bull, l_scom_buffer);
+                l_rc = fapi2::putScom(TGT0, 0x1001080aull, l_scom_buffer);
 
-            if (l_rc)
-            {
-                FAPI_ERR("ERROR executing: putScom (0x1001080bull)");
-                break;
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x1001080aull)");
+                    break;
+                }
             }
         }
 
@@ -143,6 +161,38 @@ fapi2::ReturnCode p9_l2_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0,
             break;
         }
 
+        {
+            fapi2::buffer<uint64_t> l_scom_buffer;
+            {
+                l_rc = fapi2::getScom( TGT0, 0x10010810ull, l_scom_buffer );
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x10010810ull)");
+                    break;
+                }
+
+                {
+                    if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T0 != literal_0))
+                    {
+                        l_scom_buffer.insert<uint64_t> (l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T0, 0, 12, 52 );
+                    }
+                    else if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T0 == literal_0))
+                    {
+                        l_scom_buffer.insert<uint64_t> (literal_0x001, 0, 12, 52 );
+                    }
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x10010810ull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x10010810ull)");
+                    break;
+                }
+            }
+        }
+
         fapi2::ATTR_PROC_EPS_READ_CYCLES_T1_Type l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1;
         l_rc = FAPI_ATTR_GET(fapi2::ATTR_PROC_EPS_READ_CYCLES_T1, TGT1, l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1);
 
@@ -152,6 +202,38 @@ fapi2::ReturnCode p9_l2_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0,
             break;
         }
 
+        {
+            fapi2::buffer<uint64_t> l_scom_buffer;
+            {
+                l_rc = fapi2::getScom( TGT0, 0x10010810ull, l_scom_buffer );
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x10010810ull)");
+                    break;
+                }
+
+                {
+                    if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1 != literal_0))
+                    {
+                        l_scom_buffer.insert<uint64_t> (l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1, 12, 12, 52 );
+                    }
+                    else if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1 == literal_0))
+                    {
+                        l_scom_buffer.insert<uint64_t> (literal_0x001, 12, 12, 52 );
+                    }
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x10010810ull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x10010810ull)");
+                    break;
+                }
+            }
+        }
+
         fapi2::ATTR_PROC_EPS_READ_CYCLES_T2_Type l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2;
         l_rc = FAPI_ATTR_GET(fapi2::ATTR_PROC_EPS_READ_CYCLES_T2, TGT1, l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2);
 
@@ -162,54 +244,35 @@ fapi2::ReturnCode p9_l2_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0,
         }
 
         {
-            l_rc = fapi2::getScom( TGT0, 0x10010810ull, l_scom_buffer );
-
-            if (l_rc)
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                FAPI_ERR("ERROR executing: getScom (0x10010810ull)");
-                break;
-            }
+                l_rc = fapi2::getScom( TGT0, 0x10010810ull, l_scom_buffer );
 
-            {
-                if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T0 != literal_0))
+                if (l_rc)
                 {
-                    l_scom_buffer.insert<uint64_t> (l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T0, 0, 12, 52 );
+                    FAPI_ERR("ERROR executing: getScom (0x10010810ull)");
+                    break;
                 }
-                else if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T0 == literal_0))
-                {
-                    l_scom_buffer.insert<uint64_t> (literal_0x001, 0, 12, 52 );
-                }
-            }
 
-            {
-                if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1 != literal_0))
-                {
-                    l_scom_buffer.insert<uint64_t> (l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1, 12, 12, 52 );
-                }
-                else if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1 == literal_0))
                 {
-                    l_scom_buffer.insert<uint64_t> (literal_0x001, 12, 12, 52 );
+                    if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2 != literal_0))
+                    {
+                        l_scom_buffer.insert<uint64_t> (l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2, 24, 12, 52 );
+                    }
+                    else if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2 == literal_0))
+                    {
+                        l_scom_buffer.insert<uint64_t> (literal_0x001, 24, 12, 52 );
+                    }
                 }
-            }
 
-            {
-                if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2 != literal_0))
-                {
-                    l_scom_buffer.insert<uint64_t> (l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2, 24, 12, 52 );
-                }
-                else if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2 == literal_0))
+                l_rc = fapi2::putScom(TGT0, 0x10010810ull, l_scom_buffer);
+
+                if (l_rc)
                 {
-                    l_scom_buffer.insert<uint64_t> (literal_0x001, 24, 12, 52 );
+                    FAPI_ERR("ERROR executing: putScom (0x10010810ull)");
+                    break;
                 }
             }
-
-            l_rc = fapi2::putScom(TGT0, 0x10010810ull, l_scom_buffer);
-
-            if (l_rc)
-            {
-                FAPI_ERR("ERROR executing: putScom (0x10010810ull)");
-                break;
-            }
         }
 
         fapi2::ATTR_PROC_EPS_WRITE_CYCLES_T1_Type l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T1;
@@ -221,6 +284,38 @@ fapi2::ReturnCode p9_l2_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0,
             break;
         }
 
+        {
+            fapi2::buffer<uint64_t> l_scom_buffer;
+            {
+                l_rc = fapi2::getScom( TGT0, 0x10010811ull, l_scom_buffer );
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x10010811ull)");
+                    break;
+                }
+
+                {
+                    if ((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T1 != literal_0))
+                    {
+                        l_scom_buffer.insert<uint64_t> (l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T1, 0, 12, 52 );
+                    }
+                    else if ((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T1 == literal_0))
+                    {
+                        l_scom_buffer.insert<uint64_t> (literal_0x001, 0, 12, 52 );
+                    }
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x10010811ull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x10010811ull)");
+                    break;
+                }
+            }
+        }
+
         fapi2::ATTR_PROC_EPS_WRITE_CYCLES_T2_Type l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2;
         l_rc = FAPI_ATTR_GET(fapi2::ATTR_PROC_EPS_WRITE_CYCLES_T2, TGT1, l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2);
 
@@ -231,64 +326,191 @@ fapi2::ReturnCode p9_l2_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0,
         }
 
         {
-            l_rc = fapi2::getScom( TGT0, 0x10010811ull, l_scom_buffer );
-
-            if (l_rc)
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                FAPI_ERR("ERROR executing: getScom (0x10010811ull)");
-                break;
+                l_rc = fapi2::getScom( TGT0, 0x10010811ull, l_scom_buffer );
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x10010811ull)");
+                    break;
+                }
+
+                {
+                    if ((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2 != literal_0))
+                    {
+                        l_scom_buffer.insert<uint64_t> (l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2, 12, 12, 52 );
+                    }
+                    else if ((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2 == literal_0))
+                    {
+                        l_scom_buffer.insert<uint64_t> (literal_0x001, 12, 12, 52 );
+                    }
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x10010811ull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x10010811ull)");
+                    break;
+                }
             }
+        }
 
+        {
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                if ((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T1 != literal_0))
+                l_rc = fapi2::getScom( TGT0, 0x10010811ull, l_scom_buffer );
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x10010811ull)");
+                    break;
+                }
+
                 {
-                    l_scom_buffer.insert<uint64_t> (l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T1, 0, 12, 52 );
+                    constexpr auto l_EXP_L2_L2MISC_L2CERRS_EPS_CNT_USE_L2_DIVIDER_EN_OFF = 0x0;
+                    l_scom_buffer.insert<uint64_t> (l_EXP_L2_L2MISC_L2CERRS_EPS_CNT_USE_L2_DIVIDER_EN_OFF, 29, 1, 63 );
                 }
-                else if ((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T1 == literal_0))
+
+                l_rc = fapi2::putScom(TGT0, 0x10010811ull, l_scom_buffer);
+
+                if (l_rc)
                 {
-                    l_scom_buffer.insert<uint64_t> (literal_0x001, 0, 12, 52 );
+                    FAPI_ERR("ERROR executing: putScom (0x10010811ull)");
+                    break;
                 }
             }
+        }
 
+        {
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                if ((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2 != literal_0))
+                l_rc = fapi2::getScom( TGT0, 0x10010811ull, l_scom_buffer );
+
+                if (l_rc)
                 {
-                    l_scom_buffer.insert<uint64_t> (l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2, 12, 12, 52 );
+                    FAPI_ERR("ERROR executing: getScom (0x10010811ull)");
+                    break;
                 }
-                else if ((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2 == literal_0))
+
                 {
-                    l_scom_buffer.insert<uint64_t> (literal_0x001, 12, 12, 52 );
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 30, 4, 60 );
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x10010811ull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x10010811ull)");
+                    break;
                 }
             }
+        }
 
+        {
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                constexpr auto l_EXP_L2_L2MISC_L2CERRS_EPS_CNT_USE_L2_DIVIDER_EN_OFF = 0x0;
-                l_scom_buffer.insert<uint64_t> (l_EXP_L2_L2MISC_L2CERRS_EPS_CNT_USE_L2_DIVIDER_EN_OFF, 29, 1, 63 );
+                l_rc = fapi2::getScom( TGT0, 0x10010811ull, l_scom_buffer );
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x10010811ull)");
+                    break;
+                }
+
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0001, 24, 4, 60 );
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x10010811ull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x10010811ull)");
+                    break;
+                }
             }
+        }
 
+        {
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000, 30, 4, 60 );
+                l_rc = fapi2::getScom( TGT0, 0x10010811ull, l_scom_buffer );
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x10010811ull)");
+                    break;
+                }
+
+                {
+                    constexpr auto l_EXP_L2_L2MISC_L2CERRS_EPS_MODE_SEL_MODE1 = 0x0;
+                    l_scom_buffer.insert<uint64_t> (l_EXP_L2_L2MISC_L2CERRS_EPS_MODE_SEL_MODE1, 28, 1, 63 );
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x10010811ull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x10010811ull)");
+                    break;
+                }
             }
+        }
 
+        {
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0001, 24, 4, 60 );
+                l_rc = fapi2::getScom( TGT0, 0x1001080bull, l_scom_buffer );
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x1001080bull)");
+                    break;
+                }
+
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0001, 4, 4, 60 );
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x1001080bull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x1001080bull)");
+                    break;
+                }
             }
+        }
 
+        {
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                constexpr auto l_EXP_L2_L2MISC_L2CERRS_EPS_MODE_SEL_MODE1 = 0x0;
-                l_scom_buffer.insert<uint64_t> (l_EXP_L2_L2MISC_L2CERRS_EPS_MODE_SEL_MODE1, 28, 1, 63 );
-            }
+                l_rc = fapi2::getScom( TGT0, 0x1001080bull, l_scom_buffer );
 
-            l_rc = fapi2::putScom(TGT0, 0x10010811ull, l_scom_buffer);
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x1001080bull)");
+                    break;
+                }
 
-            if (l_rc)
-            {
-                FAPI_ERR("ERROR executing: putScom (0x10010811ull)");
-                break;
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0100, 8, 4, 60 );
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x1001080bull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x1001080bull)");
+                    break;
+                }
             }
         }
+
     }
-    while (0);
+    while(0);
 
     return l_rc;
 }
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_l3_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_l3_scom.C
index 7932704d..bb267ebd 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_l3_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_l3_scom.C
@@ -43,237 +43,477 @@ fapi2::ReturnCode p9_l3_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0,
 
     do
     {
-        fapi2::buffer<uint64_t> l_scom_buffer;
-        fapi2::ATTR_PROC_EPS_READ_CYCLES_T0_Type l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T0;
-        l_rc = FAPI_ATTR_GET(fapi2::ATTR_PROC_EPS_READ_CYCLES_T0, TGT1, l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T0);
+        fapi2::ATTR_PROC_FABRIC_ADDR_BAR_MODE_Type l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE;
+        l_rc = FAPI_ATTR_GET(fapi2::ATTR_PROC_FABRIC_ADDR_BAR_MODE, TGT1, l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE);
 
         if (l_rc)
         {
-            FAPI_ERR("ERROR executing: FAPI_ATTR_GET (ATTR_PROC_EPS_READ_CYCLES_T0)");
+            FAPI_ERR("ERROR executing: FAPI_ATTR_GET (ATTR_PROC_FABRIC_ADDR_BAR_MODE)");
             break;
         }
 
-        fapi2::ATTR_PROC_EPS_READ_CYCLES_T1_Type l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1;
-        l_rc = FAPI_ATTR_GET(fapi2::ATTR_PROC_EPS_READ_CYCLES_T1, TGT1, l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1);
-
-        if (l_rc)
         {
-            FAPI_ERR("ERROR executing: FAPI_ATTR_GET (ATTR_PROC_EPS_READ_CYCLES_T1)");
-            break;
+            fapi2::buffer<uint64_t> l_scom_buffer;
+            {
+                l_rc = fapi2::getScom( TGT0, 0x1001182bull, l_scom_buffer );
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x1001182bull)");
+                    break;
+                }
+
+                {
+                    if ((l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_ADDR_BAR_MODE_SMALL_SYSTEM))
+                    {
+                        constexpr auto l_EXP_L3_L3_MISC_L3CERRS_L3_SYSMAP_SM_NOT_LG_SEL_ON = 0x1;
+                        l_scom_buffer.insert<uint64_t> (l_EXP_L3_L3_MISC_L3CERRS_L3_SYSMAP_SM_NOT_LG_SEL_ON, 22, 1, 63 );
+                    }
+                    else if ((l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_ADDR_BAR_MODE_LARGE_SYSTEM))
+                    {
+                        constexpr auto l_EXP_L3_L3_MISC_L3CERRS_L3_SYSMAP_SM_NOT_LG_SEL_OFF = 0x0;
+                        l_scom_buffer.insert<uint64_t> (l_EXP_L3_L3_MISC_L3CERRS_L3_SYSMAP_SM_NOT_LG_SEL_OFF, 22, 1, 63 );
+                    }
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x1001182bull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x1001182bull)");
+                    break;
+                }
+            }
         }
 
-        fapi2::ATTR_PROC_EPS_READ_CYCLES_T2_Type l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2;
-        l_rc = FAPI_ATTR_GET(fapi2::ATTR_PROC_EPS_READ_CYCLES_T2, TGT1, l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2);
+        fapi2::ATTR_SYSTEM_IPL_PHASE_Type l_TGT1_ATTR_SYSTEM_IPL_PHASE;
+        l_rc = FAPI_ATTR_GET(fapi2::ATTR_SYSTEM_IPL_PHASE, TGT1, l_TGT1_ATTR_SYSTEM_IPL_PHASE);
 
         if (l_rc)
         {
-            FAPI_ERR("ERROR executing: FAPI_ATTR_GET (ATTR_PROC_EPS_READ_CYCLES_T2)");
+            FAPI_ERR("ERROR executing: FAPI_ATTR_GET (ATTR_SYSTEM_IPL_PHASE)");
             break;
         }
 
         {
-            l_rc = fapi2::getScom( TGT0, 0x10011829ull, l_scom_buffer );
-
-            if (l_rc)
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                FAPI_ERR("ERROR executing: getScom (0x10011829ull)");
-                break;
-            }
+                l_rc = fapi2::getScom( TGT0, 0x1001182bull, l_scom_buffer );
 
-            {
-                if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T0 != literal_0))
+                if (l_rc)
                 {
-                    l_scom_buffer.insert<uint64_t> (l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T0, 0, 12, 52 );
+                    FAPI_ERR("ERROR executing: getScom (0x1001182bull)");
+                    break;
                 }
-                else if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T0 == literal_0))
+
+                {
+                    if ((l_TGT1_ATTR_SYSTEM_IPL_PHASE == fapi2::ENUM_ATTR_SYSTEM_IPL_PHASE_HB_RUNTIME))
+                    {
+                        constexpr auto l_EXP_L3_L3_MISC_L3CERRS_L3_ADDR_HASH_EN_CFG_ON = 0x1;
+                        l_scom_buffer.insert<uint64_t> (l_EXP_L3_L3_MISC_L3CERRS_L3_ADDR_HASH_EN_CFG_ON, 11, 1, 63 );
+                    }
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x1001182bull, l_scom_buffer);
+
+                if (l_rc)
                 {
-                    l_scom_buffer.insert<uint64_t> (literal_0x001, 0, 12, 52 );
+                    FAPI_ERR("ERROR executing: putScom (0x1001182bull)");
+                    break;
                 }
             }
+        }
 
+        {
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1 != literal_0))
+                l_rc = fapi2::getScom( TGT0, 0x1001182bull, l_scom_buffer );
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x1001182bull)");
+                    break;
+                }
+
                 {
-                    l_scom_buffer.insert<uint64_t> (l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1, 12, 12, 52 );
+                    if ((l_TGT1_ATTR_SYSTEM_IPL_PHASE == fapi2::ENUM_ATTR_SYSTEM_IPL_PHASE_HB_RUNTIME))
+                    {
+                        constexpr auto l_EXP_L3_L3_MISC_L3CERRS_L3_RDSN_LINEDEL_UE_EN_ON = 0x1;
+                        l_scom_buffer.insert<uint64_t> (l_EXP_L3_L3_MISC_L3CERRS_L3_RDSN_LINEDEL_UE_EN_ON, 2, 1, 63 );
+                    }
                 }
-                else if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1 == literal_0))
+
+                l_rc = fapi2::putScom(TGT0, 0x1001182bull, l_scom_buffer);
+
+                if (l_rc)
                 {
-                    l_scom_buffer.insert<uint64_t> (literal_0x001, 12, 12, 52 );
+                    FAPI_ERR("ERROR executing: putScom (0x1001182bull)");
+                    break;
                 }
             }
+        }
 
+        {
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2 != literal_0))
+                l_rc = fapi2::getScom( TGT0, 0x1001182bull, l_scom_buffer );
+
+                if (l_rc)
                 {
-                    l_scom_buffer.insert<uint64_t> (l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2, 24, 12, 52 );
+                    FAPI_ERR("ERROR executing: getScom (0x1001182bull)");
+                    break;
                 }
-                else if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2 == literal_0))
+
                 {
-                    l_scom_buffer.insert<uint64_t> (literal_0x001, 24, 12, 52 );
+                    if ((l_TGT1_ATTR_SYSTEM_IPL_PHASE == fapi2::ENUM_ATTR_SYSTEM_IPL_PHASE_HB_RUNTIME))
+                    {
+                        constexpr auto l_EXP_L3_L3_MISC_L3CERRS_L3_DMAP_CI_EN_CFG_OFF = 0x0;
+                        l_scom_buffer.insert<uint64_t> (l_EXP_L3_L3_MISC_L3CERRS_L3_DMAP_CI_EN_CFG_OFF, 1, 1, 63 );
+                    }
                 }
-            }
 
-            l_rc = fapi2::putScom(TGT0, 0x10011829ull, l_scom_buffer);
+                l_rc = fapi2::putScom(TGT0, 0x1001182bull, l_scom_buffer);
 
-            if (l_rc)
-            {
-                FAPI_ERR("ERROR executing: putScom (0x10011829ull)");
-                break;
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x1001182bull)");
+                    break;
+                }
             }
         }
 
-        fapi2::ATTR_PROC_EPS_WRITE_CYCLES_T1_Type l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T1;
-        l_rc = FAPI_ATTR_GET(fapi2::ATTR_PROC_EPS_WRITE_CYCLES_T1, TGT1, l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T1);
+        fapi2::ATTR_PROC_EPS_READ_CYCLES_T0_Type l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T0;
+        l_rc = FAPI_ATTR_GET(fapi2::ATTR_PROC_EPS_READ_CYCLES_T0, TGT1, l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T0);
 
         if (l_rc)
         {
-            FAPI_ERR("ERROR executing: FAPI_ATTR_GET (ATTR_PROC_EPS_WRITE_CYCLES_T1)");
+            FAPI_ERR("ERROR executing: FAPI_ATTR_GET (ATTR_PROC_EPS_READ_CYCLES_T0)");
             break;
         }
 
-        fapi2::ATTR_PROC_EPS_WRITE_CYCLES_T2_Type l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2;
-        l_rc = FAPI_ATTR_GET(fapi2::ATTR_PROC_EPS_WRITE_CYCLES_T2, TGT1, l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2);
+        {
+            fapi2::buffer<uint64_t> l_scom_buffer;
+            {
+                l_rc = fapi2::getScom( TGT0, 0x10011829ull, l_scom_buffer );
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x10011829ull)");
+                    break;
+                }
+
+                {
+                    if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T0 != literal_0))
+                    {
+                        l_scom_buffer.insert<uint64_t> (l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T0, 0, 12, 52 );
+                    }
+                    else if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T0 == literal_0))
+                    {
+                        l_scom_buffer.insert<uint64_t> (literal_0x001, 0, 12, 52 );
+                    }
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x10011829ull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x10011829ull)");
+                    break;
+                }
+            }
+        }
+
+        fapi2::ATTR_PROC_EPS_READ_CYCLES_T1_Type l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1;
+        l_rc = FAPI_ATTR_GET(fapi2::ATTR_PROC_EPS_READ_CYCLES_T1, TGT1, l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1);
 
         if (l_rc)
         {
-            FAPI_ERR("ERROR executing: FAPI_ATTR_GET (ATTR_PROC_EPS_WRITE_CYCLES_T2)");
+            FAPI_ERR("ERROR executing: FAPI_ATTR_GET (ATTR_PROC_EPS_READ_CYCLES_T1)");
             break;
         }
 
         {
-            l_rc = fapi2::getScom( TGT0, 0x1001182aull, l_scom_buffer );
-
-            if (l_rc)
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                FAPI_ERR("ERROR executing: getScom (0x1001182aull)");
-                break;
-            }
+                l_rc = fapi2::getScom( TGT0, 0x10011829ull, l_scom_buffer );
 
-            {
-                if ((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T1 != literal_0))
+                if (l_rc)
                 {
-                    l_scom_buffer.insert<uint64_t> (l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T1, 0, 12, 52 );
+                    FAPI_ERR("ERROR executing: getScom (0x10011829ull)");
+                    break;
                 }
-                else if ((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T1 == literal_0))
-                {
-                    l_scom_buffer.insert<uint64_t> (literal_0x001, 0, 12, 52 );
-                }
-            }
 
-            {
-                if ((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2 != literal_0))
                 {
-                    l_scom_buffer.insert<uint64_t> (l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2, 12, 12, 52 );
+                    if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1 != literal_0))
+                    {
+                        l_scom_buffer.insert<uint64_t> (l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1, 12, 12, 52 );
+                    }
+                    else if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1 == literal_0))
+                    {
+                        l_scom_buffer.insert<uint64_t> (literal_0x001, 12, 12, 52 );
+                    }
                 }
-                else if ((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2 == literal_0))
+
+                l_rc = fapi2::putScom(TGT0, 0x10011829ull, l_scom_buffer);
+
+                if (l_rc)
                 {
-                    l_scom_buffer.insert<uint64_t> (literal_0x001, 12, 12, 52 );
+                    FAPI_ERR("ERROR executing: putScom (0x10011829ull)");
+                    break;
                 }
             }
+        }
 
-            {
-                l_scom_buffer.insert<uint64_t> (literal_0b0, 34, 1, 63 );
-            }
+        fapi2::ATTR_PROC_EPS_READ_CYCLES_T2_Type l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2;
+        l_rc = FAPI_ATTR_GET(fapi2::ATTR_PROC_EPS_READ_CYCLES_T2, TGT1, l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2);
 
-            {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000, 26, 4, 60 );
-            }
+        if (l_rc)
+        {
+            FAPI_ERR("ERROR executing: FAPI_ATTR_GET (ATTR_PROC_EPS_READ_CYCLES_T2)");
+            break;
+        }
 
+        {
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0001, 30, 4, 60 );
-            }
+                l_rc = fapi2::getScom( TGT0, 0x10011829ull, l_scom_buffer );
 
-            l_rc = fapi2::putScom(TGT0, 0x1001182aull, l_scom_buffer);
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x10011829ull)");
+                    break;
+                }
 
-            if (l_rc)
-            {
-                FAPI_ERR("ERROR executing: putScom (0x1001182aull)");
-                break;
+                {
+                    if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2 != literal_0))
+                    {
+                        l_scom_buffer.insert<uint64_t> (l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2, 24, 12, 52 );
+                    }
+                    else if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2 == literal_0))
+                    {
+                        l_scom_buffer.insert<uint64_t> (literal_0x001, 24, 12, 52 );
+                    }
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x10011829ull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x10011829ull)");
+                    break;
+                }
             }
         }
 
-        fapi2::ATTR_PROC_FABRIC_ADDR_BAR_MODE_Type l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE;
-        l_rc = FAPI_ATTR_GET(fapi2::ATTR_PROC_FABRIC_ADDR_BAR_MODE, TGT1, l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE);
+        fapi2::ATTR_PROC_EPS_WRITE_CYCLES_T1_Type l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T1;
+        l_rc = FAPI_ATTR_GET(fapi2::ATTR_PROC_EPS_WRITE_CYCLES_T1, TGT1, l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T1);
 
         if (l_rc)
         {
-            FAPI_ERR("ERROR executing: FAPI_ATTR_GET (ATTR_PROC_FABRIC_ADDR_BAR_MODE)");
+            FAPI_ERR("ERROR executing: FAPI_ATTR_GET (ATTR_PROC_EPS_WRITE_CYCLES_T1)");
             break;
         }
 
-        fapi2::ATTR_SYSTEM_IPL_PHASE_Type l_TGT1_ATTR_SYSTEM_IPL_PHASE;
-        l_rc = FAPI_ATTR_GET(fapi2::ATTR_SYSTEM_IPL_PHASE, TGT1, l_TGT1_ATTR_SYSTEM_IPL_PHASE);
+        {
+            fapi2::buffer<uint64_t> l_scom_buffer;
+            {
+                l_rc = fapi2::getScom( TGT0, 0x1001182aull, l_scom_buffer );
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x1001182aull)");
+                    break;
+                }
+
+                {
+                    if ((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T1 != literal_0))
+                    {
+                        l_scom_buffer.insert<uint64_t> (l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T1, 0, 12, 52 );
+                    }
+                    else if ((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T1 == literal_0))
+                    {
+                        l_scom_buffer.insert<uint64_t> (literal_0x001, 0, 12, 52 );
+                    }
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x1001182aull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x1001182aull)");
+                    break;
+                }
+            }
+        }
+
+        fapi2::ATTR_PROC_EPS_WRITE_CYCLES_T2_Type l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2;
+        l_rc = FAPI_ATTR_GET(fapi2::ATTR_PROC_EPS_WRITE_CYCLES_T2, TGT1, l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2);
 
         if (l_rc)
         {
-            FAPI_ERR("ERROR executing: FAPI_ATTR_GET (ATTR_SYSTEM_IPL_PHASE)");
+            FAPI_ERR("ERROR executing: FAPI_ATTR_GET (ATTR_PROC_EPS_WRITE_CYCLES_T2)");
             break;
         }
 
         {
-            l_rc = fapi2::getScom( TGT0, 0x1001182bull, l_scom_buffer );
-
-            if (l_rc)
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                FAPI_ERR("ERROR executing: getScom (0x1001182bull)");
-                break;
-            }
+                l_rc = fapi2::getScom( TGT0, 0x1001182aull, l_scom_buffer );
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x1001182aull)");
+                    break;
+                }
 
-            {
-                if ((l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_ADDR_BAR_MODE_SMALL_SYSTEM))
                 {
-                    constexpr auto l_EXP_L3_L3_MISC_L3CERRS_L3_SYSMAP_SM_NOT_LG_SEL_ON = 0x1;
-                    l_scom_buffer.insert<uint64_t> (l_EXP_L3_L3_MISC_L3CERRS_L3_SYSMAP_SM_NOT_LG_SEL_ON, 22, 1, 63 );
+                    if ((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2 != literal_0))
+                    {
+                        l_scom_buffer.insert<uint64_t> (l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2, 12, 12, 52 );
+                    }
+                    else if ((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2 == literal_0))
+                    {
+                        l_scom_buffer.insert<uint64_t> (literal_0x001, 12, 12, 52 );
+                    }
                 }
-                else if ((l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_ADDR_BAR_MODE_LARGE_SYSTEM))
+
+                l_rc = fapi2::putScom(TGT0, 0x1001182aull, l_scom_buffer);
+
+                if (l_rc)
                 {
-                    constexpr auto l_EXP_L3_L3_MISC_L3CERRS_L3_SYSMAP_SM_NOT_LG_SEL_OFF = 0x0;
-                    l_scom_buffer.insert<uint64_t> (l_EXP_L3_L3_MISC_L3CERRS_L3_SYSMAP_SM_NOT_LG_SEL_OFF, 22, 1, 63 );
+                    FAPI_ERR("ERROR executing: putScom (0x1001182aull)");
+                    break;
                 }
             }
+        }
 
+        {
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                if ((l_TGT1_ATTR_SYSTEM_IPL_PHASE == fapi2::ENUM_ATTR_SYSTEM_IPL_PHASE_HB_RUNTIME))
+                l_rc = fapi2::getScom( TGT0, 0x1001182aull, l_scom_buffer );
+
+                if (l_rc)
                 {
-                    constexpr auto l_EXP_L3_L3_MISC_L3CERRS_L3_ADDR_HASH_EN_CFG_ON = 0x1;
-                    l_scom_buffer.insert<uint64_t> (l_EXP_L3_L3_MISC_L3CERRS_L3_ADDR_HASH_EN_CFG_ON, 11, 1, 63 );
+                    FAPI_ERR("ERROR executing: getScom (0x1001182aull)");
+                    break;
+                }
+
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0, 34, 1, 63 );
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x1001182aull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x1001182aull)");
+                    break;
                 }
             }
+        }
 
+        {
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                if ((l_TGT1_ATTR_SYSTEM_IPL_PHASE == fapi2::ENUM_ATTR_SYSTEM_IPL_PHASE_HB_RUNTIME))
+                l_rc = fapi2::getScom( TGT0, 0x1001182aull, l_scom_buffer );
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x1001182aull)");
+                    break;
+                }
+
                 {
-                    constexpr auto l_EXP_L3_L3_MISC_L3CERRS_L3_RDSN_LINEDEL_UE_EN_ON = 0x1;
-                    l_scom_buffer.insert<uint64_t> (l_EXP_L3_L3_MISC_L3CERRS_L3_RDSN_LINEDEL_UE_EN_ON, 2, 1, 63 );
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 26, 4, 60 );
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x1001182aull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x1001182aull)");
+                    break;
                 }
             }
+        }
 
+        {
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                if ((l_TGT1_ATTR_SYSTEM_IPL_PHASE == fapi2::ENUM_ATTR_SYSTEM_IPL_PHASE_HB_RUNTIME))
+                l_rc = fapi2::getScom( TGT0, 0x1001182aull, l_scom_buffer );
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x1001182aull)");
+                    break;
+                }
+
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0001, 30, 4, 60 );
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x1001182aull, l_scom_buffer);
+
+                if (l_rc)
                 {
-                    constexpr auto l_EXP_L3_L3_MISC_L3CERRS_L3_DMAP_CI_EN_CFG_OFF = 0x0;
-                    l_scom_buffer.insert<uint64_t> (l_EXP_L3_L3_MISC_L3CERRS_L3_DMAP_CI_EN_CFG_OFF, 1, 1, 63 );
+                    FAPI_ERR("ERROR executing: putScom (0x1001182aull)");
+                    break;
                 }
             }
+        }
 
+        {
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0001, 14, 4, 60 );
+                l_rc = fapi2::getScom( TGT0, 0x1001182bull, l_scom_buffer );
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x1001182bull)");
+                    break;
+                }
+
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0001, 14, 4, 60 );
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x1001182bull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x1001182bull)");
+                    break;
+                }
             }
+        }
 
+        {
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0100, 18, 4, 60 );
-            }
+                l_rc = fapi2::getScom( TGT0, 0x1001182bull, l_scom_buffer );
 
-            l_rc = fapi2::putScom(TGT0, 0x1001182bull, l_scom_buffer);
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x1001182bull)");
+                    break;
+                }
 
-            if (l_rc)
-            {
-                FAPI_ERR("ERROR executing: putScom (0x1001182bull)");
-                break;
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0100, 18, 4, 60 );
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x1001182bull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x1001182bull)");
+                    break;
+                }
             }
         }
+
     }
-    while (0);
+    while(0);
 
     return l_rc;
 }
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_mmu_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_mmu_scom.C
index cacaf193..16e38f45 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_mmu_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_mmu_scom.C
@@ -29,15 +29,15 @@
 
 using namespace fapi2;
 
-constexpr auto literal_0x04047C0000000000 = 0x04047C0000000000;
-constexpr auto literal_0x0000000000000000 = 0x0000000000000000;
-constexpr auto literal_0x409B000000000000 = 0x409B000000000000;
-constexpr auto literal_0x0000FAF800FF = 0x0000FAF800FF;
-constexpr auto literal_0x000000000000 = 0x000000000000;
-constexpr auto literal_0x910000040B00 = 0x910000040B00;
 constexpr auto literal_0b11111 = 0b11111;
-constexpr auto literal_0x00E = 0x00E;
 constexpr auto literal_0x0258 = 0x0258;
+constexpr auto literal_0x00E = 0x00E;
+constexpr auto literal_0x000000000000 = 0x000000000000;
+constexpr auto literal_0x910000040B00 = 0x910000040B00;
+constexpr auto literal_0x0000FAF800FF = 0x0000FAF800FF;
+constexpr auto literal_0x0000000000000000 = 0x0000000000000000;
+constexpr auto literal_0x409B000000000000 = 0x409B000000000000;
+constexpr auto literal_0x04047C0000000000 = 0x04047C0000000000;
 
 fapi2::ReturnCode p9_mmu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT0,
                               const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT1)
@@ -46,316 +46,484 @@ fapi2::ReturnCode p9_mmu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
 
     do
     {
-        fapi2::buffer<uint64_t> l_scom_buffer;
+        fapi2::ATTR_EC_Type   l_chip_ec;
+        fapi2::ATTR_NAME_Type l_chip_id;
+        l_rc = FAPI_ATTR_GET_PRIVILEGED(fapi2::ATTR_NAME, TGT0, l_chip_id);
+
+        if (l_rc)
         {
-            l_rc = fapi2::getScom( TGT0, 0x5012c03ull, l_scom_buffer );
+            FAPI_ERR("ERROR getting ATTR_NAME");
+            break;
+        }
 
-            if (l_rc)
-            {
-                FAPI_ERR("ERROR executing: getScom (0x5012c03ull)");
-                break;
-            }
+        l_rc = FAPI_ATTR_GET_PRIVILEGED(fapi2::ATTR_EC, TGT0, l_chip_ec);
 
+        if (l_rc)
+        {
+            FAPI_ERR("ERROR getting ATTR_EC");
+            break;
+        }
+
+        {
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x04047C0000000000, 0, 22, 0 );
-            }
+                l_rc = fapi2::getScom( TGT0, 0x5012c52ull, l_scom_buffer );
 
-            l_rc = fapi2::putScom(TGT0, 0x5012c03ull, l_scom_buffer);
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x5012c52ull)");
+                    break;
+                }
 
-            if (l_rc)
-            {
-                FAPI_ERR("ERROR executing: putScom (0x5012c03ull)");
-                break;
-            }
-        }
-        {
-            l_rc = fapi2::getScom( TGT0, 0x5012c06ull, l_scom_buffer );
+                {
+                    constexpr auto l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV = 0x70;
+                    l_scom_buffer.insert<uint64_t> (l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV, 20, 1, 57 );
+                    l_scom_buffer.insert<uint64_t> (l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV, 24, 1, 62 );
+                    l_scom_buffer.insert<uint64_t> (l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV, 26, 1, 63 );
+                }
 
-            if (l_rc)
-            {
-                FAPI_ERR("ERROR executing: getScom (0x5012c06ull)");
-                break;
-            }
+                l_rc = fapi2::putScom(TGT0, 0x5012c52ull, l_scom_buffer);
 
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x5012c52ull)");
+                    break;
+                }
+            }
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x0000000000000000, 0, 22, 0 );
+                l_rc = fapi2::getScom( TGT0, 0x5012c53ull, l_scom_buffer );
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x5012c53ull)");
+                    break;
+                }
+
+                {
+                    constexpr auto l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV = 0x70;
+                    l_scom_buffer.insert<uint64_t> (l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV, 2, 2, 60 );
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x5012c53ull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x5012c53ull)");
+                    break;
+                }
             }
+            {
+                l_rc = fapi2::getScom( TGT0, 0x5012c54ull, l_scom_buffer );
 
-            l_rc = fapi2::putScom(TGT0, 0x5012c06ull, l_scom_buffer);
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x5012c54ull)");
+                    break;
+                }
 
-            if (l_rc)
+                {
+                    constexpr auto l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV = 0x70;
+                    l_scom_buffer.insert<uint64_t> (l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV, 16, 1, 58 );
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x5012c54ull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x5012c54ull)");
+                    break;
+                }
+            }
             {
-                FAPI_ERR("ERROR executing: putScom (0x5012c06ull)");
-                break;
+                l_rc = fapi2::getScom( TGT0, 0x5012c55ull, l_scom_buffer );
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x5012c55ull)");
+                    break;
+                }
+
+                {
+                    constexpr auto l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV = 0x70;
+                    l_scom_buffer.insert<uint64_t> (l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV, 16, 1, 59 );
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x5012c55ull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x5012c55ull)");
+                    break;
+                }
             }
         }
-        {
-            l_rc = fapi2::getScom( TGT0, 0x5012c07ull, l_scom_buffer );
 
-            if (l_rc)
+        {
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                FAPI_ERR("ERROR executing: getScom (0x5012c07ull)");
-                break;
-            }
+                l_rc = fapi2::getScom( TGT0, 0x5012c52ull, l_scom_buffer );
 
-            {
-                l_scom_buffer.insert<uint64_t> (literal_0x409B000000000000, 0, 22, 0 );
-            }
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x5012c52ull)");
+                    break;
+                }
 
-            l_rc = fapi2::putScom(TGT0, 0x5012c07ull, l_scom_buffer);
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b11111, 30, 1, 59 );
+                    l_scom_buffer.insert<uint64_t> (literal_0b11111, 60, 4, 60 );
+                }
 
-            if (l_rc)
-            {
-                FAPI_ERR("ERROR executing: putScom (0x5012c07ull)");
-                break;
+                l_rc = fapi2::putScom(TGT0, 0x5012c52ull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x5012c52ull)");
+                    break;
+                }
             }
         }
-        fapi2::ATTR_PROC_FABRIC_ADDR_BAR_MODE_Type l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE;
-        l_rc = FAPI_ATTR_GET(fapi2::ATTR_PROC_FABRIC_ADDR_BAR_MODE, TGT1, l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE);
 
-        if (l_rc)
         {
-            FAPI_ERR("ERROR executing: FAPI_ATTR_GET (ATTR_PROC_FABRIC_ADDR_BAR_MODE)");
-            break;
-        }
+            fapi2::buffer<uint64_t> l_scom_buffer;
+            {
+                l_rc = fapi2::getScom( TGT0, 0x5012c53ull, l_scom_buffer );
 
-        fapi2::ATTR_PROC_FABRIC_PUMP_MODE_Type l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE;
-        l_rc = FAPI_ATTR_GET(fapi2::ATTR_PROC_FABRIC_PUMP_MODE, TGT1, l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE);
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x5012c53ull)");
+                    break;
+                }
 
-        if (l_rc)
-        {
-            FAPI_ERR("ERROR executing: FAPI_ATTR_GET (ATTR_PROC_FABRIC_PUMP_MODE)");
-            break;
-        }
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x0258, 32, 16, 48 );
+                }
 
-        {
-            l_rc = fapi2::getScom( TGT0, 0x5012c15ull, l_scom_buffer );
+                l_rc = fapi2::putScom(TGT0, 0x5012c53ull, l_scom_buffer);
 
-            if (l_rc)
-            {
-                FAPI_ERR("ERROR executing: getScom (0x5012c15ull)");
-                break;
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x5012c53ull)");
+                    break;
+                }
             }
+        }
 
+        {
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                if ((l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_ADDR_BAR_MODE_SMALL_SYSTEM))
+                l_rc = fapi2::getScom( TGT0, 0x5012c55ull, l_scom_buffer );
+
+                if (l_rc)
                 {
-                    constexpr auto l_NMMU_MM_FBC_CQ_WRAP_NXCQ_SCOM_ADDR_BAR_MODE_ON = 0x1;
-                    l_scom_buffer.insert<uint64_t> (l_NMMU_MM_FBC_CQ_WRAP_NXCQ_SCOM_ADDR_BAR_MODE_ON, 33, 1, 63 );
+                    FAPI_ERR("ERROR executing: getScom (0x5012c55ull)");
+                    break;
                 }
-                else if ((l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_ADDR_BAR_MODE_LARGE_SYSTEM))
+
                 {
-                    constexpr auto l_NMMU_MM_FBC_CQ_WRAP_NXCQ_SCOM_ADDR_BAR_MODE_OFF = 0x0;
-                    l_scom_buffer.insert<uint64_t> (l_NMMU_MM_FBC_CQ_WRAP_NXCQ_SCOM_ADDR_BAR_MODE_OFF, 33, 1, 63 );
+                    constexpr auto l_NMMU_MM_CFG_NMMU_CTL_TLB_HASH_PID_DIS_ON = 0x1;
+                    l_scom_buffer.insert<uint64_t> (l_NMMU_MM_CFG_NMMU_CTL_TLB_HASH_PID_DIS_ON, 21, 1, 63 );
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x5012c55ull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x5012c55ull)");
+                    break;
                 }
             }
+        }
 
+        {
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                if ((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_NODE))
+                l_rc = fapi2::getScom( TGT0, 0x5012c55ull, l_scom_buffer );
+
+                if (l_rc)
                 {
-                    constexpr auto l_NMMU_MM_FBC_CQ_WRAP_NXCQ_SCOM_CFG_PUMP_MODE_ON = 0x1;
-                    l_scom_buffer.insert<uint64_t> (l_NMMU_MM_FBC_CQ_WRAP_NXCQ_SCOM_CFG_PUMP_MODE_ON, 39, 1, 63 );
+                    FAPI_ERR("ERROR executing: getScom (0x5012c55ull)");
+                    break;
                 }
-                else if ((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP))
+
                 {
-                    constexpr auto l_NMMU_MM_FBC_CQ_WRAP_NXCQ_SCOM_CFG_PUMP_MODE_OFF = 0x0;
-                    l_scom_buffer.insert<uint64_t> (l_NMMU_MM_FBC_CQ_WRAP_NXCQ_SCOM_CFG_PUMP_MODE_OFF, 39, 1, 63 );
+                    constexpr auto l_NMMU_MM_CFG_NMMU_CTL_TLB_ISS543B_FIX_EN_ON = 0x1;
+                    l_scom_buffer.insert<uint64_t> (l_NMMU_MM_CFG_NMMU_CTL_TLB_ISS543B_FIX_EN_ON, 53, 1, 63 );
                 }
-            }
 
-            l_rc = fapi2::putScom(TGT0, 0x5012c15ull, l_scom_buffer);
+                l_rc = fapi2::putScom(TGT0, 0x5012c55ull, l_scom_buffer);
 
-            if (l_rc)
-            {
-                FAPI_ERR("ERROR executing: putScom (0x5012c15ull)");
-                break;
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x5012c55ull)");
+                    break;
+                }
             }
         }
 
         {
-            l_rc = fapi2::getScom( TGT0, 0x5012c43ull, l_scom_buffer );
-
-            if (l_rc)
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                FAPI_ERR("ERROR executing: getScom (0x5012c43ull)");
-                break;
-            }
+                l_rc = fapi2::getScom( TGT0, 0x5012c52ull, l_scom_buffer );
 
-            {
-                l_scom_buffer.insert<uint64_t> (literal_0x0000FAF800FF, 0, 48, 16 );
-            }
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x5012c52ull)");
+                    break;
+                }
+
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x00E, 0, 12, 52 );
+                }
 
-            l_rc = fapi2::putScom(TGT0, 0x5012c43ull, l_scom_buffer);
+                l_rc = fapi2::putScom(TGT0, 0x5012c52ull, l_scom_buffer);
 
-            if (l_rc)
-            {
-                FAPI_ERR("ERROR executing: putScom (0x5012c43ull)");
-                break;
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x5012c52ull)");
+                    break;
+                }
             }
         }
 
+        fapi2::ATTR_PROC_FABRIC_ADDR_BAR_MODE_Type l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE;
+        l_rc = FAPI_ATTR_GET(fapi2::ATTR_PROC_FABRIC_ADDR_BAR_MODE, TGT1, l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE);
+
+        if (l_rc)
         {
-            l_rc = fapi2::getScom( TGT0, 0x5012c46ull, l_scom_buffer );
+            FAPI_ERR("ERROR executing: FAPI_ATTR_GET (ATTR_PROC_FABRIC_ADDR_BAR_MODE)");
+            break;
+        }
 
-            if (l_rc)
+        {
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                FAPI_ERR("ERROR executing: getScom (0x5012c46ull)");
-                break;
-            }
+                l_rc = fapi2::getScom( TGT0, 0x5012c15ull, l_scom_buffer );
 
-            {
-                l_scom_buffer.insert<uint64_t> (literal_0x000000000000, 0, 48, 16 );
-            }
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x5012c15ull)");
+                    break;
+                }
 
-            l_rc = fapi2::putScom(TGT0, 0x5012c46ull, l_scom_buffer);
+                {
+                    if ((l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_ADDR_BAR_MODE_SMALL_SYSTEM))
+                    {
+                        constexpr auto l_NMMU_MM_FBC_CQ_WRAP_NXCQ_SCOM_ADDR_BAR_MODE_ON = 0x1;
+                        l_scom_buffer.insert<uint64_t> (l_NMMU_MM_FBC_CQ_WRAP_NXCQ_SCOM_ADDR_BAR_MODE_ON, 33, 1, 63 );
+                    }
+                    else if ((l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_ADDR_BAR_MODE_LARGE_SYSTEM))
+                    {
+                        constexpr auto l_NMMU_MM_FBC_CQ_WRAP_NXCQ_SCOM_ADDR_BAR_MODE_OFF = 0x0;
+                        l_scom_buffer.insert<uint64_t> (l_NMMU_MM_FBC_CQ_WRAP_NXCQ_SCOM_ADDR_BAR_MODE_OFF, 33, 1, 63 );
+                    }
+                }
 
-            if (l_rc)
-            {
-                FAPI_ERR("ERROR executing: putScom (0x5012c46ull)");
-                break;
+                l_rc = fapi2::putScom(TGT0, 0x5012c15ull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x5012c15ull)");
+                    break;
+                }
             }
         }
 
+        fapi2::ATTR_PROC_FABRIC_PUMP_MODE_Type l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE;
+        l_rc = FAPI_ATTR_GET(fapi2::ATTR_PROC_FABRIC_PUMP_MODE, TGT1, l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE);
+
+        if (l_rc)
         {
-            l_rc = fapi2::getScom( TGT0, 0x5012c47ull, l_scom_buffer );
+            FAPI_ERR("ERROR executing: FAPI_ATTR_GET (ATTR_PROC_FABRIC_PUMP_MODE)");
+            break;
+        }
 
-            if (l_rc)
+        {
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                FAPI_ERR("ERROR executing: getScom (0x5012c47ull)");
-                break;
-            }
+                l_rc = fapi2::getScom( TGT0, 0x5012c15ull, l_scom_buffer );
 
-            {
-                l_scom_buffer.insert<uint64_t> (literal_0x910000040B00, 0, 48, 16 );
-            }
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x5012c15ull)");
+                    break;
+                }
+
+                {
+                    if ((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_NODE))
+                    {
+                        constexpr auto l_NMMU_MM_FBC_CQ_WRAP_NXCQ_SCOM_CFG_PUMP_MODE_ON = 0x1;
+                        l_scom_buffer.insert<uint64_t> (l_NMMU_MM_FBC_CQ_WRAP_NXCQ_SCOM_CFG_PUMP_MODE_ON, 39, 1, 63 );
+                    }
+                    else if ((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP))
+                    {
+                        constexpr auto l_NMMU_MM_FBC_CQ_WRAP_NXCQ_SCOM_CFG_PUMP_MODE_OFF = 0x0;
+                        l_scom_buffer.insert<uint64_t> (l_NMMU_MM_FBC_CQ_WRAP_NXCQ_SCOM_CFG_PUMP_MODE_OFF, 39, 1, 63 );
+                    }
+                }
 
-            l_rc = fapi2::putScom(TGT0, 0x5012c47ull, l_scom_buffer);
+                l_rc = fapi2::putScom(TGT0, 0x5012c15ull, l_scom_buffer);
 
-            if (l_rc)
-            {
-                FAPI_ERR("ERROR executing: putScom (0x5012c47ull)");
-                break;
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x5012c15ull)");
+                    break;
+                }
             }
         }
 
         {
-            l_rc = fapi2::getScom( TGT0, 0x5012c52ull, l_scom_buffer );
-
-            if (l_rc)
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                FAPI_ERR("ERROR executing: getScom (0x5012c52ull)");
-                break;
-            }
+                l_rc = fapi2::getScom( TGT0, 0x5012c46ull, l_scom_buffer );
 
-            {
-                constexpr auto l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV = 0x70;
-                l_scom_buffer.insert<uint64_t> (l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV, 20, 1, 57 );
-                l_scom_buffer.insert<uint64_t> (l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV, 24, 1, 62 );
-                l_scom_buffer.insert<uint64_t> (l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV, 26, 1, 63 );
-            }
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x5012c46ull)");
+                    break;
+                }
 
-            {
-                l_scom_buffer.insert<uint64_t> (literal_0b11111, 30, 1, 59 );
-                l_scom_buffer.insert<uint64_t> (literal_0b11111, 60, 4, 60 );
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x000000000000, 0, 48, 16 );
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x5012c46ull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x5012c46ull)");
+                    break;
+                }
             }
+        }
 
+        {
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x00E, 0, 12, 52 );
-            }
+                l_rc = fapi2::getScom( TGT0, 0x5012c47ull, l_scom_buffer );
 
-            l_rc = fapi2::putScom(TGT0, 0x5012c52ull, l_scom_buffer);
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x5012c47ull)");
+                    break;
+                }
 
-            if (l_rc)
-            {
-                FAPI_ERR("ERROR executing: putScom (0x5012c52ull)");
-                break;
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x910000040B00, 0, 48, 16 );
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x5012c47ull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x5012c47ull)");
+                    break;
+                }
             }
         }
 
         {
-            l_rc = fapi2::getScom( TGT0, 0x5012c53ull, l_scom_buffer );
-
-            if (l_rc)
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                FAPI_ERR("ERROR executing: getScom (0x5012c53ull)");
-                break;
-            }
+                l_rc = fapi2::getScom( TGT0, 0x5012c43ull, l_scom_buffer );
 
-            {
-                constexpr auto l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV = 0x70;
-                l_scom_buffer.insert<uint64_t> (l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV, 2, 2, 60 );
-            }
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x5012c43ull)");
+                    break;
+                }
 
-            {
-                l_scom_buffer.insert<uint64_t> (literal_0x0258, 32, 16, 48 );
-            }
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x0000FAF800FF, 0, 48, 16 );
+                }
 
-            l_rc = fapi2::putScom(TGT0, 0x5012c53ull, l_scom_buffer);
+                l_rc = fapi2::putScom(TGT0, 0x5012c43ull, l_scom_buffer);
 
-            if (l_rc)
-            {
-                FAPI_ERR("ERROR executing: putScom (0x5012c53ull)");
-                break;
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x5012c43ull)");
+                    break;
+                }
             }
         }
 
         {
-            l_rc = fapi2::getScom( TGT0, 0x5012c54ull, l_scom_buffer );
-
-            if (l_rc)
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                FAPI_ERR("ERROR executing: getScom (0x5012c54ull)");
-                break;
-            }
+                l_rc = fapi2::getScom( TGT0, 0x5012c06ull, l_scom_buffer );
 
-            {
-                constexpr auto l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV = 0x70;
-                l_scom_buffer.insert<uint64_t> (l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV, 16, 1, 58 );
-            }
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x5012c06ull)");
+                    break;
+                }
 
-            l_rc = fapi2::putScom(TGT0, 0x5012c54ull, l_scom_buffer);
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x0000000000000000, 0, 22, 0 );
+                }
 
-            if (l_rc)
-            {
-                FAPI_ERR("ERROR executing: putScom (0x5012c54ull)");
-                break;
+                l_rc = fapi2::putScom(TGT0, 0x5012c06ull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x5012c06ull)");
+                    break;
+                }
             }
         }
 
         {
-            l_rc = fapi2::getScom( TGT0, 0x5012c55ull, l_scom_buffer );
-
-            if (l_rc)
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                FAPI_ERR("ERROR executing: getScom (0x5012c55ull)");
-                break;
-            }
+                l_rc = fapi2::getScom( TGT0, 0x5012c07ull, l_scom_buffer );
 
-            {
-                constexpr auto l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV = 0x70;
-                l_scom_buffer.insert<uint64_t> (l_NMMU_MM_PIPE_THREAD_MODE_SINGLE_THREAD_MODE_ST_INV, 16, 1, 59 );
-            }
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x5012c07ull)");
+                    break;
+                }
 
-            {
-                constexpr auto l_NMMU_MM_CFG_NMMU_CTL_TLB_HASH_PID_DIS_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_NMMU_MM_CFG_NMMU_CTL_TLB_HASH_PID_DIS_ON, 21, 1, 63 );
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x409B000000000000, 0, 22, 0 );
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x5012c07ull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x5012c07ull)");
+                    break;
+                }
             }
+        }
 
+        {
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                constexpr auto l_NMMU_MM_CFG_NMMU_CTL_TLB_ISS543B_FIX_EN_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_NMMU_MM_CFG_NMMU_CTL_TLB_ISS543B_FIX_EN_ON, 53, 1, 63 );
-            }
+                l_rc = fapi2::getScom( TGT0, 0x5012c03ull, l_scom_buffer );
 
-            l_rc = fapi2::putScom(TGT0, 0x5012c55ull, l_scom_buffer);
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x5012c03ull)");
+                    break;
+                }
 
-            if (l_rc)
-            {
-                FAPI_ERR("ERROR executing: putScom (0x5012c55ull)");
-                break;
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x04047C0000000000, 0, 22, 0 );
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x5012c03ull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x5012c03ull)");
+                    break;
+                }
             }
         }
+
     }
-    while (0);
+    while(0);
 
     return l_rc;
 }
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C
index edb49b29..e6269d54 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C
@@ -41,7 +41,6 @@ fapi2::ReturnCode p9_ncu_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0,
 
     do
     {
-        fapi2::buffer<uint64_t> l_scom_buffer;
         fapi2::ATTR_PROC_FABRIC_ADDR_BAR_MODE_Type l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE;
         l_rc = FAPI_ATTR_GET(fapi2::ATTR_PROC_FABRIC_ADDR_BAR_MODE, TGT1, l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE);
 
@@ -52,79 +51,191 @@ fapi2::ReturnCode p9_ncu_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0,
         }
 
         {
-            l_rc = fapi2::getScom( TGT0, 0x1001100aull, l_scom_buffer );
-
-            if (l_rc)
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                FAPI_ERR("ERROR executing: getScom (0x1001100aull)");
-                break;
-            }
+                l_rc = fapi2::getScom( TGT0, 0x1001100aull, l_scom_buffer );
 
-            {
-                if ((l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_ADDR_BAR_MODE_SMALL_SYSTEM))
+                if (l_rc)
                 {
-                    constexpr auto l_EXP_NC_NCMISC_NCSCOMS_SYSMAP_SM_NOT_LG_SEL_ON = 0x1;
-                    l_scom_buffer.insert<uint64_t> (l_EXP_NC_NCMISC_NCSCOMS_SYSMAP_SM_NOT_LG_SEL_ON, 9, 1, 63 );
+                    FAPI_ERR("ERROR executing: getScom (0x1001100aull)");
+                    break;
                 }
-                else if ((l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_ADDR_BAR_MODE_LARGE_SYSTEM))
+
                 {
-                    constexpr auto l_EXP_NC_NCMISC_NCSCOMS_SYSMAP_SM_NOT_LG_SEL_OFF = 0x0;
-                    l_scom_buffer.insert<uint64_t> (l_EXP_NC_NCMISC_NCSCOMS_SYSMAP_SM_NOT_LG_SEL_OFF, 9, 1, 63 );
+                    if ((l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_ADDR_BAR_MODE_SMALL_SYSTEM))
+                    {
+                        constexpr auto l_EXP_NC_NCMISC_NCSCOMS_SYSMAP_SM_NOT_LG_SEL_ON = 0x1;
+                        l_scom_buffer.insert<uint64_t> (l_EXP_NC_NCMISC_NCSCOMS_SYSMAP_SM_NOT_LG_SEL_ON, 9, 1, 63 );
+                    }
+                    else if ((l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_ADDR_BAR_MODE_LARGE_SYSTEM))
+                    {
+                        constexpr auto l_EXP_NC_NCMISC_NCSCOMS_SYSMAP_SM_NOT_LG_SEL_OFF = 0x0;
+                        l_scom_buffer.insert<uint64_t> (l_EXP_NC_NCMISC_NCSCOMS_SYSMAP_SM_NOT_LG_SEL_OFF, 9, 1, 63 );
+                    }
                 }
-            }
 
-            l_rc = fapi2::putScom(TGT0, 0x1001100aull, l_scom_buffer);
+                l_rc = fapi2::putScom(TGT0, 0x1001100aull, l_scom_buffer);
 
-            if (l_rc)
-            {
-                FAPI_ERR("ERROR executing: putScom (0x1001100aull)");
-                break;
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x1001100aull)");
+                    break;
+                }
             }
         }
 
         {
-            l_rc = fapi2::getScom( TGT0, 0x1001100bull, l_scom_buffer );
-
-            if (l_rc)
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                FAPI_ERR("ERROR executing: getScom (0x1001100bull)");
-                break;
-            }
+                l_rc = fapi2::getScom( TGT0, 0x1001100bull, l_scom_buffer );
 
-            {
-                l_scom_buffer.insert<uint64_t> (literal_0b0001, 0, 4, 60 );
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x1001100bull)");
+                    break;
+                }
+
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0001, 0, 4, 60 );
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x1001100bull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x1001100bull)");
+                    break;
+                }
             }
+        }
 
+        {
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0100, 4, 4, 60 );
+                l_rc = fapi2::getScom( TGT0, 0x1001100bull, l_scom_buffer );
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x1001100bull)");
+                    break;
+                }
+
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0100, 4, 4, 60 );
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x1001100bull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x1001100bull)");
+                    break;
+                }
             }
+        }
 
+        {
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x8, 8, 10, 54 );
+                l_rc = fapi2::getScom( TGT0, 0x1001100bull, l_scom_buffer );
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x1001100bull)");
+                    break;
+                }
+
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x8, 8, 10, 54 );
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x1001100bull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x1001100bull)");
+                    break;
+                }
             }
+        }
 
+        {
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x10, 26, 10, 54 );
+                l_rc = fapi2::getScom( TGT0, 0x1001100bull, l_scom_buffer );
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x1001100bull)");
+                    break;
+                }
+
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x10, 26, 10, 54 );
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x1001100bull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x1001100bull)");
+                    break;
+                }
             }
+        }
 
+        {
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x8, 18, 4, 60 );
+                l_rc = fapi2::getScom( TGT0, 0x1001100bull, l_scom_buffer );
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x1001100bull)");
+                    break;
+                }
+
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x8, 18, 4, 60 );
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x1001100bull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x1001100bull)");
+                    break;
+                }
             }
+        }
 
+        {
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x8, 22, 4, 60 );
-            }
+                l_rc = fapi2::getScom( TGT0, 0x1001100bull, l_scom_buffer );
 
-            l_rc = fapi2::putScom(TGT0, 0x1001100bull, l_scom_buffer);
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x1001100bull)");
+                    break;
+                }
 
-            if (l_rc)
-            {
-                FAPI_ERR("ERROR executing: putScom (0x1001100bull)");
-                break;
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x8, 22, 4, 60 );
+                }
+
+                l_rc = fapi2::putScom(TGT0, 0x1001100bull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x1001100bull)");
+                    break;
+                }
             }
         }
+
     }
-    while (0);
+    while(0);
 
     return l_rc;
 }