Skip to content

Commit 7f07258

Browse files
mgloffploetzma
authored andcommitted
Add severity to saved data for SBE Update error log
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>
1 parent 8bc9ab7 commit 7f07258

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

src/usr/sbe/sbe_update.C

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -407,16 +407,17 @@ namespace SBE
407407
sbeState.err_plid = err->plid();
408408
sbeState.err_eid = err->eid();
409409
sbeState.err_rc = err->reasonCode();
410+
sbeState.err_sev = err->sev();
410411

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

23342335
TRACFCOMP( g_trac_sbe,ERR_MRK"updateSeepromSide() - ECC "
2335-
"ERROR or Data Miscimpare On SBE Version Read "
2336+
"ERROR or Data Miscompare On SBE Version Read "
23362337
"Back: eccStatus=%d, rc_ECC=%d, "
23372338
"sI=%d, sI_ECC=%d, HUID=0x%.8X, side=%d",
23382339
eccStatus, rc_readBack_ECC_memcmp,
@@ -4310,11 +4311,13 @@ namespace SBE
43104311
TRACFCOMP( g_trac_sbe,ERR_MRK"masterVersionCompare() - "
43114312
"Error Associated with Updating Target "
43124313
"HUID=0x%.8X: plid=0x%.8X, eid=0x%.8X, "
4313-
"rc=0x%.4X. Can't trust its SBE Version",
4314+
"rc=0x%.4X, sev=0x%.2X. "
4315+
"Can't trust its SBE Version",
43144316
TARGETING::get_huid(io_sbeStates_v[i].target),
43154317
io_sbeStates_v[i].err_plid,
43164318
io_sbeStates_v[i].err_eid,
4317-
io_sbeStates_v[i].err_rc);
4319+
io_sbeStates_v[i].err_rc,
4320+
io_sbeStates_v[i].err_sev);
43184321

43194322
/*@
43204323
* @errortype

src/usr/sbe/sbe_update.H

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,14 +309,16 @@ namespace SBE
309309
uint32_t err_plid;
310310
uint32_t err_eid;
311311
uint16_t err_rc;
312+
ERRORLOG::errlSeverity_t err_sev;
312313

313314
// Constructor to default certain values
314315
sbeTargetState_t() :
315316
target(NULL), target_is_master(false), ec(0x0),
316317
seeprom_0_ver_ECC_fail(false), seeprom_1_ver_ECC_fail(false),
317318
customizedImage_size(0x0), customizedImage_crc(0x0),
318319
new_readBack_check(false),
319-
err_plid(0x0), err_eid(0x0), err_rc(0x0)
320+
err_plid(0x0), err_eid(0x0), err_rc(0x0),
321+
err_sev(ERRORLOG::ERRL_SEV_UNKNOWN)
320322
{};
321323
};
322324

0 commit comments

Comments
 (0)