From 04dca99153cae852c2b7a3e63fc497d7cf0f2dda Mon Sep 17 00:00:00 2001 From: Jaymes Wilks Date: Tue, 12 Dec 2017 16:20:18 -0600 Subject: 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 Tested-by: FSP CI Jenkins Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Reviewed-by: Daniel M. Crowell Reviewed-by: Prachi Gupta Reviewed-by: William G. Hoffa --- src/usr/hwas/common/deconfigGard.C | 37 ------------------------------------- 1 file changed, 37 deletions(-) (limited to 'src/usr/hwas') 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() == TYPE_MCA) && - ((i_target.getAttr() % 4) == 0)) - { - HWAS_INF("enforceMagicMcaDeconfig for MCA%d %.8X (i_deconfigRule %d)", - i_target.getAttr(), 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; } -- cgit v1.2.1