Update xbus/obus procedures with the latest initCompiler changes

Change-Id: I81d11557d8ea6fe6bce1e0743e05df0fb559ece9
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/23825
Tested-by: Jenkins Server
Tested-by: Hostboot CI
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/23826
Tested-by: FSP CI Jenkins
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 2282 insertions, 621 deletions

diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_xbus_g0_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_xbus_g0_scom.C
index 1e373f710..648e04652 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_xbus_g0_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_xbus_g0_scom.C
@@ -28,13 +28,17 @@ constexpr auto literal_1 = 1;
 constexpr auto literal_0b0000 = 0b0000;
 constexpr auto literal_0b0110 = 0b0110;
 constexpr auto literal_0b00000 = 0b00000;
+constexpr auto literal_0b01111 = 0b01111;
 constexpr auto literal_0b01100 = 0b01100;
+constexpr auto literal_0b1011 = 0b1011;
 constexpr auto literal_0b0000000 = 0b0000000;
 constexpr auto literal_0b0000011 = 0b0000011;
 constexpr auto literal_0b000000 = 0b000000;
+constexpr auto literal_0b100111 = 0b100111;
 constexpr auto literal_0b1010 = 0b1010;
+constexpr auto literal_0b11 = 0b11;
+constexpr auto literal_0b0010000 = 0b0010000;
 constexpr auto literal_0b00001 = 0b00001;
-constexpr auto literal_0b1011 = 0b1011;
 constexpr auto literal_0b0010001 = 0b0010001;
 constexpr auto literal_0b0000000000000000 = 0b0000000000000000;
 constexpr auto literal_0b01111111 = 0b01111111;
@@ -69,15 +73,27 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
+            {
+                if (l_def_IS_HW)
+                {
+                    constexpr auto l_scom_buffer_OFF = 0x0;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    constexpr auto l_scom_buffer_ON = 0x1;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                }
+            }
+
             {
                 constexpr auto l_scom_buffer_OFF = 0x0;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
             }
-            else if (l_def_IS_SIM)
+
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 55, 1, 63 );
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000000006010c3full, l_scom_buffer);
@@ -97,15 +113,27 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
+            {
+                if (l_def_IS_HW)
+                {
+                    constexpr auto l_scom_buffer_OFF = 0x0;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    constexpr auto l_scom_buffer_ON = 0x1;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                }
+            }
+
             {
                 constexpr auto l_scom_buffer_OFF = 0x0;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
             }
-            else if (l_def_IS_SIM)
+
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 55, 1, 63 );
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000000106010c3full, l_scom_buffer);
@@ -125,15 +153,27 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
+            {
+                if (l_def_IS_HW)
+                {
+                    constexpr auto l_scom_buffer_OFF = 0x0;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    constexpr auto l_scom_buffer_ON = 0x1;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                }
+            }
+
             {
                 constexpr auto l_scom_buffer_OFF = 0x0;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
             }
-            else if (l_def_IS_SIM)
+
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 55, 1, 63 );
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000000206010c3full, l_scom_buffer);
@@ -153,15 +193,27 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
+            {
+                if (l_def_IS_HW)
+                {
+                    constexpr auto l_scom_buffer_OFF = 0x0;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    constexpr auto l_scom_buffer_ON = 0x1;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                }
+            }
+
             {
                 constexpr auto l_scom_buffer_OFF = 0x0;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
             }
-            else if (l_def_IS_SIM)
+
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 55, 1, 63 );
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000000306010c3full, l_scom_buffer);
@@ -181,15 +233,27 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
+            {
+                if (l_def_IS_HW)
+                {
+                    constexpr auto l_scom_buffer_OFF = 0x0;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    constexpr auto l_scom_buffer_ON = 0x1;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                }
+            }
+
             {
                 constexpr auto l_scom_buffer_OFF = 0x0;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
             }
-            else if (l_def_IS_SIM)
+
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 55, 1, 63 );
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000000406010c3full, l_scom_buffer);
@@ -209,15 +273,27 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
+            {
+                if (l_def_IS_HW)
+                {
+                    constexpr auto l_scom_buffer_OFF = 0x0;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    constexpr auto l_scom_buffer_ON = 0x1;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                }
+            }
+
             {
                 constexpr auto l_scom_buffer_OFF = 0x0;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
             }
-            else if (l_def_IS_SIM)
+
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 55, 1, 63 );
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000000506010c3full, l_scom_buffer);
@@ -237,15 +313,27 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
+            {
+                if (l_def_IS_HW)
+                {
+                    constexpr auto l_scom_buffer_OFF = 0x0;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    constexpr auto l_scom_buffer_ON = 0x1;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                }
+            }
+
             {
                 constexpr auto l_scom_buffer_OFF = 0x0;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
             }
-            else if (l_def_IS_SIM)
+
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 55, 1, 63 );
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000000606010c3full, l_scom_buffer);
@@ -265,15 +353,27 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
+            {
+                if (l_def_IS_HW)
+                {
+                    constexpr auto l_scom_buffer_OFF = 0x0;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    constexpr auto l_scom_buffer_ON = 0x1;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                }
+            }
+
             {
                 constexpr auto l_scom_buffer_OFF = 0x0;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
             }
-            else if (l_def_IS_SIM)
+
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 55, 1, 63 );
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000000706010c3full, l_scom_buffer);
@@ -293,15 +393,27 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
+            {
+                if (l_def_IS_HW)
+                {
+                    constexpr auto l_scom_buffer_OFF = 0x0;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    constexpr auto l_scom_buffer_ON = 0x1;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                }
+            }
+
             {
                 constexpr auto l_scom_buffer_OFF = 0x0;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
             }
-            else if (l_def_IS_SIM)
+
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 55, 1, 63 );
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000000806010c3full, l_scom_buffer);
@@ -321,15 +433,27 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
+            {
+                if (l_def_IS_HW)
+                {
+                    constexpr auto l_scom_buffer_OFF = 0x0;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    constexpr auto l_scom_buffer_ON = 0x1;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                }
+            }
+
             {
                 constexpr auto l_scom_buffer_OFF = 0x0;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
             }
-            else if (l_def_IS_SIM)
+
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 55, 1, 63 );
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000000906010c3full, l_scom_buffer);
@@ -349,15 +473,27 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
+            {
+                if (l_def_IS_HW)
+                {
+                    constexpr auto l_scom_buffer_OFF = 0x0;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    constexpr auto l_scom_buffer_ON = 0x1;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                }
+            }
+
             {
                 constexpr auto l_scom_buffer_OFF = 0x0;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
             }
-            else if (l_def_IS_SIM)
+
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 55, 1, 63 );
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000000a06010c3full, l_scom_buffer);
@@ -377,15 +513,27 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
+            {
+                if (l_def_IS_HW)
+                {
+                    constexpr auto l_scom_buffer_OFF = 0x0;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    constexpr auto l_scom_buffer_ON = 0x1;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                }
+            }
+
             {
                 constexpr auto l_scom_buffer_OFF = 0x0;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
             }
-            else if (l_def_IS_SIM)
+
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 55, 1, 63 );
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000000b06010c3full, l_scom_buffer);
@@ -405,15 +553,27 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
+            {
+                if (l_def_IS_HW)
+                {
+                    constexpr auto l_scom_buffer_OFF = 0x0;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    constexpr auto l_scom_buffer_ON = 0x1;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                }
+            }
+
             {
                 constexpr auto l_scom_buffer_OFF = 0x0;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
             }
-            else if (l_def_IS_SIM)
+
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 55, 1, 63 );
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000000c06010c3full, l_scom_buffer);
@@ -433,15 +593,27 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
+            {
+                if (l_def_IS_HW)
+                {
+                    constexpr auto l_scom_buffer_OFF = 0x0;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    constexpr auto l_scom_buffer_ON = 0x1;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                }
+            }
+
             {
                 constexpr auto l_scom_buffer_OFF = 0x0;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
             }
-            else if (l_def_IS_SIM)
+
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 55, 1, 63 );
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000000d06010c3full, l_scom_buffer);
@@ -461,15 +633,27 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
+            {
+                if (l_def_IS_HW)
+                {
+                    constexpr auto l_scom_buffer_OFF = 0x0;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    constexpr auto l_scom_buffer_ON = 0x1;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                }
+            }
+
             {
                 constexpr auto l_scom_buffer_OFF = 0x0;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
             }
-            else if (l_def_IS_SIM)
+
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 55, 1, 63 );
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000000e06010c3full, l_scom_buffer);
@@ -489,15 +673,27 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
+            {
+                if (l_def_IS_HW)
+                {
+                    constexpr auto l_scom_buffer_OFF = 0x0;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    constexpr auto l_scom_buffer_ON = 0x1;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                }
+            }
+
             {
                 constexpr auto l_scom_buffer_OFF = 0x0;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
             }
-            else if (l_def_IS_SIM)
+
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 55, 1, 63 );
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000000f06010c3full, l_scom_buffer);
@@ -517,15 +713,27 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
+            {
+                if (l_def_IS_HW)
+                {
+                    constexpr auto l_scom_buffer_OFF = 0x0;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    constexpr auto l_scom_buffer_ON = 0x1;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                }
+            }
+
             {
                 constexpr auto l_scom_buffer_OFF = 0x0;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
             }
-            else if (l_def_IS_SIM)
+
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 55, 1, 63 );
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000001006010c3full, l_scom_buffer);
@@ -545,15 +753,27 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
+            {
+                if (l_def_IS_HW)
+                {
+                    constexpr auto l_scom_buffer_OFF = 0x0;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    constexpr auto l_scom_buffer_ON = 0x1;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                }
+            }
+
             {
                 constexpr auto l_scom_buffer_OFF = 0x0;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 53, 1, 63 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
             }
-            else if (l_def_IS_SIM)
+
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 53, 1, 63 );
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 55, 1, 63 );
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000001106010c3full, l_scom_buffer);
@@ -573,8 +793,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8000080006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -592,8 +815,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8000080106010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -611,8 +837,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8000080206010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -630,8 +859,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8000080306010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -649,8 +881,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8000080406010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -668,8 +903,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8000080506010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -687,8 +925,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8000080606010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -706,8 +947,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8000080706010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -725,8 +969,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8000080806010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -744,8 +991,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8000080906010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -763,8 +1013,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8000080a06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -782,8 +1035,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8000080b06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -801,8 +1057,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8000080c06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -820,8 +1079,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8000080d06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -839,8 +1101,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8000080e06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -858,8 +1123,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8000080f06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -877,8 +1145,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 54, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8000081006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -896,8 +1167,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ON = 0x1;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 54, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 54, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8000081106010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -915,13 +1189,37 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                }
             }
-            else if (l_def_IS_SIM)
+
+            {
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 52, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 52, 5, 59 );
+                }
+            }
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 57, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 57, 5, 59 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000280006010c3full, l_scom_buffer);
@@ -941,13 +1239,37 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 52, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 52, 5, 59 );
+                }
+            }
+
+            {
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 57, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 57, 5, 59 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000280106010c3full, l_scom_buffer);
@@ -967,13 +1289,37 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                }
+            }
+
+            {
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 52, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 52, 5, 59 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 57, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 57, 5, 59 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000280206010c3full, l_scom_buffer);
@@ -993,13 +1339,37 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                }
             }
-            else if (l_def_IS_SIM)
+
+            {
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 52, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 52, 5, 59 );
+                }
+            }
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 57, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 57, 5, 59 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000280306010c3full, l_scom_buffer);
@@ -1019,13 +1389,37 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                }
+            }
+
+            {
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 52, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 52, 5, 59 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 57, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 57, 5, 59 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000280406010c3full, l_scom_buffer);
@@ -1045,13 +1439,37 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 52, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 52, 5, 59 );
+                }
+            }
+
+            {
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 57, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 57, 5, 59 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000280506010c3full, l_scom_buffer);
@@ -1071,13 +1489,37 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 52, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 52, 5, 59 );
+                }
+            }
+
+            {
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 57, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 57, 5, 59 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000280606010c3full, l_scom_buffer);
@@ -1097,13 +1539,37 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 52, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 52, 5, 59 );
+                }
+            }
+
+            {
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 57, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 57, 5, 59 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000280706010c3full, l_scom_buffer);
@@ -1123,13 +1589,37 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                }
+            }
+
+            {
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 52, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 52, 5, 59 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 57, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 57, 5, 59 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000280806010c3full, l_scom_buffer);
@@ -1149,13 +1639,37 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                }
+            }
+
+            {
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 52, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 52, 5, 59 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 57, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 57, 5, 59 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000280906010c3full, l_scom_buffer);
@@ -1175,13 +1689,37 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                }
+            }
+
+            {
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 52, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 52, 5, 59 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 57, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 57, 5, 59 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000280a06010c3full, l_scom_buffer);
@@ -1201,13 +1739,37 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 52, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 52, 5, 59 );
+                }
+            }
+
+            {
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 57, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 57, 5, 59 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000280b06010c3full, l_scom_buffer);
@@ -1227,13 +1789,37 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 52, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 52, 5, 59 );
+                }
+            }
+
+            {
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 57, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 57, 5, 59 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000280c06010c3full, l_scom_buffer);
@@ -1253,13 +1839,37 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                }
+            }
+
+            {
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 52, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 52, 5, 59 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 57, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 57, 5, 59 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000280d06010c3full, l_scom_buffer);
@@ -1279,13 +1889,37 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                }
             }
-            else if (l_def_IS_SIM)
+
+            {
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 52, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 52, 5, 59 );
+                }
+            }
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 57, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 57, 5, 59 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000280e06010c3full, l_scom_buffer);
@@ -1305,13 +1939,37 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                }
+            }
+
+            {
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 52, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 52, 5, 59 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 57, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 57, 5, 59 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000280f06010c3full, l_scom_buffer);
@@ -1331,13 +1989,37 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                }
+            }
+
+            {
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 52, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 52, 5, 59 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 57, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 57, 5, 59 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000281006010c3full, l_scom_buffer);
@@ -1357,13 +2039,37 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 48, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                }
             }
-            else if (l_def_IS_SIM)
+
+            {
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 52, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 52, 5, 59 );
+                }
+            }
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0110, 48, 4, 60 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 57, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01111, 57, 5, 59 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000281106010c3full, l_scom_buffer);
@@ -1383,13 +2089,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 53, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b1011, 53, 4, 60 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000300006010c3full, l_scom_buffer);
@@ -1409,13 +2128,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 53, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b1011, 53, 4, 60 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000300106010c3full, l_scom_buffer);
@@ -1435,13 +2167,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 53, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b1011, 53, 4, 60 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000300206010c3full, l_scom_buffer);
@@ -1461,13 +2206,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 53, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b1011, 53, 4, 60 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000300306010c3full, l_scom_buffer);
@@ -1487,13 +2245,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 53, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b1011, 53, 4, 60 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000300406010c3full, l_scom_buffer);
@@ -1513,13 +2284,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 53, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b1011, 53, 4, 60 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000300506010c3full, l_scom_buffer);
@@ -1539,13 +2323,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 53, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b1011, 53, 4, 60 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000300606010c3full, l_scom_buffer);
@@ -1565,13 +2362,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 53, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b1011, 53, 4, 60 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000300706010c3full, l_scom_buffer);
@@ -1591,13 +2401,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 53, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b1011, 53, 4, 60 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000300806010c3full, l_scom_buffer);
@@ -1617,13 +2440,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 53, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b1011, 53, 4, 60 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000300906010c3full, l_scom_buffer);
@@ -1643,13 +2479,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 53, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b1011, 53, 4, 60 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000300a06010c3full, l_scom_buffer);
@@ -1669,13 +2518,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 53, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b1011, 53, 4, 60 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000300b06010c3full, l_scom_buffer);
@@ -1695,13 +2557,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 53, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b1011, 53, 4, 60 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000300c06010c3full, l_scom_buffer);
@@ -1721,13 +2596,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 53, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b1011, 53, 4, 60 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000300d06010c3full, l_scom_buffer);
@@ -1747,13 +2635,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 53, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b1011, 53, 4, 60 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000300e06010c3full, l_scom_buffer);
@@ -1773,13 +2674,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 53, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b1011, 53, 4, 60 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000300f06010c3full, l_scom_buffer);
@@ -1799,13 +2713,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 53, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b1011, 53, 4, 60 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000301006010c3full, l_scom_buffer);
@@ -1825,13 +2752,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00000, 48, 5, 59 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b01100, 48, 5, 59 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000, 53, 4, 60 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b1011, 53, 4, 60 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000301106010c3full, l_scom_buffer);
@@ -1851,13 +2791,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b000000, 55, 6, 58 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b100111, 55, 6, 58 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000c00006010c3full, l_scom_buffer);
@@ -1877,13 +2830,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b000000, 55, 6, 58 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b100111, 55, 6, 58 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000c00106010c3full, l_scom_buffer);
@@ -1903,13 +2869,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b000000, 55, 6, 58 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b100111, 55, 6, 58 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000c00206010c3full, l_scom_buffer);
@@ -1929,13 +2908,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b000000, 55, 6, 58 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b100111, 55, 6, 58 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000c00306010c3full, l_scom_buffer);
@@ -1955,13 +2947,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b000000, 55, 6, 58 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b100111, 55, 6, 58 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000c00406010c3full, l_scom_buffer);
@@ -1981,13 +2986,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b000000, 55, 6, 58 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b100111, 55, 6, 58 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000c00506010c3full, l_scom_buffer);
@@ -2007,13 +3025,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b000000, 55, 6, 58 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b100111, 55, 6, 58 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000c00606010c3full, l_scom_buffer);
@@ -2033,13 +3064,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b000000, 55, 6, 58 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b100111, 55, 6, 58 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000c00706010c3full, l_scom_buffer);
@@ -2059,13 +3103,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b000000, 55, 6, 58 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b100111, 55, 6, 58 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000c00806010c3full, l_scom_buffer);
@@ -2085,13 +3142,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b000000, 55, 6, 58 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b100111, 55, 6, 58 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000c00906010c3full, l_scom_buffer);
@@ -2111,13 +3181,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b000000, 55, 6, 58 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b100111, 55, 6, 58 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000c00a06010c3full, l_scom_buffer);
@@ -2137,13 +3220,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b000000, 55, 6, 58 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b100111, 55, 6, 58 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000c00b06010c3full, l_scom_buffer);
@@ -2163,13 +3259,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b000000, 55, 6, 58 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b100111, 55, 6, 58 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000c00c06010c3full, l_scom_buffer);
@@ -2189,13 +3298,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b000000, 55, 6, 58 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b100111, 55, 6, 58 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000c00d06010c3full, l_scom_buffer);
@@ -2215,13 +3337,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b000000, 55, 6, 58 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b100111, 55, 6, 58 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000c00e06010c3full, l_scom_buffer);
@@ -2241,13 +3376,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b000000, 55, 6, 58 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b100111, 55, 6, 58 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000c00f06010c3full, l_scom_buffer);
@@ -2267,13 +3415,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b000000, 55, 6, 58 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b100111, 55, 6, 58 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000c01006010c3full, l_scom_buffer);
@@ -2293,13 +3454,26 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000000, 48, 7, 57 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                }
             }
-            else if (l_def_IS_SIM)
+
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b0000011, 48, 7, 57 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b000000, 55, 6, 58 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b100111, 55, 6, 58 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000c01106010c3full, l_scom_buffer);
@@ -2319,8 +3493,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002200006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2338,8 +3515,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002200106010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2357,8 +3537,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002200206010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2376,8 +3559,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002200306010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2395,8 +3581,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002200406010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2414,8 +3603,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002200506010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2433,8 +3625,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002200606010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2452,8 +3647,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002200706010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2471,8 +3669,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002200806010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2490,8 +3691,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002200906010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2509,8 +3713,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002200a06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2528,8 +3735,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002200b06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2547,8 +3757,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002200c06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2566,8 +3779,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002200d06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2585,8 +3801,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002200e06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2604,8 +3823,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002200f06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2623,8 +3845,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002201006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2642,8 +3867,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ON = 0x1;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002201106010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2661,8 +3889,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_A_0_15 = 0x1000;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_A_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_A_0_15 = 0x1000;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_A_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c00006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2680,8 +3911,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_B_0_15 = 0xf03e;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_B_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_B_0_15 = 0xf03e;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_B_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c00106010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2699,8 +3933,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_C_0_15 = 0x7bc;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_C_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_C_0_15 = 0x7bc;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_C_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c00206010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2718,8 +3955,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_D_0_15 = 0x7c7;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_D_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_D_0_15 = 0x7c7;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_D_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c00306010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2737,8 +3977,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_E_0_15 = 0x3ef;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_E_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_E_0_15 = 0x3ef;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_E_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c00406010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2756,8 +3999,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_F_0_15 = 0x1f0f;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_F_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_F_0_15 = 0x1f0f;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_F_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c00506010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2775,8 +4021,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_G_0_15 = 0x1800;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_G_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_G_0_15 = 0x1800;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_G_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c00606010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2794,8 +4043,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_H_0_15 = 0x9c00;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_H_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_H_0_15 = 0x9c00;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_H_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c00706010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2813,8 +4065,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_A_0_15 = 0x1000;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_A_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_A_0_15 = 0x1000;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_A_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c00806010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2832,8 +4087,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_H_0_15 = 0x9c00;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_H_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_H_0_15 = 0x9c00;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_H_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c00906010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2851,8 +4109,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_G_0_15 = 0x1800;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_G_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_G_0_15 = 0x1800;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_G_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c00a06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2870,8 +4131,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_F_0_15 = 0x1f0f;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_F_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_F_0_15 = 0x1f0f;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_F_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c00b06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2889,8 +4153,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_E_0_15 = 0x3ef;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_E_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_E_0_15 = 0x3ef;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_E_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c00c06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2908,8 +4175,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_D_0_15 = 0x7c7;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_D_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_D_0_15 = 0x7c7;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_D_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c00d06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2927,8 +4197,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_C_0_15 = 0x7bc;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_C_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_C_0_15 = 0x7bc;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_C_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c00e06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2946,8 +4219,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_B_0_15 = 0xf03e;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_B_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_B_0_15 = 0xf03e;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_B_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c00f06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2965,8 +4241,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_A_0_15 = 0x1000;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_A_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_A_0_15 = 0x1000;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_A_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c01006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -2984,8 +4263,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_A_16_22 = 0x42;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_A_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_A_16_22 = 0x42;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_A_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c80006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3003,8 +4285,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_B_16_22 = 0x3e;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_B_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_B_16_22 = 0x3e;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_B_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c80106010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3022,8 +4307,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_C_12_ACGH_16_22 = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_C_12_ACGH_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_C_12_ACGH_16_22 = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_C_12_ACGH_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c80206010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3041,8 +4329,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_D_16_22 = 0x60;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_D_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_D_16_22 = 0x60;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_D_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c80306010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3060,8 +4351,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_EF_16_22 = 0x40;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_EF_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_EF_16_22 = 0x40;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_EF_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c80406010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3079,8 +4373,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_EF_16_22 = 0x40;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_EF_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_EF_16_22 = 0x40;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_EF_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c80506010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3098,8 +4395,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_GH_16_22 = 0x3;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_GH_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_GH_16_22 = 0x3;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_GH_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c80606010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3117,8 +4417,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_GH_16_22 = 0x3;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_GH_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_GH_16_22 = 0x3;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_GH_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c80706010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3136,8 +4439,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_A_16_22 = 0x42;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_A_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_A_16_22 = 0x42;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_A_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c80806010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3155,8 +4461,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_GH_16_22 = 0x3;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_GH_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_GH_16_22 = 0x3;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_GH_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c80906010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3174,8 +4483,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_GH_16_22 = 0x3;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_GH_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_GH_16_22 = 0x3;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_GH_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c80a06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3193,8 +4505,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_EF_16_22 = 0x40;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_EF_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_EF_16_22 = 0x40;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_EF_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c80b06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3212,8 +4527,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_EF_16_22 = 0x40;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_EF_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_EF_16_22 = 0x40;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_EF_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c80c06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3231,8 +4549,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_D_16_22 = 0x60;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_D_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_D_16_22 = 0x60;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_D_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c80d06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3250,8 +4571,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_C_12_ACGH_16_22 = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_C_12_ACGH_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_C_12_ACGH_16_22 = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_C_12_ACGH_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c80e06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3269,8 +4593,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_B_16_22 = 0x3e;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_B_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_B_16_22 = 0x3e;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_B_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c80f06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3288,8 +4615,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_24_A_16_22 = 0x42;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_A_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_24_A_16_22 = 0x42;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_24_A_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8002c81006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3307,8 +4637,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ENABLED = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ENABLED = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004040006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3326,8 +4659,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ENABLED = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ENABLED = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004040106010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3345,8 +4681,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ENABLED = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ENABLED = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004040206010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3364,8 +4703,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ENABLED = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ENABLED = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004040306010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3383,8 +4725,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ENABLED = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ENABLED = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004040406010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3402,8 +4747,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ENABLED = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ENABLED = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004040506010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3421,8 +4769,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ENABLED = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ENABLED = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004040606010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3440,8 +4791,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ENABLED = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ENABLED = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004040706010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3459,8 +4813,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ENABLED = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ENABLED = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004040806010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3478,8 +4835,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ENABLED = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ENABLED = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004040906010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3497,8 +4857,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ENABLED = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ENABLED = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004040a06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3516,8 +4879,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ENABLED = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ENABLED = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004040b06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3535,8 +4901,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ENABLED = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ENABLED = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004040c06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3554,8 +4923,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ENABLED = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ENABLED = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004040d06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3573,8 +4945,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ENABLED = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ENABLED = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004040e06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3592,8 +4967,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ENABLED = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ENABLED = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004040f06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3611,8 +4989,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ENABLED = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ENABLED = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ENABLED, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004041006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3630,8 +5011,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ON = 0x1;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80040c0006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3649,8 +5033,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ON = 0x1;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80040c0106010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3668,8 +5055,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ON = 0x1;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80040c0206010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3687,8 +5077,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ON = 0x1;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80040c0306010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3706,8 +5099,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ON = 0x1;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80040c0406010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3725,8 +5121,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ON = 0x1;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80040c0506010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3744,8 +5143,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ON = 0x1;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80040c0606010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3763,8 +5165,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ON = 0x1;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80040c0706010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3782,8 +5187,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ON = 0x1;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80040c0806010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3801,8 +5209,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ON = 0x1;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80040c0906010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3820,8 +5231,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ON = 0x1;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80040c0a06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3839,8 +5253,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ON = 0x1;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80040c0b06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3858,8 +5275,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ON = 0x1;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80040c0c06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3877,8 +5297,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ON = 0x1;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80040c0d06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3896,8 +5319,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ON = 0x1;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80040c0e06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3915,8 +5341,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ON = 0x1;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80040c0f06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3934,8 +5363,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ON = 0x1;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80040c1006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3953,8 +5385,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_AB_HALF_A_0_15 = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_AB_HALF_A_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_AB_HALF_A_0_15 = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_AB_HALF_A_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80043c0006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3972,8 +5407,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_AB_HALF_A_0_15 = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_AB_HALF_A_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_AB_HALF_A_0_15 = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_AB_HALF_A_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80043c0106010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -3991,8 +5429,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_C_0_15 = 0x1e;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_C_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_C_0_15 = 0x1e;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_C_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80043c0206010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4010,8 +5451,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_D_0_15 = 0x1f;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_D_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_D_0_15 = 0x1f;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_D_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80043c0306010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4029,8 +5473,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_E_HALF_B_0_15 = 0xf;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_E_HALF_B_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_E_HALF_B_0_15 = 0xf;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_E_HALF_B_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80043c0406010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4048,8 +5495,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_F_0_15 = 0x7c;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_F_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_F_0_15 = 0x7c;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_F_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80043c0506010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4067,8 +5517,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_G_0_15 = 0xc63;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_G_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_G_0_15 = 0xc63;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_G_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80043c0606010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4086,8 +5539,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_H_0_15 = 0xe73;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_H_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_H_0_15 = 0xe73;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_H_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80043c0706010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4105,8 +5561,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_AB_HALF_A_0_15 = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_AB_HALF_A_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_AB_HALF_A_0_15 = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_AB_HALF_A_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80043c0806010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4124,8 +5583,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_H_0_15 = 0xe73;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_H_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_H_0_15 = 0xe73;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_H_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80043c0906010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4143,8 +5605,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_G_0_15 = 0xc63;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_G_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_G_0_15 = 0xc63;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_G_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80043c0a06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4162,8 +5627,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_F_0_15 = 0x7c;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_F_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_F_0_15 = 0x7c;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_F_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80043c0b06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4181,8 +5649,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_E_HALF_B_0_15 = 0xf;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_E_HALF_B_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_E_HALF_B_0_15 = 0xf;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_E_HALF_B_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80043c0c06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4200,8 +5671,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_D_0_15 = 0x1f;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_D_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_D_0_15 = 0x1f;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_D_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80043c0d06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4219,8 +5693,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_C_0_15 = 0x1e;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_C_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_C_0_15 = 0x1e;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_C_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80043c0e06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4238,8 +5715,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_AB_HALF_A_0_15 = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_AB_HALF_A_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_AB_HALF_A_0_15 = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_AB_HALF_A_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80043c0f06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4257,8 +5737,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_AB_HALF_A_0_15 = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_AB_HALF_A_0_15, 48, 16, 48 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_AB_HALF_A_0_15 = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_AB_HALF_A_0_15, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x80043c1006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4276,8 +5759,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_A_16_22 = 0x1;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_A_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_A_16_22 = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_A_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004440006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4295,8 +5781,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_B_16_22 = 0x7c;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_B_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_B_16_22 = 0x7c;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_B_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004440106010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4314,8 +5803,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_C_16_22 = 0x7b;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_C_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_C_16_22 = 0x7b;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_C_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004440206010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4333,8 +5825,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_DG_16_22 = 0xc;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_DG_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_DG_16_22 = 0xc;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_DG_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004440306010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4352,8 +5847,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_E_16_22 = 0x5e;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_E_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_E_16_22 = 0x5e;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_E_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004440406010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4371,8 +5869,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_F_HALF_A_16_22 = 0x10;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_F_HALF_A_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_F_HALF_A_16_22 = 0x10;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_F_HALF_A_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004440506010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4390,8 +5891,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_DG_16_22 = 0xc;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_DG_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_DG_16_22 = 0xc;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_DG_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004440606010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4409,8 +5913,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_H_HALF_B_16_22 = 0x4e;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_H_HALF_B_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_H_HALF_B_16_22 = 0x4e;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_H_HALF_B_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004440706010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4428,8 +5935,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_A_16_22 = 0x1;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_A_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_A_16_22 = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_A_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004440806010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4447,8 +5957,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_H_HALF_B_16_22 = 0x4e;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_H_HALF_B_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_H_HALF_B_16_22 = 0x4e;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_H_HALF_B_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004440906010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4466,8 +5979,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_DG_16_22 = 0xc;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_DG_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_DG_16_22 = 0xc;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_DG_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004440a06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4485,8 +6001,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_F_HALF_A_16_22 = 0x10;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_F_HALF_A_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_F_HALF_A_16_22 = 0x10;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_F_HALF_A_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004440b06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4504,8 +6023,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_E_16_22 = 0x5e;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_E_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_E_16_22 = 0x5e;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_E_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004440c06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4523,8 +6045,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_DG_16_22 = 0xc;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_DG_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_DG_16_22 = 0xc;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_DG_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004440d06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4542,8 +6067,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_C_16_22 = 0x7b;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_C_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_C_16_22 = 0x7b;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_C_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004440e06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4561,8 +6089,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_B_16_22 = 0x7c;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_B_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_B_16_22 = 0x7c;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_B_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004440f06010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4580,8 +6111,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_PATTERN_TX_A_16_22 = 0x1;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_A_16_22, 48, 7, 57 );
+            {
+                constexpr auto l_scom_buffer_PATTERN_TX_A_16_22 = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_PATTERN_TX_A_16_22, 48, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8004441006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4599,7 +6133,10 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            l_scom_buffer.insert<uint64_t> (literal_0b000000, 48, 6, 58 );
+            {
+                l_scom_buffer.insert<uint64_t> (literal_0b000000, 48, 6, 58 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8008080006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4617,8 +6154,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8008100006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4636,8 +6176,16 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_TAP5 = 0x5;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_TAP5, 51, 3, 61 );
+            {
+                constexpr auto l_scom_buffer_TAP5 = 0x5;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_TAP5, 51, 3, 61 );
+            }
+
+            {
+                constexpr auto l_scom_buffer_TAP1 = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_TAP1, 54, 2, 62 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8008300006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4655,7 +6203,10 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            l_scom_buffer.insert<uint64_t> (literal_0b1010, 60, 4, 60 );
+            {
+                l_scom_buffer.insert<uint64_t> (literal_0b1010, 60, 4, 60 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8008400006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4673,8 +6224,30 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 55, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 55, 1, 63 );
+            }
+
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 56, 1, 63 );
+            }
+
+            {
+                l_scom_buffer.insert<uint64_t> (literal_0b11, 57, 2, 62 );
+            }
+
+            {
+                constexpr auto l_scom_buffer_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 59, 1, 63 );
+            }
+
+            {
+                constexpr auto l_scom_buffer_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 60, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8008c00006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4692,7 +6265,14 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            l_scom_buffer.insert<uint64_t> (literal_0b0000000, 49, 7, 57 );
+            {
+                l_scom_buffer.insert<uint64_t> (literal_0b0000000, 49, 7, 57 );
+            }
+
+            {
+                l_scom_buffer.insert<uint64_t> (literal_0b0010000, 57, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8009800006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4720,10 +6300,22 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_is_master)
             {
-                constexpr auto l_scom_buffer_MASTER = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_MASTER, 48, 1, 63 );
+                if (l_def_is_master)
+                {
+                    constexpr auto l_scom_buffer_MASTER = 0x1;
+                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_MASTER, 48, 1, 63 );
+                }
+            }
+
+            {
+                constexpr auto l_scom_buffer_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 58, 1, 63 );
+            }
+
+            {
+                constexpr auto l_scom_buffer_FENCED = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_FENCED, 57, 1, 63 );
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8009900006010c3full, l_scom_buffer);
@@ -4743,7 +6335,10 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            l_scom_buffer.insert<uint64_t> (literal_0b00001, 48, 5, 59 );
+            {
+                l_scom_buffer.insert<uint64_t> (literal_0b00001, 48, 5, 59 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8009980006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4761,7 +6356,10 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            l_scom_buffer.insert<uint64_t> (literal_0b1011, 48, 4, 60 );
+            {
+                l_scom_buffer.insert<uint64_t> (literal_0b1011, 48, 4, 60 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8009a00006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4779,7 +6377,14 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            l_scom_buffer.insert<uint64_t> (literal_0b0010001, 48, 7, 57 );
+            {
+                l_scom_buffer.insert<uint64_t> (literal_0b0010001, 48, 7, 57 );
+            }
+
+            {
+                l_scom_buffer.insert<uint64_t> (literal_0b0010001, 55, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8009b80006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4797,7 +6402,10 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            l_scom_buffer.insert<uint64_t> (literal_0b0000000000000000, 48, 16, 48 );
+            {
+                l_scom_buffer.insert<uint64_t> (literal_0b0000000000000000, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8009e00006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4815,7 +6423,10 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            l_scom_buffer.insert<uint64_t> (literal_0b01111111, 48, 8, 56 );
+            {
+                l_scom_buffer.insert<uint64_t> (literal_0b01111111, 48, 8, 56 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x8009e80006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4833,8 +6444,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_ON = 0x1;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 50, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 50, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x800a800006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4852,8 +6466,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 60, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 60, 1, 63 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x800b800006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4871,13 +6488,15 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            if (l_def_IS_HW)
-            {
-                l_scom_buffer.insert<uint64_t> (literal_0b00, 56, 2, 62 );
-            }
-            else if (l_def_IS_SIM)
             {
-                l_scom_buffer.insert<uint64_t> (literal_0b01, 56, 2, 62 );
+                if (l_def_IS_HW)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b00, 56, 2, 62 );
+                }
+                else if (l_def_IS_SIM)
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0b01, 56, 2, 62 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x800c040006010c3full, l_scom_buffer);
@@ -4897,7 +6516,10 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            l_scom_buffer.insert<uint64_t> (literal_0b000000, 48, 6, 58 );
+            {
+                l_scom_buffer.insert<uint64_t> (literal_0b000000, 48, 6, 58 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x800c0c0006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4915,8 +6537,20 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_OFF = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            {
+                constexpr auto l_scom_buffer_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+            }
+
+            {
+                constexpr auto l_scom_buffer_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 59, 1, 63 );
+            }
+
+            {
+                l_scom_buffer.insert<uint64_t> (literal_0b00001, 53, 5, 59 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x800c140006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4934,7 +6568,10 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            l_scom_buffer.insert<uint64_t> (literal_0b0010001, 56, 7, 57 );
+            {
+                l_scom_buffer.insert<uint64_t> (literal_0b0010001, 56, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x800c1c0006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4952,8 +6589,11 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_DRV_0S = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_DRV_0S, 48, 2, 62 );
+            {
+                constexpr auto l_scom_buffer_DRV_0S = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_DRV_0S, 48, 2, 62 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x800c240006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4971,7 +6611,14 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            l_scom_buffer.insert<uint64_t> (literal_0b0000000, 49, 7, 57 );
+            {
+                l_scom_buffer.insert<uint64_t> (literal_0b0000000, 49, 7, 57 );
+            }
+
+            {
+                l_scom_buffer.insert<uint64_t> (literal_0b0010000, 57, 7, 57 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x800c840006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -4989,8 +6636,16 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            constexpr auto l_scom_buffer_TAP5 = 0x5;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_TAP5, 55, 3, 61 );
+            {
+                constexpr auto l_scom_buffer_TAP5 = 0x5;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_TAP5, 55, 3, 61 );
+            }
+
+            {
+                constexpr auto l_scom_buffer_TAP1 = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_TAP1, 58, 2, 62 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x800c8c0006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -5008,7 +6663,10 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            l_scom_buffer.insert<uint64_t> (literal_0b0000000000000000, 48, 16, 48 );
+            {
+                l_scom_buffer.insert<uint64_t> (literal_0b0000000000000000, 48, 16, 48 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x800cec0006010c3full, l_scom_buffer);
 
             if (l_rc)
@@ -5026,7 +6684,10 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&
                 break;
             }
 
-            l_scom_buffer.insert<uint64_t> (literal_0b01111111, 48, 8, 56 );
+            {
+                l_scom_buffer.insert<uint64_t> (literal_0b01111111, 48, 8, 56 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x800cf40006010c3full, l_scom_buffer);
 
             if (l_rc)