Skip to content

Commit

Permalink
Add severity to saved data for SBE Update error log
Browse files Browse the repository at this point in the history
There are cases where SBE Update saves information about an error
it has logged for a target.  Adding the error log severity to this
saved data.

Change-Id: Icea6104d852735759a41ad06d9c5b9abbc4027a3
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40974
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-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>
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Reviewed-by: Matthew A. Ploetz <maploetz@us.ibm.com>
  • Loading branch information
mgloff authored and ploetzma committed May 31, 2017
1 parent 8bc9ab7 commit 7f07258
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
15 changes: 9 additions & 6 deletions src/usr/sbe/sbe_update.C
Expand Up @@ -407,16 +407,17 @@ namespace SBE
sbeState.err_plid = err->plid();
sbeState.err_eid = err->eid();
sbeState.err_rc = err->reasonCode();
sbeState.err_sev = err->sev();

// Commit the error here and move on to the next target,
// or if no targets left, will just continue the IPL
TRACFCOMP( g_trac_sbe,
INFO_MRK"updateProcessorSbeSeeproms(): "
"Committing Error Log rc=0x%.4X eid=0x%.8X "
"plid=0x%.8X for Target UID=0x%X, but "
"continuing procedure",
"plid=0x%.8X sev=0x%.2X for Target UID=0x%X, "
"but continuing procedure",
sbeState.err_rc, sbeState.err_eid,
sbeState.err_plid,
sbeState.err_plid, sbeState.err_sev,
TARGETING::get_huid(sbeState.target));
errlCommit( err, SBE_COMP_ID );
}
Expand Down Expand Up @@ -2332,7 +2333,7 @@ namespace SBE
// There is an ECC issue with this SEEPROM

TRACFCOMP( g_trac_sbe,ERR_MRK"updateSeepromSide() - ECC "
"ERROR or Data Miscimpare On SBE Version Read "
"ERROR or Data Miscompare On SBE Version Read "
"Back: eccStatus=%d, rc_ECC=%d, "
"sI=%d, sI_ECC=%d, HUID=0x%.8X, side=%d",
eccStatus, rc_readBack_ECC_memcmp,
Expand Down Expand Up @@ -4310,11 +4311,13 @@ namespace SBE
TRACFCOMP( g_trac_sbe,ERR_MRK"masterVersionCompare() - "
"Error Associated with Updating Target "
"HUID=0x%.8X: plid=0x%.8X, eid=0x%.8X, "
"rc=0x%.4X. Can't trust its SBE Version",
"rc=0x%.4X, sev=0x%.2X. "
"Can't trust its SBE Version",
TARGETING::get_huid(io_sbeStates_v[i].target),
io_sbeStates_v[i].err_plid,
io_sbeStates_v[i].err_eid,
io_sbeStates_v[i].err_rc);
io_sbeStates_v[i].err_rc,
io_sbeStates_v[i].err_sev);

/*@
* @errortype
Expand Down
4 changes: 3 additions & 1 deletion src/usr/sbe/sbe_update.H
Expand Up @@ -309,14 +309,16 @@ namespace SBE
uint32_t err_plid;
uint32_t err_eid;
uint16_t err_rc;
ERRORLOG::errlSeverity_t err_sev;

// Constructor to default certain values
sbeTargetState_t() :
target(NULL), target_is_master(false), ec(0x0),
seeprom_0_ver_ECC_fail(false), seeprom_1_ver_ECC_fail(false),
customizedImage_size(0x0), customizedImage_crc(0x0),
new_readBack_check(false),
err_plid(0x0), err_eid(0x0), err_rc(0x0)
err_plid(0x0), err_eid(0x0), err_rc(0x0),
err_sev(ERRORLOG::ERRL_SEV_UNKNOWN)
{};
};

Expand Down

0 comments on commit 7f07258

Please sign in to comment.