From ebe0b5de67d7d4081e3983bee451d63219f2dbf4 Mon Sep 17 00:00:00 2001
From: Rick Ward <rward15@us.ibm.com>
Date: Tue, 13 Feb 2018 16:15:46 -0600
Subject: Send additional FSP progress messages during long isteps (e.g.
 memdiags)

Updated sendProgressCode() so that it would only output trace or
console messages once per step/substep.  Replaced most calls to
IPMIWATCHDOG::resetWatchDogTimer() with calls to sendProgressCode()
which calls resetWatchDogTimer() if communicating with a BMC, or
updates the FSP with its progress on FSP-based systems.

Change-Id: I29beb7ce5cdae467d26a0b2c5fee9e3cc4629161
RTC: 169682
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/53995
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Tested-by: Jenkins Server <pfd-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>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
---
 src/usr/sbeio/common/sbe_retry_handler.C | 40 ++++----------------------------
 1 file changed, 4 insertions(+), 36 deletions(-)

(limited to 'src/usr/sbeio')

diff --git a/src/usr/sbeio/common/sbe_retry_handler.C b/src/usr/sbeio/common/sbe_retry_handler.C
index b18480df4..ed7bfb11d 100644
--- a/src/usr/sbeio/common/sbe_retry_handler.C
+++ b/src/usr/sbeio/common/sbe_retry_handler.C
@@ -43,6 +43,7 @@
 #include <fapi2/plat_hwp_invoker.H>
 #include <initservice/isteps_trace.H>
 #include <initservice/initserviceif.H>
+#include <initservice/istepdispatcherif.H>
 #include <errl/errludtarget.H>
 #include <sys/time.h>
 #include <util/misc.H>
@@ -429,26 +430,10 @@ void SbeRetryHandler::handle_sbe_reg_value(TARGETING::Target * i_target)
 
             {
                 iv_retriggeredMain = true;
-#ifdef CONFIG_BMC_IPMI
+
 #ifndef __HOSTBOOT_RUNTIME
                 // This could potentially take awhile, reset watchdog
-                l_errl = IPMIWATCHDOG::resetWatchDogTimer();
-                if(l_errl)
-                {
-                    SBE_TRACF("Inside handle_sbe_reg_value before sbe_handler "
-                              "Resetting watchdog");
-                    l_errl->collectTrace("ISTEPS_TRACE",256);
-
-                    // Set the PLID of the error log to caller's PLID,
-                    // if provided
-                    if (iv_callerErrorLogPLID)
-                    {
-                       l_errl->plid(iv_callerErrorLogPLID);
-                    }
-
-                    errlCommit(l_errl,ISTEP_COMP_ID);
-                }
-#endif
+                INITSERVICE::sendProgressCode();
 #endif
                 SBE_TRACF("handle_sbe_reg_value(): Attempting "
                    "REIPL_UPD_SEEPROM failed. Recalling with BKP_SEEPROM");
@@ -910,26 +895,9 @@ bool SbeRetryHandler::sbe_boot_fail_handler(TARGETING::Target * i_target,
 #endif
         }
 
-#ifdef CONFIG_BMC_IPMI
 #ifndef __HOSTBOOT_RUNTIME
         // This could potentially take awhile, reset watchdog
-        l_errl = IPMIWATCHDOG::resetWatchDogTimer();
-        if(l_errl)
-        {
-            SBE_TRACF("sbe_boot_fail_handler "
-                      "Resetting watchdog before sbe_handler");
-            l_errl->collectTrace("ISTEPS_TRACE",KILOBYTE/4);
-
-            // Set the PLID of the error log to caller's PLID,
-            // if provided
-            if (iv_callerErrorLogPLID)
-            {
-                l_errl->plid(iv_callerErrorLogPLID);
-            }
-
-            errlCommit(l_errl,ISTEP_COMP_ID);
-        }
-#endif
+        INITSERVICE::sendProgressCode();
 #endif
         SBE_TRACF("sbe_boot_fail_handler. iv_switchSides count is %llx",
                    iv_switchSidesCount);
-- 
cgit v1.2.1