From d2f22373f239842f7eb9d9abbc3290c85894056b Mon Sep 17 00:00:00 2001 From: Christian Geddes Date: Wed, 2 May 2018 17:03:14 -0500 Subject: Deconfig record can't get added to vitalAttn elog on FSP On FSP system we should never try to call vitalAttnHandler because the fir bits that trigger this code should be masked. However we have seen issues where for whatever reason the firs get unmasked. If we happen to fall into this code on a FSP system we want to make sure that no deconfigure records get added to the error logs that get generated. If deconfig records get added it can collide with the flow that hwsv is doing to attempt to recover the SBE. Also in this commit we removed the TODO for disabling the OCC if the SBE dies. We have decided that it is no longer necessary to disable the OCC if the SBE dies. See story for more information. Change-Id: Ib75dc34a122a37853047af67ec8858dbca11e4a2 CQ: SW427127 RTC: 180244 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/58226 Reviewed-by: Martin Gloff Reviewed-by: Brian E. Bakke Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: FSP CI Jenkins Reviewed-by: Roland Veloz Reviewed-by: Daniel M. Crowell Tested-by: Jenkins OP HW --- src/usr/sbeio/common/sbe_attn.C | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/usr/sbeio/common/sbe_attn.C b/src/usr/sbeio/common/sbe_attn.C index 5d8be78e4..e6adafc2b 100644 --- a/src/usr/sbeio/common/sbe_attn.C +++ b/src/usr/sbeio/common/sbe_attn.C @@ -114,7 +114,6 @@ namespace SBEIO HWAS::GARD_NULL ); l_err->collectTrace( SBEIO_COMP_NAME, 256); - // @todo - RTC:180244 - Disable the OCC } // Inform OPAL the state of the SBE after a retry is successful else @@ -164,12 +163,23 @@ namespace SBEIO TARGETING::get_huid(i_procTarg), l_ret); } - - //We want to deconfigure the processor where the error was detected +// If this code happens to get called on a FSP system during runtime we definitely do not +// want to add a deconfig record. If we do it will cause conflict with HWSV code which might +// be trying to handle the SBE error +#ifndef CONFIG_FSP_BUILD + // We want to deconfigure the processor where the error was detected l_err->addHwCallout( i_procTarg, HWAS::SRCI_PRIORITY_HIGH, HWAS::DELAYED_DECONFIG, HWAS::GARD_NULL ); +#else + // We want to only add a hw callout for the processor where the error was detected + // if we fall down this path on an FSP system. + l_err->addHwCallout( i_procTarg, + HWAS::SRCI_PRIORITY_HIGH, + HWAS::NO_DECONFIG, + HWAS::GARD_NULL ); +#endif #endif -- cgit v1.2.1