initCompiler: fix problems with multiple instances of same scom address

Change-Id: Ia4feaffc577654ac9c8d722cfd8be2f88c1cff32
Original-Change-Id: Ic5bcb120b3bafbd5d8dffbc5550812e12e5472c6
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/23644
Tested-by: Jenkins Server
Tested-by: Hostboot CI
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-by: SHELTON LEUNG <sleung@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/24189
Tested-by: FSP CI Jenkins
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

2 files changed, 264 insertions, 159 deletions

diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_ddrphy_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_ddrphy_scom.C
index 387934b95..1fbbf7669 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_ddrphy_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_ddrphy_scom.C
@@ -49,9 +49,11 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
                 break;
             }
 
-            if (( true ))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x0120, 48, 16, 48 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x0120, 48, 16, 48 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x800000030701103full, l_scom_buffer);
@@ -71,9 +73,11 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
                 break;
             }
 
-            if (( true ))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x6000, 49, 7, 49 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x6000, 49, 7, 49 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x800000740701103full, l_scom_buffer);
@@ -93,9 +97,11 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
                 break;
             }
 
-            if (( true ))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x4000, 48, 12, 48 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x4000, 48, 12, 48 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x800000750701103full, l_scom_buffer);
@@ -115,9 +121,11 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
                 break;
             }
 
-            if (( true ))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x7F7F, 48, 16, 48 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x7F7F, 48, 16, 48 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x800000780701103full, l_scom_buffer);
@@ -137,9 +145,11 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
                 break;
             }
 
-            if (( true ))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x0120, 48, 16, 48 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x0120, 48, 16, 48 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x800004030701103full, l_scom_buffer);
@@ -159,9 +169,11 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
                 break;
             }
 
-            if (( true ))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x6000, 49, 7, 49 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x6000, 49, 7, 49 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x800004740701103full, l_scom_buffer);
@@ -181,9 +193,11 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
                 break;
             }
 
-            if (( true ))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x4000, 48, 12, 48 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x4000, 48, 12, 48 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x800004750701103full, l_scom_buffer);
@@ -203,9 +217,11 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
                 break;
             }
 
-            if (( true ))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x7F7F, 48, 16, 48 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x7F7F, 48, 16, 48 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x800004780701103full, l_scom_buffer);
@@ -225,9 +241,11 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
                 break;
             }
 
-            if (( true ))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x0120, 48, 16, 48 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x0120, 48, 16, 48 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x800008030701103full, l_scom_buffer);
@@ -247,9 +265,11 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
                 break;
             }
 
-            if (( true ))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x6000, 49, 7, 49 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x6000, 49, 7, 49 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x800008740701103full, l_scom_buffer);
@@ -269,9 +289,11 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
                 break;
             }
 
-            if (( true ))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x4000, 48, 12, 48 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x4000, 48, 12, 48 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x800008750701103full, l_scom_buffer);
@@ -291,9 +313,11 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
                 break;
             }
 
-            if (( true ))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x7F7F, 48, 16, 48 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x7F7F, 48, 16, 48 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x800008780701103full, l_scom_buffer);
@@ -313,9 +337,11 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
                 break;
             }
 
-            if (( true ))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x0120, 48, 16, 48 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x0120, 48, 16, 48 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x80000c030701103full, l_scom_buffer);
@@ -335,9 +361,11 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
                 break;
             }
 
-            if (( true ))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x6000, 49, 7, 49 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x6000, 49, 7, 49 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x80000c740701103full, l_scom_buffer);
@@ -357,9 +385,11 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
                 break;
             }
 
-            if (( true ))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x4000, 48, 12, 48 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x4000, 48, 12, 48 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x80000c750701103full, l_scom_buffer);
@@ -379,9 +409,11 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
                 break;
             }
 
-            if (( true ))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x7F7F, 48, 16, 48 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x7F7F, 48, 16, 48 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x80000c780701103full, l_scom_buffer);
@@ -401,9 +433,11 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
                 break;
             }
 
-            if (( true ))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x0120, 48, 16, 48 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x0120, 48, 16, 48 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x800010030701103full, l_scom_buffer);
@@ -423,9 +457,11 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
                 break;
             }
 
-            if (( true ))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x6000, 49, 7, 49 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x6000, 49, 7, 49 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x800010740701103full, l_scom_buffer);
@@ -445,9 +481,11 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
                 break;
             }
 
-            if (( true ))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x4000, 48, 12, 48 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x4000, 48, 12, 48 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x800010750701103full, l_scom_buffer);
@@ -467,9 +505,11 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
                 break;
             }
 
-            if (( true ))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x7F7F, 48, 16, 48 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x7F7F, 48, 16, 48 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x800010780701103full, l_scom_buffer);
@@ -489,9 +529,11 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
                 break;
             }
 
-            if (( true ))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0xFFFF, 48, 16, 48 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0xFFFF, 48, 16, 48 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x800040000701103full, l_scom_buffer);
@@ -511,9 +553,11 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
                 break;
             }
 
-            if (( true ))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0xFFFF, 48, 16, 48 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0xFFFF, 48, 16, 48 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x800044000701103full, l_scom_buffer);
@@ -533,9 +577,11 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
                 break;
             }
 
-            if (( true ))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x5000, 48, 16, 48 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x5000, 48, 16, 48 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x800044010701103full, l_scom_buffer);
@@ -555,9 +601,11 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
                 break;
             }
 
-            if (( true ))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x4040, 48, 16, 48 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x4040, 48, 16, 48 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x800044050701103full, l_scom_buffer);
@@ -577,9 +625,11 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
                 break;
             }
 
-            if (( true ))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x4040, 48, 16, 48 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x4040, 48, 16, 48 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x800044070701103full, l_scom_buffer);
@@ -599,9 +649,11 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
                 break;
             }
 
-            if (( true ))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0xFFFF, 48, 16, 48 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0xFFFF, 48, 16, 48 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x800048000701103full, l_scom_buffer);
@@ -621,9 +673,11 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
                 break;
             }
 
-            if (( true ))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0xFFFF, 48, 16, 48 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0xFFFF, 48, 16, 48 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x80004c000701103full, l_scom_buffer);
@@ -643,9 +697,11 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
                 break;
             }
 
-            if (( true ))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0xE058, 48, 16, 48 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0xE058, 48, 16, 48 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x800080310701103full, l_scom_buffer);
@@ -665,9 +721,11 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
                 break;
             }
 
-            if (( true ))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x6000, 48, 16, 48 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x6000, 48, 16, 48 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x800080330701103full, l_scom_buffer);
@@ -687,9 +745,11 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
                 break;
             }
 
-            if (( true ))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0xE058, 48, 16, 48 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0xE058, 48, 16, 48 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x800084310701103full, l_scom_buffer);
@@ -709,9 +769,11 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
                 break;
             }
 
-            if (( true ))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x6000, 48, 16, 48 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x6000, 48, 16, 48 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x800084330701103full, l_scom_buffer);
@@ -731,9 +793,11 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
                 break;
             }
 
-            if (( true ))
             {
-                l_scom_buffer.insert<uint64_t> (literal_0x4770, 48, 16, 48 );
+                if (( true ))
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x4770, 48, 16, 48 );
+                }
             }
 
             l_rc = fapi2::putScom(TGT0, 0x8000c4140701103full, l_scom_buffer);
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_mca_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_mca_scom.C
index 7c85306b1..d33220aa8 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_mca_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_mca_scom.C
@@ -40,23 +40,26 @@ fapi2::ReturnCode p9_mca_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0)
                 break;
             }
 
-            constexpr auto l_scom_buffer_SC_DDR4_2400_16_16_16R = 0xa446a446739cc9a6;
-            constexpr auto l_scom_buffer_SC_DDR4_2400_16_16_16R_1 = 0xccc213a2946aa22b;
-            constexpr auto l_scom_buffer_SC_DDR4_2400_16_16_16R_2 = 0x1cc301184;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R, 0, 63, 0 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R, 0, 1, 63 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 1, 9, 0 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 16, 16, 9 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 41, 23, 25 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 38, 1, 48 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 36, 6, 49 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 30, 6, 55 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 24, 3, 61 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 27, 3, 25 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 0, 12, 28 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 43, 6, 40 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 12, 12, 46 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 49, 6, 58 );
+            {
+                constexpr auto l_scom_buffer_SC_DDR4_2400_16_16_16R = 0xa446a446739cc9a6;
+                constexpr auto l_scom_buffer_SC_DDR4_2400_16_16_16R_1 = 0xccc213a2946aa22b;
+                constexpr auto l_scom_buffer_SC_DDR4_2400_16_16_16R_2 = 0x1cc301184;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R, 0, 63, 0 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R, 0, 1, 63 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 1, 9, 0 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 16, 16, 9 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 41, 23, 25 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 38, 1, 48 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 36, 6, 49 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 30, 6, 55 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 24, 3, 61 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 27, 3, 25 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 0, 12, 28 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 43, 6, 40 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 12, 12, 46 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 49, 6, 58 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x701090aull, l_scom_buffer);
 
             if (l_rc)
@@ -74,23 +77,26 @@ fapi2::ReturnCode p9_mca_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0)
                 break;
             }
 
-            constexpr auto l_scom_buffer_SC_DDR4_2400_16_16_16R = 0xa446a446739cc9a6;
-            constexpr auto l_scom_buffer_SC_DDR4_2400_16_16_16R_1 = 0xccc213a2946aa22b;
-            constexpr auto l_scom_buffer_SC_DDR4_2400_16_16_16R_2 = 0x1cc301184;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R, 0, 63, 0 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R, 0, 1, 63 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 1, 9, 0 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 16, 16, 9 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 41, 23, 25 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 38, 1, 48 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 36, 6, 49 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 30, 6, 55 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 24, 3, 61 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 27, 3, 25 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 0, 12, 28 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 43, 6, 40 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 12, 12, 46 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 49, 6, 58 );
+            {
+                constexpr auto l_scom_buffer_SC_DDR4_2400_16_16_16R = 0xa446a446739cc9a6;
+                constexpr auto l_scom_buffer_SC_DDR4_2400_16_16_16R_1 = 0xccc213a2946aa22b;
+                constexpr auto l_scom_buffer_SC_DDR4_2400_16_16_16R_2 = 0x1cc301184;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R, 0, 63, 0 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R, 0, 1, 63 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 1, 9, 0 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 16, 16, 9 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 41, 23, 25 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 38, 1, 48 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 36, 6, 49 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 30, 6, 55 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 24, 3, 61 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 27, 3, 25 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 0, 12, 28 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 43, 6, 40 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 12, 12, 46 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 49, 6, 58 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x701090bull, l_scom_buffer);
 
             if (l_rc)
@@ -108,17 +114,40 @@ fapi2::ReturnCode p9_mca_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0)
                 break;
             }
 
-            constexpr auto l_scom_buffer_2400_8GB_X4 = 0x41a4240c64318560;
-            constexpr auto l_scom_buffer_2400_8GB_X4_1 = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 10, 6, 0 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 30, 20, 6 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 16, 5, 26 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 11, 5, 31 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 6, 5, 36 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 17, 10, 41 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 12, 5, 51 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 27, 8, 56 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4_1, 35, 3, 61 );
+            {
+                constexpr auto l_scom_buffer_2400_8GB_X4 = 0x41a4240c64318560;
+                constexpr auto l_scom_buffer_2400_8GB_X4_1 = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 10, 6, 0 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 30, 20, 6 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 16, 5, 26 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 11, 5, 31 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 6, 5, 36 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 17, 10, 41 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 12, 5, 51 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 27, 8, 56 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4_1, 35, 3, 61 );
+            }
+
+            {
+                constexpr auto l_scom_buffer_SC_DDR4_2400_16_16_16R = 0xa446a446739cc9a6;
+                constexpr auto l_scom_buffer_SC_DDR4_2400_16_16_16R_1 = 0xccc213a2946aa22b;
+                constexpr auto l_scom_buffer_SC_DDR4_2400_16_16_16R_2 = 0x1cc301184;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R, 0, 63, 0 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R, 0, 1, 63 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 1, 9, 0 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 16, 16, 9 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 41, 23, 25 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 38, 1, 48 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 36, 6, 49 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 30, 6, 55 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 24, 3, 61 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 27, 3, 25 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 0, 12, 28 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 43, 6, 40 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 12, 12, 46 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 49, 6, 58 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x701090cull, l_scom_buffer);
 
             if (l_rc)
@@ -136,23 +165,26 @@ fapi2::ReturnCode p9_mca_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0)
                 break;
             }
 
-            constexpr auto l_scom_buffer_SC_DDR4_2400_16_16_16R = 0xa446a446739cc9a6;
-            constexpr auto l_scom_buffer_SC_DDR4_2400_16_16_16R_1 = 0xccc213a2946aa22b;
-            constexpr auto l_scom_buffer_SC_DDR4_2400_16_16_16R_2 = 0x1cc301184;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R, 0, 63, 0 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R, 0, 1, 63 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 1, 9, 0 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 16, 16, 9 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 41, 23, 25 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 38, 1, 48 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 36, 6, 49 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 30, 6, 55 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 24, 3, 61 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 27, 3, 25 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 0, 12, 28 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 43, 6, 40 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 12, 12, 46 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 49, 6, 58 );
+            {
+                constexpr auto l_scom_buffer_SC_DDR4_2400_16_16_16R = 0xa446a446739cc9a6;
+                constexpr auto l_scom_buffer_SC_DDR4_2400_16_16_16R_1 = 0xccc213a2946aa22b;
+                constexpr auto l_scom_buffer_SC_DDR4_2400_16_16_16R_2 = 0x1cc301184;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R, 0, 63, 0 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R, 0, 1, 63 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 1, 9, 0 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 16, 16, 9 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 41, 23, 25 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 38, 1, 48 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 36, 6, 49 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 30, 6, 55 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_1, 24, 3, 61 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 27, 3, 25 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 0, 12, 28 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 43, 6, 40 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 12, 12, 46 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_SC_DDR4_2400_16_16_16R_2, 49, 6, 58 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x7010913ull, l_scom_buffer);
 
             if (l_rc)
@@ -170,17 +202,20 @@ fapi2::ReturnCode p9_mca_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0)
                 break;
             }
 
-            constexpr auto l_scom_buffer_2400_8GB_X4 = 0x41a4240c64318560;
-            constexpr auto l_scom_buffer_2400_8GB_X4_1 = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 10, 6, 0 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 30, 20, 6 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 16, 5, 26 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 11, 5, 31 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 6, 5, 36 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 17, 10, 41 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 12, 5, 51 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 27, 8, 56 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4_1, 35, 3, 61 );
+            {
+                constexpr auto l_scom_buffer_2400_8GB_X4 = 0x41a4240c64318560;
+                constexpr auto l_scom_buffer_2400_8GB_X4_1 = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 10, 6, 0 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 30, 20, 6 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 16, 5, 26 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 11, 5, 31 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 6, 5, 36 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 17, 10, 41 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 12, 5, 51 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 27, 8, 56 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4_1, 35, 3, 61 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x7010932ull, l_scom_buffer);
 
             if (l_rc)
@@ -198,17 +233,20 @@ fapi2::ReturnCode p9_mca_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0)
                 break;
             }
 
-            constexpr auto l_scom_buffer_2400_8GB_X4 = 0x41a4240c64318560;
-            constexpr auto l_scom_buffer_2400_8GB_X4_1 = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 10, 6, 0 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 30, 20, 6 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 16, 5, 26 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 11, 5, 31 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 6, 5, 36 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 17, 10, 41 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 12, 5, 51 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 27, 8, 56 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4_1, 35, 3, 61 );
+            {
+                constexpr auto l_scom_buffer_2400_8GB_X4 = 0x41a4240c64318560;
+                constexpr auto l_scom_buffer_2400_8GB_X4_1 = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 10, 6, 0 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 30, 20, 6 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 16, 5, 26 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 11, 5, 31 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 6, 5, 36 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 17, 10, 41 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 12, 5, 51 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 27, 8, 56 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4_1, 35, 3, 61 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x7010934ull, l_scom_buffer);
 
             if (l_rc)
@@ -226,17 +264,20 @@ fapi2::ReturnCode p9_mca_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0)
                 break;
             }
 
-            constexpr auto l_scom_buffer_2400_8GB_X4 = 0x41a4240c64318560;
-            constexpr auto l_scom_buffer_2400_8GB_X4_1 = 0x0;
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 10, 6, 0 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 30, 20, 6 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 16, 5, 26 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 11, 5, 31 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 6, 5, 36 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 17, 10, 41 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 12, 5, 51 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 27, 8, 56 );
-            l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4_1, 35, 3, 61 );
+            {
+                constexpr auto l_scom_buffer_2400_8GB_X4 = 0x41a4240c64318560;
+                constexpr auto l_scom_buffer_2400_8GB_X4_1 = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 10, 6, 0 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 30, 20, 6 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 16, 5, 26 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 11, 5, 31 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 6, 5, 36 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 17, 10, 41 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 12, 5, 51 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4, 27, 8, 56 );
+                l_scom_buffer.insert<uint64_t> (l_scom_buffer_2400_8GB_X4_1, 35, 3, 61 );
+            }
+
             l_rc = fapi2::putScom(TGT0, 0x7010935ull, l_scom_buffer);
 
             if (l_rc)