initCompiler updates

Fixes to handle when spys move locations within
scom registers.

Change-Id: Iadf2c44c27f68f82ed9bc590f22155e0749a37f6
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/66943
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-by: Benjamin Gass <bgass@us.ibm.com>
Reviewed-by: Claus M. Olsen <cmolsen@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/66953
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>

1 files changed, 50 insertions, 8 deletions

diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_tl_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_tl_scom.C
index 5bd6b7865..3dbe9c32c 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_tl_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_tl_scom.C
@@ -399,7 +399,8 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                         l_scom_buffer.insert<9, 7, 57, uint64_t>(literal_0x3C );
                     }
                 }
-                else if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+
+                if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
                 {
                     if (l_def_OBUS0_FBC_ENABLED)
                     {
@@ -417,7 +418,8 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                         l_scom_buffer.insert<17, 7, 57, uint64_t>(literal_0x3C );
                     }
                 }
-                else if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+
+                if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
                 {
                     if (l_def_OBUS0_FBC_ENABLED)
                     {
@@ -435,7 +437,8 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                         l_scom_buffer.insert<41, 7, 57, uint64_t>(literal_0x3C );
                     }
                 }
-                else if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+
+                if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
                 {
                     if (l_def_OBUS0_FBC_ENABLED)
                     {
@@ -453,7 +456,8 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                         l_scom_buffer.insert<49, 7, 57, uint64_t>(literal_0x3C );
                     }
                 }
-                else if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+
+                if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
                 {
                     if (l_def_OBUS0_FBC_ENABLED)
                     {
@@ -591,7 +595,8 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                         l_scom_buffer.insert<9, 7, 57, uint64_t>(literal_0x3C );
                     }
                 }
-                else if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+
+                if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
                 {
                     if (l_def_OBUS3_FBC_ENABLED)
                     {
@@ -609,7 +614,8 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                         l_scom_buffer.insert<17, 7, 57, uint64_t>(literal_0x3C );
                     }
                 }
-                else if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+
+                if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
                 {
                     if (l_def_OBUS3_FBC_ENABLED)
                     {
@@ -627,7 +633,8 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                         l_scom_buffer.insert<41, 7, 57, uint64_t>(literal_0x3C );
                     }
                 }
-                else if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+
+                if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
                 {
                     if (l_def_OBUS3_FBC_ENABLED)
                     {
@@ -645,7 +652,8 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                         l_scom_buffer.insert<49, 7, 57, uint64_t>(literal_0x3C );
                     }
                 }
-                else if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+
+                if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
                 {
                     if (l_def_OBUS3_FBC_ENABLED)
                     {
@@ -784,36 +792,60 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                 if (l_def_OBUS0_FBC_ENABLED)
                 {
                     l_scom_buffer.insert<0, 4, 60, uint64_t>(literal_0b0001 );
+                }
+
+                if (l_def_OBUS0_FBC_ENABLED)
+                {
                     l_scom_buffer.insert<8, 4, 60, uint64_t>(literal_0b0001 );
                 }
 
                 if (l_def_OBUS0_FBC_ENABLED)
                 {
                     l_scom_buffer.insert<4, 4, 60, uint64_t>(literal_0b0100 );
+                }
+
+                if (l_def_OBUS0_FBC_ENABLED)
+                {
                     l_scom_buffer.insert<12, 4, 60, uint64_t>(literal_0b0100 );
                 }
 
                 if ((( ! l_def_OBUS0_FBC_ENABLED) && l_def_OBUS1_FBC_ENABLED))
                 {
                     l_scom_buffer.insert<16, 4, 60, uint64_t>(literal_0b0001 );
+                }
+
+                if ((( ! l_def_OBUS0_FBC_ENABLED) && l_def_OBUS1_FBC_ENABLED))
+                {
                     l_scom_buffer.insert<24, 4, 60, uint64_t>(literal_0b0001 );
                 }
 
                 if ((( ! l_def_OBUS0_FBC_ENABLED) && l_def_OBUS1_FBC_ENABLED))
                 {
                     l_scom_buffer.insert<20, 4, 60, uint64_t>(literal_0b0100 );
+                }
+
+                if ((( ! l_def_OBUS0_FBC_ENABLED) && l_def_OBUS1_FBC_ENABLED))
+                {
                     l_scom_buffer.insert<28, 4, 60, uint64_t>(literal_0b0100 );
                 }
 
                 if (((( ! l_def_OBUS0_FBC_ENABLED) && ( ! l_def_OBUS1_FBC_ENABLED)) && l_def_OBUS2_FBC_ENABLED))
                 {
                     l_scom_buffer.insert<32, 4, 60, uint64_t>(literal_0b0001 );
+                }
+
+                if (((( ! l_def_OBUS0_FBC_ENABLED) && ( ! l_def_OBUS1_FBC_ENABLED)) && l_def_OBUS2_FBC_ENABLED))
+                {
                     l_scom_buffer.insert<40, 4, 60, uint64_t>(literal_0b0001 );
                 }
 
                 if (((( ! l_def_OBUS0_FBC_ENABLED) && ( ! l_def_OBUS1_FBC_ENABLED)) && l_def_OBUS2_FBC_ENABLED))
                 {
                     l_scom_buffer.insert<36, 4, 60, uint64_t>(literal_0b0100 );
+                }
+
+                if (((( ! l_def_OBUS0_FBC_ENABLED) && ( ! l_def_OBUS1_FBC_ENABLED)) && l_def_OBUS2_FBC_ENABLED))
+                {
                     l_scom_buffer.insert<44, 4, 60, uint64_t>(literal_0b0100 );
                 }
 
@@ -821,6 +853,11 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                      && l_def_OBUS3_FBC_ENABLED))
                 {
                     l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0001 );
+                }
+
+                if ((((( ! l_def_OBUS0_FBC_ENABLED) && ( ! l_def_OBUS1_FBC_ENABLED)) && ( ! l_def_OBUS2_FBC_ENABLED))
+                     && l_def_OBUS3_FBC_ENABLED))
+                {
                     l_scom_buffer.insert<56, 4, 60, uint64_t>(literal_0b0001 );
                 }
 
@@ -828,6 +865,11 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                      && l_def_OBUS3_FBC_ENABLED))
                 {
                     l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b0100 );
+                }
+
+                if ((((( ! l_def_OBUS0_FBC_ENABLED) && ( ! l_def_OBUS1_FBC_ENABLED)) && ( ! l_def_OBUS2_FBC_ENABLED))
+                     && l_def_OBUS3_FBC_ENABLED))
+                {
                     l_scom_buffer.insert<60, 4, 60, uint64_t>(literal_0b0100 );
                 }