EC_FEATURE attributes not working correctly in when==S case

    -The logic to exclude address based on ec level had been
     commented out by mistake using an INITCOMPILER_DEBUG
     compile flag.

Change-Id: I8a46c7b55d817c969079ece6d299fc1d4765ae73
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/39563
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: Jenny Huynh <jhuynh@us.ibm.com>
Reviewed-by: Benjamin Gass <bgass@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/39564
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Tested-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 24 insertions, 84 deletions

diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_npu_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_npu_scom.C
index fcc5c91e4..833b84e25 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_npu_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_npu_scom.C
@@ -165,10 +165,13 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
             FAPI_TRY(fapi2::putScom(TGT0, 0x5011008ull, l_scom_buffer));
         }
         {
-            FAPI_TRY(fapi2::getScom( TGT0, 0x501101bull, l_scom_buffer ));
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            {
+                FAPI_TRY(fapi2::getScom( TGT0, 0x501101bull, l_scom_buffer ));
 
-            l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
-            FAPI_TRY(fapi2::putScom(TGT0, 0x501101bull, l_scom_buffer));
+                l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
+                FAPI_TRY(fapi2::putScom(TGT0, 0x501101bull, l_scom_buffer));
+            }
         }
         {
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
@@ -408,15 +411,6 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
             }
         }
         {
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) )
-            {
-                FAPI_TRY(fapi2::getScom( TGT0, 0x501104bull, l_scom_buffer ));
-
-                l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
-                FAPI_TRY(fapi2::putScom(TGT0, 0x501104bull, l_scom_buffer));
-            }
-        }
-        {
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 FAPI_TRY(fapi2::getScom( TGT0, 0x501105bull, l_scom_buffer ));
@@ -504,10 +498,13 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
             FAPI_TRY(fapi2::putScom(TGT0, 0x5011068ull, l_scom_buffer));
         }
         {
-            FAPI_TRY(fapi2::getScom( TGT0, 0x501107bull, l_scom_buffer ));
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            {
+                FAPI_TRY(fapi2::getScom( TGT0, 0x501107bull, l_scom_buffer ));
 
-            l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
-            FAPI_TRY(fapi2::putScom(TGT0, 0x501107bull, l_scom_buffer));
+                l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
+                FAPI_TRY(fapi2::putScom(TGT0, 0x501107bull, l_scom_buffer));
+            }
         }
         {
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
@@ -672,15 +669,6 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
         {
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) )
             {
-                FAPI_TRY(fapi2::getScom( TGT0, 0x50110abull, l_scom_buffer ));
-
-                l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
-                FAPI_TRY(fapi2::putScom(TGT0, 0x50110abull, l_scom_buffer));
-            }
-        }
-        {
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) )
-            {
                 FAPI_TRY(fapi2::getScom( TGT0, 0x50110c0ull, l_scom_buffer ));
 
                 l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 );
@@ -1261,10 +1249,13 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
             FAPI_TRY(fapi2::putScom(TGT0, 0x5011208ull, l_scom_buffer));
         }
         {
-            FAPI_TRY(fapi2::getScom( TGT0, 0x501121bull, l_scom_buffer ));
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            {
+                FAPI_TRY(fapi2::getScom( TGT0, 0x501121bull, l_scom_buffer ));
 
-            l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
-            FAPI_TRY(fapi2::putScom(TGT0, 0x501121bull, l_scom_buffer));
+                l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
+                FAPI_TRY(fapi2::putScom(TGT0, 0x501121bull, l_scom_buffer));
+            }
         }
         {
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
@@ -1560,15 +1551,6 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
             }
         }
         {
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) )
-            {
-                FAPI_TRY(fapi2::getScom( TGT0, 0x501124bull, l_scom_buffer ));
-
-                l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
-                FAPI_TRY(fapi2::putScom(TGT0, 0x501124bull, l_scom_buffer));
-            }
-        }
-        {
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 FAPI_TRY(fapi2::getScom( TGT0, 0x501125bull, l_scom_buffer ));
@@ -1684,10 +1666,13 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
             FAPI_TRY(fapi2::putScom(TGT0, 0x5011268ull, l_scom_buffer));
         }
         {
-            FAPI_TRY(fapi2::getScom( TGT0, 0x501127bull, l_scom_buffer ));
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+            {
+                FAPI_TRY(fapi2::getScom( TGT0, 0x501127bull, l_scom_buffer ));
 
-            l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
-            FAPI_TRY(fapi2::putScom(TGT0, 0x501127bull, l_scom_buffer));
+                l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
+                FAPI_TRY(fapi2::putScom(TGT0, 0x501127bull, l_scom_buffer));
+            }
         }
         {
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
@@ -1852,15 +1837,6 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
         {
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) )
             {
-                FAPI_TRY(fapi2::getScom( TGT0, 0x50112abull, l_scom_buffer ));
-
-                l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
-                FAPI_TRY(fapi2::putScom(TGT0, 0x50112abull, l_scom_buffer));
-            }
-        }
-        {
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) )
-            {
                 FAPI_TRY(fapi2::getScom( TGT0, 0x50112c0ull, l_scom_buffer ));
 
                 l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 );
@@ -2186,15 +2162,6 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
         {
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) )
             {
-                FAPI_TRY(fapi2::getScom( TGT0, 0x501141bull, l_scom_buffer ));
-
-                l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
-                FAPI_TRY(fapi2::putScom(TGT0, 0x501141bull, l_scom_buffer));
-            }
-        }
-        {
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) )
-            {
                 FAPI_TRY(fapi2::getScom( TGT0, 0x5011430ull, l_scom_buffer ));
 
                 l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 );
@@ -2342,15 +2309,6 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
         {
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) )
             {
-                FAPI_TRY(fapi2::getScom( TGT0, 0x501144bull, l_scom_buffer ));
-
-                l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
-                FAPI_TRY(fapi2::putScom(TGT0, 0x501144bull, l_scom_buffer));
-            }
-        }
-        {
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) )
-            {
                 FAPI_TRY(fapi2::getScom( TGT0, 0x5011460ull, l_scom_buffer ));
 
                 l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 );
@@ -2455,15 +2413,6 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
         {
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) )
             {
-                FAPI_TRY(fapi2::getScom( TGT0, 0x501147bull, l_scom_buffer ));
-
-                l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
-                FAPI_TRY(fapi2::putScom(TGT0, 0x501147bull, l_scom_buffer));
-            }
-        }
-        {
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) )
-            {
                 FAPI_TRY(fapi2::getScom( TGT0, 0x5011490ull, l_scom_buffer ));
 
                 l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 );
@@ -2568,15 +2517,6 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
         {
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) )
             {
-                FAPI_TRY(fapi2::getScom( TGT0, 0x50114abull, l_scom_buffer ));
-
-                l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
-                FAPI_TRY(fapi2::putScom(TGT0, 0x50114abull, l_scom_buffer));
-            }
-        }
-        {
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) )
-            {
                 FAPI_TRY(fapi2::getScom( TGT0, 0x50114c0ull, l_scom_buffer ));
 
                 l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 );