diff options
Diffstat (limited to 'src/usr/isteps')
| -rw-r--r-- | src/usr/isteps/istep06/call_host_update_master_tpm.C | 19 | ||||
| -rw-r--r-- | src/usr/isteps/istep10/call_host_update_redundant_tpm.C | 24 |
2 files changed, 38 insertions, 5 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 d378d9cd7..b08ca5bce 100644 --- a/src/usr/isteps/istep06/call_host_update_master_tpm.C +++ b/src/usr/isteps/istep06/call_host_update_master_tpm.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -30,6 +30,7 @@ #include <isteps/hwpisteperror.H> #include <trustedbootif.H> #include <initservice/isteps_trace.H> +#include <secureboot/service.H> namespace ISTEP_06 { @@ -41,17 +42,29 @@ void* call_host_update_master_tpm( void *io_pArgs ) TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_host_update_master_tpm entry" ); -#ifdef CONFIG_TPMDD errlHndl_t l_err = NULL; + +#ifdef CONFIG_TPMDD // Initialize the master TPM l_err = (errlHndl_t)TRUSTEDBOOT::host_update_master_tpm(io_pArgs); if (l_err) { l_stepError.addErrorDetails(l_err); - errlCommit( l_err, SECURE_COMP_ID ); + ERRORLOG::errlCommit( l_err, SECURE_COMP_ID ); } #endif + l_err = SECUREBOOT::traceSecuritySettings(true); + if (l_err) + { + TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + "call_host_update_master_tpm: Error back from " + "SECUREBOOT::traceSecuritySettings: rc=0x%X, plid=0x%X", + ERRL_GETRC_SAFE(l_err), ERRL_GETPLID_SAFE(l_err)); + l_stepError.addErrorDetails(l_err); + ERRORLOG::errlCommit( l_err, SECURE_COMP_ID ); + } + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_host_update_master_tpm exit" ); diff --git a/src/usr/isteps/istep10/call_host_update_redundant_tpm.C b/src/usr/isteps/istep10/call_host_update_redundant_tpm.C index 2d9a8a8cd..ffdf52980 100644 --- a/src/usr/isteps/istep10/call_host_update_redundant_tpm.C +++ b/src/usr/isteps/istep10/call_host_update_redundant_tpm.C @@ -55,6 +55,25 @@ namespace ISTEP_10 { void* call_host_update_redundant_tpm (void *io_pArgs) { + TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, + ENTER_MRK"call_host_update_redundant_tpm"); + + errlHndl_t err = nullptr; + + // Before update procedure, trace security settings + err = SECUREBOOT::traceSecuritySettings(); + if (err) + { + TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + "call_host_update_redundant_tpm: Error back from " + "SECUREBOOT::traceSecuritySettings: rc=0x%X, plid=0x%X", + ERRL_GETRC_SAFE(err), ERRL_GETPLID_SAFE(err)); + + // Commit log, but continue + ERRORLOG::errlCommit( err, SECURE_COMP_ID ); + } + + // Start of update procedure #ifdef CONFIG_SECUREBOOT do { @@ -103,8 +122,6 @@ void* call_host_update_redundant_tpm (void *io_pArgs) >(l_protectTpm); } - errlHndl_t err = nullptr; - const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP> l_fapiTarg(pProc); FAPI_INVOKE_HWP(err, p9_update_security_ctrl, l_fapiTarg); @@ -169,6 +186,9 @@ void* call_host_update_redundant_tpm (void *io_pArgs) #endif // CONFIG_SECUREBOOT + TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, + EXIT_MRK"call_host_update_redundant_tpm"); + return nullptr; } |
