diff options
Diffstat (limited to 'src/usr/errl')
| -rw-r--r-- | src/usr/errl/errlentry.C | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/src/usr/errl/errlentry.C b/src/usr/errl/errlentry.C index b1715ad41..072a31ac1 100644 --- a/src/usr/errl/errlentry.C +++ b/src/usr/errl/errlentry.C @@ -48,6 +48,7 @@ #include <errl/errludattribute.H> #include <errl/errludstate.H> #include <trace/interface.H> +#include <config.h> #include "../trace/entry.H" #include <util/align.H> @@ -667,16 +668,21 @@ void ErrlEntry::addHbBuildId() void ErrlEntry::addVersionInfo() { + +// Start of IPL only block; runtime does not support secure loading of +// partitions +#ifndef __HOSTBOOT_RUNTIME + // Version section of PNOR is only available to OpenPOWER systems. - if (!INITSERVICE::spBaseServicesEnabled()) + if ( !INITSERVICE::spBaseServicesEnabled() + && PNOR::isSectionAvailable(PNOR::VERSION)) { - //TODO: CQ:SW416159 Uncomment when merged - // bool l_secureSectionLoaded = false; - errlHndl_t l_errl = nullptr/*, l_errl_loadSecureSection = nullptr*/; + bool l_secureSectionLoaded = false; + errlHndl_t l_errl = nullptr, l_errl_loadSecureSection = nullptr; do { -/* TODO: CQ:SW416159 Uncomment when merged + #ifdef CONFIG_SECUREBOOT l_errl_loadSecureSection = PNOR::loadSecureSection(PNOR::VERSION); if (l_errl_loadSecureSection) @@ -698,7 +704,7 @@ void ErrlEntry::addVersionInfo() l_secureSectionLoaded = true; } #endif -*/ + // Get PNOR Version PNOR::SectionInfo_t l_pnorVersionInfo; l_errl = getSectionInfo(PNOR::VERSION, l_pnorVersionInfo); @@ -737,7 +743,6 @@ void ErrlEntry::addVersionInfo() ErrlUserDetailsString(l_pVersionString).addToLog(this); } while(0); -/* TODO: CQ:SW416159 Uncomment when merged #ifdef CONFIG_SECUREBOOT if (l_secureSectionLoaded) { @@ -757,9 +762,11 @@ void ErrlEntry::addVersionInfo() } } #endif -*/ + } +#endif // End of IPL only block + } enum { |
