Ensure ATTR_EC_GARD and ATTR_EQ_GARD are updated before SBE update

The xip_customize code does not look at target states directly.
Instead it just shoves a couple of attributes directly into the
image.

This change ensures those attributes are set correctly before
executing the xip_customize procedure.

Change-Id: I6e9ffedcea08af70882be1de6ff2203de8b3e30b
CQ: SW421514
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/56144
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
CI-Ready: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>

1 files changed, 6 insertions, 0 deletions

diff --git a/src/usr/sbe/sbe_update.C b/src/usr/sbe/sbe_update.C
index fc1708edf..fc1057d2f 100644
--- a/src/usr/sbe/sbe_update.C
+++ b/src/usr/sbe/sbe_update.C
@@ -47,6 +47,7 @@
 #include <sys/misc.h>
 #include <sys/msg.h>
 #include <hwas/common/deconfigGard.H>
+#include <hwas/common/hwas.H>
 #include <initservice/initserviceif.H>
 #include <console/consoleif.H>
 #include <config.h>
@@ -1014,6 +1015,11 @@ namespace SBE
 
         do{
 
+            // Before doing any customization, we need to ensure that the
+            // ATTR_EC/EQ_GARD attributes are setup to reflect the
+            // current state of our targets
+            HWAS::setChipletGardsOnProc(i_target);
+
             // cast OUR type of target to a FAPI type of target.
             const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>
                 l_fapiTarg(i_target);