From cf258fcfb753bafcfac0659ded5f312c793d047d Mon Sep 17 00:00:00 2001 From: Andres Lugo-Reyes Date: Thu, 14 Jun 2018 14:43:33 -0500 Subject: HTMGT: WOF Reset Disable Flag Change-Id: Ia4c8b0342b668a150f1f79c49f9c7bba2614ca34 RTC:192844 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/61148 Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins Reviewed-by: Christopher J. Cain Reviewed-by: Sheldon Bailey Reviewed-by: Martha Broyles Reviewed-by: Daniel M. Crowell --- src/usr/htmgt/occError.C | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'src/usr/htmgt/occError.C') diff --git a/src/usr/htmgt/occError.C b/src/usr/htmgt/occError.C index 37bd6595c..15e8a48bb 100644 --- a/src/usr/htmgt/occError.C +++ b/src/usr/htmgt/occError.C @@ -133,6 +133,8 @@ namespace HTMGT // Check if we need a WOF requested reset if(iv_needsWofReset == true) { + TMGT_ERR("WOF Reset detected! SRC = 0x%X", + l_occSrc); // We compare against one less than the threshold because // the WOF reset count doesnt get incremented until resetPrep if( iv_wofResetCount < (WOF_RESET_COUNT_THRESHOLD-1) ) @@ -400,20 +402,30 @@ namespace HTMGT } // end Occ::elogAddCallout() - void Occ::elogProcessActions(const uint8_t i_actions, bool & o_occReset, ERRORLOG::errlSeverity_t & o_errlSeverity) { if (i_actions & TMGT_ERRL_ACTIONS_WOF_RESET_REQUIRED) { - o_occReset = true; iv_failed = false; - iv_needsWofReset = true; iv_resetReason = OCC_RESET_REASON_WOF_REQUEST; - - TMGT_INF("elogProcessActions: OCC%d requested a WOF reset", - iv_instance); + // Check if WOF resets are disabled + if(int_flags_set(FLAG_WOF_RESET_DISABLED) == true) + { + o_occReset = false; + iv_needsWofReset = false; + TMGT_INF("elogProcessActions: OCC%d requested a WOF reset " + "but WOF resets are DISABLED", + iv_instance); + } + else // WOF resets are enabled + { + o_occReset = true; + iv_needsWofReset = true; + TMGT_INF("elogProcessActions: OCC%d requested a WOF reset", + iv_instance); + } } else { -- cgit v1.2.1