Enable updates of SBE SEEPROMs

Unset NO_SBE_UPDATES in fsprelease.config.
Create ATTR_SBE_UPDATE_DISABLE to allow disabling updates.

Change-Id: Ic57d4e7a28d3778f6959d7665052ac7e9c9f73c7
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35288
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

4 files changed, 45 insertions, 1 deletions

diff --git a/src/build/configs/fsprelease.config b/src/build/configs/fsprelease.config
index e72102328..d0fd81eca 100644
--- a/src/build/configs/fsprelease.config
+++ b/src/build/configs/fsprelease.config
@@ -8,4 +8,4 @@ unset INCLUDE_XML_OPPOWERVM
 unset INCLUDE_XML_OPENPOWER
 unset ENABLE_HDAT_IN_HOSTBOOT
 unset START_OCC_DURING_BOOT
-set NO_SBE_UPDATES
+unset NO_SBE_UPDATES
diff --git a/src/usr/sbe/sbe_update.C b/src/usr/sbe/sbe_update.C
index c8f2849e5..13c225c34 100644
--- a/src/usr/sbe/sbe_update.C
+++ b/src/usr/sbe/sbe_update.C
@@ -133,6 +133,16 @@ namespace SBE
             assert(sys, "updateProcessorSbeSeeproms() system target is NULL");
 
             /*****************************************************************/
+            /* Skip Update if ATTR_SBE_UPDATE_DISABLE is set                 */
+            /*****************************************************************/
+            if ( sys->getAttr<ATTR_SBE_UPDATE_DISABLE>() ) // true => disable
+            {
+                TRACFCOMP( g_trac_sbe, INFO_MRK"SBE Update skipped due to "
+                           "system attribute SBE_UPDATE_DISABLE being set");
+                break;
+            }
+
+            /*****************************************************************/
             /* Skip Update if MNFG_FLAG_FSP_UPDATE_SBE_IMAGE is set          */
             /* AND there is a FSP present                                    */
             /*****************************************************************/
@@ -277,6 +287,15 @@ namespace SBE
                 else
                 {
                     sbeState.target_is_master = false;
+
+                    // If running in simics, don't do the update
+                    if ( Util::isSimicsRunning() )
+                    {
+                        // Push this sbeState onto the vector
+                        sbeStates_vector.push_back(sbeState);
+
+                        break;
+                    }
                 }
 
                 err = getSbeInfoState(sbeState);
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index 3d8e2b4e0..4bf92b668 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -20217,6 +20217,30 @@ Measured in GB</description>
 </attribute>
 
 <attribute>
+    <id>SBE_UPDATE_DISABLE</id>
+    <description>
+      Control execution of updateProcessorSbeSeeproms()
+
+      if OFF, enable SBE update of processor SEEPROM
+      if ON, disable SBE update of processor SEEPROM
+
+      Consumer:  sbe_update.C
+
+      Default:  OFF
+    </description>
+    <simpleType>
+        <uint8_t>
+        </uint8_t>
+    </simpleType>
+    <hwpfToHbAttrMap>
+        <id>ATTR_SBE_UPDATE_DISABLE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+</attribute>
+
+<attribute>
   <id>BOOT_FLAGS</id>
   <description>Switch to using a flag to indicate SEEPROM side SBE</description>
   <simpleType>
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index db04b94ad..b60f2be3e 100755
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -772,6 +772,7 @@
     <attribute><id>MRW_HW_MIRRORING_ENABLE</id></attribute>
 
     <!-- attributes for sbe_start -->
+    <attribute><id>SBE_UPDATE_DISABLE</id></attribute>
     <attribute><id>BOOT_FLAGS</id></attribute>
     <attribute><id>NEST_PLL_BUCKET</id></attribute>
     <attribute><id>NEST_PLL_FREQ_BUCKETS</id></attribute>