Add support for iterating over EC_LEVELS

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

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

1 files changed, 54 insertions, 45 deletions

diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_core_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_core_scom.C
index 41015b37..bf1dd25f 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_core_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_core_scom.C
@@ -29,9 +29,9 @@
 
 using namespace fapi2;
 
-constexpr auto literal_0x4301D70000AB7696 = 0x4301D70000AB7696;
 constexpr auto literal_0x0000000000000000 = 0x0000000000000000;
 constexpr auto literal_0xA858009775100008 = 0xA858009775100008;
+constexpr auto literal_0x4301D70000AB7696 = 0x4301D70000AB7696;
 
 fapi2::ReturnCode p9_core_scom(const fapi2::Target<fapi2::TARGET_TYPE_CORE>& TGT0)
 {
@@ -39,72 +39,81 @@ fapi2::ReturnCode p9_core_scom(const fapi2::Target<fapi2::TARGET_TYPE_CORE>& TGT
 
     do
     {
-        fapi2::buffer<uint64_t> l_scom_buffer;
         {
-            l_rc = fapi2::getScom( TGT0, 0x20010a43ull, l_scom_buffer );
-
-            if (l_rc)
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                FAPI_ERR("ERROR executing: getScom (0x20010a43ull)");
-                break;
-            }
+                l_rc = fapi2::getScom( TGT0, 0x20010a46ull, l_scom_buffer );
 
-            {
-                l_scom_buffer.insert<uint64_t> (literal_0x4301D70000AB7696, 0, 64, 0 );
-            }
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x20010a46ull)");
+                    break;
+                }
 
-            l_rc = fapi2::putScom(TGT0, 0x20010a43ull, l_scom_buffer);
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x0000000000000000, 0, 64, 0 );
+                }
 
-            if (l_rc)
-            {
-                FAPI_ERR("ERROR executing: putScom (0x20010a43ull)");
-                break;
+                l_rc = fapi2::putScom(TGT0, 0x20010a46ull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x20010a46ull)");
+                    break;
+                }
             }
         }
         {
-            l_rc = fapi2::getScom( TGT0, 0x20010a46ull, l_scom_buffer );
-
-            if (l_rc)
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                FAPI_ERR("ERROR executing: getScom (0x20010a46ull)");
-                break;
-            }
+                l_rc = fapi2::getScom( TGT0, 0x20010a47ull, l_scom_buffer );
 
-            {
-                l_scom_buffer.insert<uint64_t> (literal_0x0000000000000000, 0, 64, 0 );
-            }
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x20010a47ull)");
+                    break;
+                }
 
-            l_rc = fapi2::putScom(TGT0, 0x20010a46ull, l_scom_buffer);
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0xA858009775100008, 0, 64, 0 );
+                }
 
-            if (l_rc)
-            {
-                FAPI_ERR("ERROR executing: putScom (0x20010a46ull)");
-                break;
+                l_rc = fapi2::putScom(TGT0, 0x20010a47ull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x20010a47ull)");
+                    break;
+                }
             }
         }
         {
-            l_rc = fapi2::getScom( TGT0, 0x20010a47ull, l_scom_buffer );
-
-            if (l_rc)
+            fapi2::buffer<uint64_t> l_scom_buffer;
             {
-                FAPI_ERR("ERROR executing: getScom (0x20010a47ull)");
-                break;
-            }
+                l_rc = fapi2::getScom( TGT0, 0x20010a43ull, l_scom_buffer );
 
-            {
-                l_scom_buffer.insert<uint64_t> (literal_0xA858009775100008, 0, 64, 0 );
-            }
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: getScom (0x20010a43ull)");
+                    break;
+                }
 
-            l_rc = fapi2::putScom(TGT0, 0x20010a47ull, l_scom_buffer);
+                {
+                    l_scom_buffer.insert<uint64_t> (literal_0x4301D70000AB7696, 0, 64, 0 );
+                }
 
-            if (l_rc)
-            {
-                FAPI_ERR("ERROR executing: putScom (0x20010a47ull)");
-                break;
+                l_rc = fapi2::putScom(TGT0, 0x20010a43ull, l_scom_buffer);
+
+                if (l_rc)
+                {
+                    FAPI_ERR("ERROR executing: putScom (0x20010a43ull)");
+                    break;
+                }
             }
         }
+
     }
-    while (0);
+    while(0);
 
     return l_rc;
 }