diff options
Diffstat (limited to 'src/usr/pnor')
| -rw-r--r-- | src/usr/pnor/pnor_common.C | 3 | ||||
| -rw-r--r-- | src/usr/pnor/pnorrp.C | 8 | ||||
| -rw-r--r-- | src/usr/pnor/test/pnorrptest.H | 12 |
3 files changed, 18 insertions, 5 deletions
diff --git a/src/usr/pnor/pnor_common.C b/src/usr/pnor/pnor_common.C index 2c491d990..2eb710a16 100644 --- a/src/usr/pnor/pnor_common.C +++ b/src/usr/pnor/pnor_common.C @@ -387,7 +387,8 @@ bool PNOR::isInhibitedSection(const uint32_t i_section) { #ifdef CONFIG_SECUREBOOT return (i_section == ATTR_PERM || - i_section == ATTR_TMP) && + i_section == ATTR_TMP || + i_section == RINGOVD ) && SECUREBOOT::enabled(); #else return false; diff --git a/src/usr/pnor/pnorrp.C b/src/usr/pnor/pnorrp.C index 0326bb1e1..bd8609416 100644 --- a/src/usr/pnor/pnorrp.C +++ b/src/usr/pnor/pnorrp.C @@ -509,17 +509,17 @@ errlHndl_t PnorRP::getSectionInfo( PNOR::SectionId i_section, || l_inhibited ) { - TRACFCOMP( g_trac_pnor, "PnorRP::getSectionInfo> Invalid Section Requested : i_section=%d", i_section ); + TRACFCOMP( g_trac_pnor, "PnorRP::getSectionInfo> Invalid Section Requested : i_section=%d (%s)", i_section, SectionIdToString(id)); #ifdef CONFIG_SECUREBOOT if (l_inhibited) { TRACFCOMP( g_trac_pnor, "PnorRP::getSectionInfo> " - "attribute override inhibited by secureboot"); + "attribute overrides inhibited by secureboot"); } #endif uint64_t size = iv_TOC[i_section].size; - TRACFCOMP(g_trac_pnor, "o_info={ id=%d, size=%d }", - iv_TOC[i_section].id, size ); + TRACFCOMP(g_trac_pnor, "o_info={ id=%d, size=%d , name=%s}", + iv_TOC[i_section].id, size, SectionIdToString(id) ); /*@ * @errortype * @moduleid PNOR::MOD_PNORRP_GETSECTIONINFO diff --git a/src/usr/pnor/test/pnorrptest.H b/src/usr/pnor/test/pnorrptest.H index f3d94ef99..d42ce93a5 100644 --- a/src/usr/pnor/test/pnorrptest.H +++ b/src/usr/pnor/test/pnorrptest.H @@ -41,6 +41,7 @@ #include <sys/mm.h> #include <targeting/common/targetservice.H> #include <devicefw/userif.H> +#include <config.h> #include <pnor/ecc.H> #include "../pnorrp.H" #include "../pnor_common.H" @@ -78,7 +79,18 @@ class PnorRpTest : public CxxTest::TestSuite for( uint64_t idx = 0; idx < numSections; idx++) { + // RINGOVD is not supported when secureboot is enabled, but rather + // than looking for the expected fail like non-test code does, just + // skip testing RINGOVD in this scenario + if ( ( testSections[idx] == PNOR::RINGOVD ) && + ( SECUREBOOT::enabled() ) ) + { + TRACFCOMP(g_trac_pnor, "PnorRpTest::test_sectionInfo> Skipping RINGOVD since Security is enabled"); + continue; + } + total++; + errhdl = PNOR::getSectionInfo( testSections[idx], info ); if( errhdl ) { |
