Stop deconfiguring magic MCA and its MCBIST by association

Deconfiguring the magic MCA and its parent MCBIST was causing
Maint UE to be reported on other slots. The deconfiguration logic
for magic MCAs will now be handled by the RC_MSS_ZCNTL hardware
procedure.

Change-Id: Ica32c3b5850ae6e7b9f6c2a53bfcb88d4b462046
CQ:SW402588
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/50842
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>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>

1 files changed, 0 insertions, 37 deletions

diff --git a/src/usr/hwas/common/deconfigGard.C b/src/usr/hwas/common/deconfigGard.C
index d1afdda9f..ab87aba12 100644
--- a/src/usr/hwas/common/deconfigGard.C
+++ b/src/usr/hwas/common/deconfigGard.C
@@ -1389,39 +1389,6 @@ errlHndl_t DeconfigGard::_invokeDeconfigureAssocProc(
     return l_pErr;
 }
 
-//******************************************************************************
-void DeconfigGard::enforceMagicMcaDeconfig(
-        Target & i_target,
-        const uint32_t i_errlEid,
-        const DeconfigureFlags i_deconfigRule)
-{
-    // Check if "magic" port is the target
-    if ((i_target.getAttr<ATTR_TYPE>() == TYPE_MCA) &&
-        ((i_target.getAttr<ATTR_CHIP_UNIT>() % 4) == 0))
-    {
-        HWAS_INF("enforceMagicMcaDeconfig for MCA%d %.8X (i_deconfigRule %d)",
-            i_target.getAttr<ATTR_CHIP_UNIT>(), get_huid(&i_target),
-            i_deconfigRule);
-
-        // magic port found and need to deconfigure its MCBIST parent on down
-
-        // get parent MCBIST
-        TargetHandleList pParentMcbistList;
-        getParentAffinityTargetsByState(pParentMcbistList, &i_target,
-                            CLASS_UNIT, TYPE_MCBIST, UTIL_FILTER_PRESENT);
-
-        HWAS_ASSERT((pParentMcbistList.size() == 1),
-            "HWAS enforceMagicMcaDeconfig: pParentMcbistList != 1");
-
-        Target *l_parentMcbist = pParentMcbistList[0];
-
-        HWAS_INF("enforceMagicMcaDeconfig rollup deconfig to "
-            "MCBIST parent (%.8X)", get_huid(l_parentMcbist));
-
-        _deconfigureTarget(*l_parentMcbist, i_errlEid, NULL, i_deconfigRule);
-        _deconfigureByAssoc(*l_parentMcbist, i_errlEid, i_deconfigRule);
-    }
-}
 
 //******************************************************************************
 void DeconfigGard::_deconfigureByAssoc(
@@ -1610,10 +1577,6 @@ void DeconfigGard::_deconfigureByAssoc(
                                         i_errlEid,i_deconfigRule);
                 }
 
-                // Checks if MCA is the "magic" port, if so,
-                // then deconfig from its MCBIST parent on down
-                enforceMagicMcaDeconfig(i_target, i_errlEid, i_deconfigRule);
-
                 // and we're done, so break;
                 break;
             }