diff options
Diffstat (limited to 'src/usr')
-rw-r--r-- | src/usr/isteps/istep06/call_host_update_master_tpm.C | 2 | ||||
-rw-r--r-- | src/usr/secureboot/base/service.C | 1 | ||||
-rw-r--r-- | src/usr/secureboot/common/containerheader.C | 3 | ||||
-rw-r--r-- | src/usr/secureboot/trusted/base/trustedbootMsg.C | 7 | ||||
-rw-r--r-- | src/usr/secureboot/trusted/base/trustedboot_base.C | 6 | ||||
-rwxr-xr-x | src/usr/secureboot/trusted/test/tpmLogMgrTest.H | 6 | ||||
-rwxr-xr-x | src/usr/secureboot/trusted/test/trustedbootTest.H | 2 | ||||
-rw-r--r-- | src/usr/secureboot/trusted/trustedboot.C | 22 | ||||
-rw-r--r-- | src/usr/secureboot/trusted/trustedbootUtils.C | 1 |
9 files changed, 32 insertions, 18 deletions
diff --git a/src/usr/isteps/istep06/call_host_update_master_tpm.C b/src/usr/isteps/istep06/call_host_update_master_tpm.C index b08ca5bce..604f7cab0 100644 --- a/src/usr/isteps/istep06/call_host_update_master_tpm.C +++ b/src/usr/isteps/istep06/call_host_update_master_tpm.C @@ -50,7 +50,7 @@ void* call_host_update_master_tpm( void *io_pArgs ) if (l_err) { l_stepError.addErrorDetails(l_err); - ERRORLOG::errlCommit( l_err, SECURE_COMP_ID ); + ERRORLOG::errlCommit( l_err, TRBOOT_COMP_ID ); } #endif diff --git a/src/usr/secureboot/base/service.C b/src/usr/secureboot/base/service.C index 97e482aaf..f7a165f86 100644 --- a/src/usr/secureboot/base/service.C +++ b/src/usr/secureboot/base/service.C @@ -200,6 +200,7 @@ void handleSecurebootFailure(errlHndl_t &io_err, bool i_waitForShutdown) addSecureUserDetailsToErrolog(io_err); io_err->collectTrace(SECURE_COMP_NAME,MAX_ERROR_TRACE_SIZE); + io_err->collectTrace(TRBOOT_COMP_NAME,MAX_ERROR_TRACE_SIZE); errlCommit(io_err, SECURE_COMP_ID); diff --git a/src/usr/secureboot/common/containerheader.C b/src/usr/secureboot/common/containerheader.C index cec5f8cce..47ccfebea 100644 --- a/src/usr/secureboot/common/containerheader.C +++ b/src/usr/secureboot/common/containerheader.C @@ -76,6 +76,7 @@ errlHndl_t ContainerHeader::parse_header() true/*SW Error*/); l_errl->collectTrace(SECURE_COMP_NAME); l_errl->collectTrace(PNOR_COMP_NAME); + l_errl->collectTrace(TRBOOT_COMP_NAME); break; } @@ -375,6 +376,7 @@ errlHndl_t ContainerHeader::validate() true/*SW Error*/); l_errl->collectTrace(SECURE_COMP_NAME); l_errl->collectTrace(PNOR_COMP_NAME); + l_errl->collectTrace(TRBOOT_COMP_NAME); } return l_errl; @@ -415,6 +417,7 @@ errlHndl_t ContainerHeader::safeMemCpyAndInc(void* i_dest, const uint8_t* &io_hd true/*SW Error*/); l_errl->collectTrace(SECURE_COMP_NAME); l_errl->collectTrace(PNOR_COMP_NAME); + l_errl->collectTrace(TRBOOT_COMP_NAME); break; } diff --git a/src/usr/secureboot/trusted/base/trustedbootMsg.C b/src/usr/secureboot/trusted/base/trustedbootMsg.C index 9b5b2b847..ce9d8f9b6 100644 --- a/src/usr/secureboot/trusted/base/trustedbootMsg.C +++ b/src/usr/secureboot/trusted/base/trustedbootMsg.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -82,9 +82,10 @@ namespace TRUSTEDBOOT 0, true); err->collectTrace(SECURE_COMP_NAME); + err->collectTrace(TRBOOT_COMP_NAME); // Log this failure here since we can't reply to caller - errlCommit(err, SECURE_COMP_ID); + errlCommit(err, TRBOOT_COMP_ID); } } @@ -102,7 +103,7 @@ namespace TRUSTEDBOOT TRACFCOMP(g_trac_trustedboot, ERR_MRK "AsyncMessage::respond with error log"); // Since we can't pass back to the caller we will commit the log - errlCommit(iv_errl, SECURE_COMP_ID); + errlCommit(iv_errl, TRBOOT_COMP_ID); delete iv_errl; iv_errl = NULL; diff --git a/src/usr/secureboot/trusted/base/trustedboot_base.C b/src/usr/secureboot/trusted/base/trustedboot_base.C index b94484bb8..2ec67ef81 100644 --- a/src/usr/secureboot/trusted/base/trustedboot_base.C +++ b/src/usr/secureboot/trusted/base/trustedboot_base.C @@ -57,7 +57,7 @@ // ---------------------------------------------- trace_desc_t* g_trac_trustedboot = nullptr; -TRAC_INIT( & g_trac_trustedboot, "TRBOOT", KILOBYTE ); +TRAC_INIT( & g_trac_trustedboot, TRBOOT_COMP_NAME, KILOBYTE ); namespace TRUSTEDBOOT { @@ -156,6 +156,7 @@ errlHndl_t pcrExtendSeparator(bool i_sendAsync) 0, true); err->collectTrace(SECURE_COMP_NAME); + err->collectTrace(TRBOOT_COMP_NAME); } delete msg; msg = NULL; @@ -180,6 +181,7 @@ errlHndl_t pcrExtendSeparator(bool i_sendAsync) 0, true); err->collectTrace(SECURE_COMP_NAME); + err->collectTrace(TRBOOT_COMP_NAME); } } @@ -264,6 +266,7 @@ errlHndl_t pcrExtend(TPM_Pcr i_pcr, 0, true); err->collectTrace(SECURE_COMP_NAME); + err->collectTrace(TRBOOT_COMP_NAME); } delete msg; msg = NULL; @@ -288,6 +291,7 @@ errlHndl_t pcrExtend(TPM_Pcr i_pcr, 0, true); err->collectTrace(SECURE_COMP_NAME); + err->collectTrace(TRBOOT_COMP_NAME); } } diff --git a/src/usr/secureboot/trusted/test/tpmLogMgrTest.H b/src/usr/secureboot/trusted/test/tpmLogMgrTest.H index 988103928..0e67056a8 100755 --- a/src/usr/secureboot/trusted/test/tpmLogMgrTest.H +++ b/src/usr/secureboot/trusted/test/tpmLogMgrTest.H @@ -56,7 +56,7 @@ class TPMLogMgrTest: public CxxTest::TestSuite if( NULL != err ) { TS_FAIL( "getTestLogMgr - Error detected" ); - errlCommit( err, SECURE_COMP_ID ); + errlCommit( err, TRBOOT_COMP_ID ); delete err; err = NULL; } @@ -157,7 +157,7 @@ class TPMLogMgrTest: public CxxTest::TestSuite TS_FAIL( "testTPMLogMgrAllocate(%d) - " "Error detected adding event", idx); errlCommit( err, - SECURE_COMP_ID ); + TRBOOT_COMP_ID ); delete err; err = NULL; break; @@ -223,7 +223,7 @@ class TPMLogMgrTest: public CxxTest::TestSuite { TS_FAIL("addTestLogEvent - Failed to addEvent with message = %s", i_logMsg); - errlCommit( err, SECURE_COMP_ID ); + errlCommit( err, TRBOOT_COMP_ID ); delete err; err = NULL; } diff --git a/src/usr/secureboot/trusted/test/trustedbootTest.H b/src/usr/secureboot/trusted/test/trustedbootTest.H index c092675a4..0a8e181ca 100755 --- a/src/usr/secureboot/trusted/test/trustedbootTest.H +++ b/src/usr/secureboot/trusted/test/trustedbootTest.H @@ -865,7 +865,7 @@ class TrustedBootTest: public CxxTest::TestSuite fails++; TS_FAIL( "testReadPCR: Error detected" ); errlCommit( err, - SECURE_COMP_ID ); + TRBOOT_COMP_ID ); delete err; err = nullptr; break; diff --git a/src/usr/secureboot/trusted/trustedboot.C b/src/usr/secureboot/trusted/trustedboot.C index 93ba27ed8..b135d0513 100644 --- a/src/usr/secureboot/trusted/trustedboot.C +++ b/src/usr/secureboot/trusted/trustedboot.C @@ -535,7 +535,7 @@ void tpmInitialize(TRUSTEDBOOT::TpmTarget* const i_pTpm) { tpmMarkFailed(i_pTpm); // Log this failure - errlCommit(err, SECURE_COMP_ID); + errlCommit(err, TRBOOT_COMP_ID); } TRACDCOMP( g_trac_trustedboot, @@ -585,6 +585,7 @@ void tpmReplayLog(TRUSTEDBOOT::TpmTarget* const i_pTpm) true /*Add HB SW Callout*/ ); err->collectTrace( SECURE_COMP_NAME ); + err->collectTrace(TRBOOT_COMP_NAME); break; } @@ -619,7 +620,7 @@ void tpmReplayLog(TRUSTEDBOOT::TpmTarget* const i_pTpm) if (err) { tpmMarkFailed(i_pTpm); - errlCommit(err, SECURE_COMP_ID); + errlCommit(err, TRBOOT_COMP_ID); delete err; err = nullptr; } @@ -829,7 +830,7 @@ void pcrExtendSingleTpm(TpmTarget* const i_pTpm, tpmMarkFailed(i_pTpm); // Log this failure - errlCommit(err, SECURE_COMP_ID); + errlCommit(err, TRBOOT_COMP_ID); } if (unlock) @@ -951,7 +952,7 @@ void pcrExtendSeparator(TpmTarget* const i_pTpm) tpmMarkFailed(i_pTpm); // Log this failure - errlCommit(err, SECURE_COMP_ID); + errlCommit(err, TRBOOT_COMP_ID); } if (unlock) @@ -1071,7 +1072,7 @@ void tpmMarkFailed(TpmTarget* const i_pTpm) ERRORLOG::ErrlUserDetailsTarget(l_proc).addToLog(l_err); // commit this error log first before creating the new one - errlCommit(l_err, SECURE_COMP_ID); + errlCommit(l_err, TRBOOT_COMP_ID); /*@ * @errortype @@ -1097,13 +1098,14 @@ void tpmMarkFailed(TpmTarget* const i_pTpm) HWAS::GARD_NULL); l_err->collectTrace(SECURE_COMP_NAME); + l_err->collectTrace(TRBOOT_COMP_NAME); // pass on the plid from the previous error log to the new one l_err->plid(plid); ERRORLOG::ErrlUserDetailsTarget(l_proc).addToLog(l_err); - ERRORLOG::errlCommit(l_err, SECURE_COMP_ID); + ERRORLOG::errlCommit(l_err, TRBOOT_COMP_ID); } #endif } @@ -1125,7 +1127,7 @@ void tpmVerifyFunctionalTpmExists() err = SECUREBOOT::getJumperState(l_state); if (err) { - errlCommit(err, SECURE_COMP_ID); + errlCommit(err, TRBOOT_COMP_ID); auto errPlid = err->plid(); @@ -1153,6 +1155,7 @@ void tpmVerifyFunctionalTpmExists() err->addProcedureCallout(HWAS::EPUB_PRC_HB_CODE, HWAS::SRCI_PRIORITY_LOW); err->collectTrace( SECURE_COMP_NAME ); + err->collectTrace(TRBOOT_COMP_NAME); uint32_t errPlid = err->plid(); // HW callout TPMs @@ -1165,7 +1168,7 @@ void tpmVerifyFunctionalTpmExists() HWAS::NO_DECONFIG, HWAS::GARD_NULL); } - errlCommit(err, SECURE_COMP_ID); + errlCommit(err, TRBOOT_COMP_ID); // terminating the IPL with this fail // Terminate IPL immediately INITSERVICE::doShutdown(errPlid); @@ -1314,9 +1317,10 @@ void* tpmDaemon(void* unused) 0, true); err->collectTrace(SECURE_COMP_NAME); + err->collectTrace(TRBOOT_COMP_NAME); // Log this failure here since we can't reply to caller - errlCommit(err, SECURE_COMP_ID); + errlCommit(err, TRBOOT_COMP_ID); } } diff --git a/src/usr/secureboot/trusted/trustedbootUtils.C b/src/usr/secureboot/trusted/trustedbootUtils.C index 6ba0d6c19..62f1c8d74 100644 --- a/src/usr/secureboot/trusted/trustedbootUtils.C +++ b/src/usr/secureboot/trusted/trustedbootUtils.C @@ -93,6 +93,7 @@ errlHndl_t tpmCreateErrorLog(const uint8_t i_modId, i_user2, true /*Add HB SW Callout*/ ); err->collectTrace( SECURE_COMP_NAME ); + err->collectTrace(TRBOOT_COMP_NAME); return err; } |