diff options
| author | Jaymes Wilks <mjwilks@us.ibm.com> | 2016-11-04 10:53:04 -0500 |
|---|---|---|
| committer | Matthew A. Ploetz <maploetz@us.ibm.com> | 2016-12-12 18:00:15 -0500 |
| commit | 3cc8333f39c18fc836a9b8fcf84535d6748d0b1e (patch) | |
| tree | c71b28c77d0df0da33ac0e2d1b87d2bfcf4290cc /src/usr/secureboot | |
| parent | 8f2f91b900739efa6acf737f720dfeb7059b30ba (diff) | |
| download | talos-hostboot-3cc8333f39c18fc836a9b8fcf84535d6748d0b1e.tar.gz talos-hostboot-3cc8333f39c18fc836a9b8fcf84535d6748d0b1e.zip | |
Secure PNORRP port resync from p8
Brings SPNORRP p9 up to date with the latest changes from p8.
Change-Id: I9e80199ffad1b3082339069264560029e83a3d78
RTC:163078
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/32260
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Reviewed-by: Stephen M. Cprek <smcprek@us.ibm.com>
Reviewed-by: Matthew A. Ploetz <maploetz@us.ibm.com>
Diffstat (limited to 'src/usr/secureboot')
| -rw-r--r-- | src/usr/secureboot/base/service.C | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/usr/secureboot/base/service.C b/src/usr/secureboot/base/service.C index ade0e4a9f..a557655f3 100644 --- a/src/usr/secureboot/base/service.C +++ b/src/usr/secureboot/base/service.C @@ -97,29 +97,29 @@ bool enabled() return Singleton<Settings>::instance().getEnabled(); } -void handleSecurebootFailure(errlHndl_t &i_err) +void handleSecurebootFailure(errlHndl_t &io_err, const bool i_waitForShutdown) { TRACFCOMP( g_trac_secure, ENTER_MRK"handleSecurebootFailure()"); - assert(i_err != NULL, "Secureboot Failure has a NULL error log") + assert(io_err != NULL, "Secureboot Failure has a NULL error log") // Grab errlog reason code before committing. - uint16_t l_rc = i_err->reasonCode(); + uint16_t l_rc = io_err->reasonCode(); #ifdef CONFIG_CONSOLE CONSOLE::displayf(SECURE_COMP_NAME, "Secureboot Failure plid = 0x%08X, rc = 0x%04X\n", - i_err->plid(), l_rc); + io_err->plid(), l_rc); #endif printk("Secureboot Failure plid = 0x%08X, rc = 0x%04X\n", - i_err->plid(),l_rc); + io_err->plid(),l_rc); // Add Verification callout - i_err->addProcedureCallout(HWAS::EPUB_PRC_FW_VERIFICATION_ERR, + io_err->addProcedureCallout(HWAS::EPUB_PRC_FW_VERIFICATION_ERR, HWAS::SRCI_PRIORITY_HIGH); - errlCommit(i_err, SECURE_COMP_ID); + errlCommit(io_err, SECURE_COMP_ID); // Shutdown with Secureboot error status - INITSERVICE::doShutdown(l_rc); + INITSERVICE::doShutdown(l_rc, !i_waitForShutdown); } -} +} //namespace SECUREBOOT |
