SW419349: Handle override of deconfig by Error vs FCO reasons by association

1. Override the deconfig reason of a parent ..
      a) getting deconfig by association due to error on its child &&
      b) has at least 1 other child already deconfig by FCO
      .. to deconfig by FCO
2. Override the deconfig reason of a child ..
      c) whose parent is getting deconfig by an error &&
      d) that is itself already deconfig by FCO
      .. to deconfig by that error

Change-Id: I9c73fe35aedb832f9a4b33bd299bb30fe589095c
CQ: SW419349
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/59934
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 24 insertions, 1 deletions

diff --git a/src/include/usr/targeting/common/predicates/predicatehwas.H b/src/include/usr/targeting/common/predicates/predicatehwas.H
index 523332646..c9ad4db4f 100644
--- a/src/include/usr/targeting/common/predicates/predicatehwas.H
+++ b/src/include/usr/targeting/common/predicates/predicatehwas.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -136,6 +136,17 @@ class PredicateHwas : public PredicateBase
           *  @return Reference to the predicate, for chaining
           */
          PredicateHwas& specdeconfig(const bool i_specdeconfig);
+
+         /**
+          *  @brief Configure predicate to look for the given deconfig by
+          *  error log id or enum value
+          *
+          *  @param[in] i_eid Desired value of deconfig by EID
+          *
+          *  @return Reference to the predicate, for chaining
+          */
+         PredicateHwas& deconfiguredByEid(const uint32_t i_eid);
+
         /**
          *  @brief Returns whether target matches the desired HWAS state
          *
@@ -250,6 +261,18 @@ inline PredicateHwas& PredicateHwas::specdeconfig(
     iv_valid.attribute.specdeconfig = true;
     return *this;
 }
+
+//******************************************************************************
+// PredicateHwas::deconfiguredByEid
+//******************************************************************************
+inline PredicateHwas& PredicateHwas::deconfiguredByEid(
+    const uint32_t i_eid)
+{
+    iv_desired.attribute.deconfiguredByEid = i_eid;
+    iv_valid.attribute.deconfiguredByEid = 0xFFFFFFFF;
+    return *this;
+}
+
 #undef TARG_CLASS
 #undef TARG_NAMESPACE