Skip to content

Commit

Permalink
Make reconfig loop failures unrecoverable only in istep mode
Browse files Browse the repository at this point in the history
The "Hostboot cannot perform reconfig loop" error log was showing up
as unrecoverable. This is fine for istep mode, but for normal mode
it is now informational.

Change-Id: I891d82c892b0eccc983a59cf230852943ccfaaba
CQ:SW388205
Backport:release-fips910
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/52974
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@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: Stephen M. Cprek <smcprek@us.ibm.com>
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
popfuture authored and dcrowell77 committed Feb 1, 2018
1 parent 400b306 commit eb4da4c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
12 changes: 8 additions & 4 deletions src/usr/initservice/istepdispatcher/istepdispatcher.C
Expand Up @@ -1951,7 +1951,7 @@ void IStepDispatcher::handleIStepRequestMsg(msg_t * & io_pMsg)
// In istep mode we cannot do a reconfigure of any sort, so create
// an error.
TRACFCOMP(g_trac_initsvc, ERR_MRK"handleIStepRequestMsg: IStep success and deconfigs, creating error");
err = failedDueToDeconfig(istep, substep, newIstep, newSubstep);
err = failedDueToDeconfig(istep, substep, newIstep, newSubstep, true);

}

Expand Down Expand Up @@ -2564,10 +2564,14 @@ errlHndl_t IStepDispatcher::handleCoalesceHostMsg()
// ----------------------------------------------------------------------------
errlHndl_t IStepDispatcher::failedDueToDeconfig(
uint8_t i_step, uint8_t i_substep,
uint8_t i_dStep, uint8_t i_dSubstep)
uint8_t i_dStep, uint8_t i_dSubstep,
const bool istepMode)
{
errlHndl_t err = NULL;

auto l_severity = istepMode? ERRORLOG::ERRL_SEV_UNRECOVERABLE:
ERRORLOG::ERRL_SEV_INFORMATIONAL;

using namespace TARGETING;
TARGETING::Target* l_pTopLevel = nullptr;
TARGETING::targetService().getTopLevelTarget(l_pTopLevel);
Expand Down Expand Up @@ -2598,7 +2602,7 @@ errlHndl_t IStepDispatcher::failedDueToDeconfig(
/*@
* @errortype
* @reasoncode ISTEP_FAILED_DUE_TO_DECONFIG
* @severity ERRORLOG::ERRL_SEV_UNRECOVERABLE
* @severity ERRORLOG::ERRL_SEV_INFORMATIONAL
* @moduleid ISTEP_INITSVC_MOD_ID
* @userdata1[00:15] Istep that failed
* @userdata1[16:31] SubStep that failed
Expand Down Expand Up @@ -2629,7 +2633,7 @@ errlHndl_t IStepDispatcher::failedDueToDeconfig(
* for details.
*/
err = new ERRORLOG::ErrlEntry(
ERRORLOG::ERRL_SEV_UNRECOVERABLE,
l_severity,
ISTEP_INITSVC_MOD_ID,
ISTEP_FAILED_DUE_TO_DECONFIG,
FOUR_UINT16_TO_UINT64(i_step, i_substep,
Expand Down
6 changes: 4 additions & 2 deletions src/usr/initservice/istepdispatcher/istepdispatcher.H
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2011,2017 */
/* Contributors Listed Below - COPYRIGHT 2011,2018 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -432,9 +432,11 @@ private:
* @param[in] i_substep - Current substep.
* @param[in] i_dStep - Desired istep if we could do a reconfig.
* @param[in] i_dSubstep - Desired substep if we could do a reconfig.
* @param[in] i_istepMode - Pass true if in istep mode. Default is false.
*/
static errlHndl_t failedDueToDeconfig(uint8_t i_step, uint8_t i_substep,
uint8_t i_dStep, uint8_t i_dSubstep);
uint8_t i_dStep, uint8_t i_dSubstep,
const bool i_istepMode = false);

// Instance variables

Expand Down

0 comments on commit eb4da4c

Please sign in to comment.