diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/securerom/ROM.H | 8 | ||||
| -rw-r--r-- | src/include/usr/pnor/pnor_const.H | 4 | ||||
| -rw-r--r-- | src/include/usr/pnor/pnor_reasoncodes.H | 7 | ||||
| -rw-r--r-- | src/include/usr/pnor/pnorif.H | 1 |
4 files changed, 11 insertions, 9 deletions
diff --git a/src/include/securerom/ROM.H b/src/include/securerom/ROM.H index f4cf76528..0d97537e0 100644 --- a/src/include/securerom/ROM.H +++ b/src/include/securerom/ROM.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016,2018 */ +/* Contributors Listed Below - COPYRIGHT 2016,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -284,7 +284,7 @@ enum HW_SB_FLAGS // SW Security Flags enum SW_SB_FLAGS { - // placeholder + HASH_PAGE_TABLE_FLAG = 0x80000000 }; // Structure to store all hw and sw flag values in a container header @@ -295,7 +295,8 @@ struct sb_flags_t hw_opal(false), hw_phyp(false), hw_lab_override(false), - hw_key_transition(false) + hw_key_transition(false), + sw_hash(false) { } @@ -305,6 +306,7 @@ struct sb_flags_t bool hw_lab_override; ///< Whether to enable lab security override; ///< Only applicable for SBE partition bool hw_key_transition; ///< Indicates this is a key transition container + bool sw_hash; ///< Indicates presence of hash page table }; /** diff --git a/src/include/usr/pnor/pnor_const.H b/src/include/usr/pnor/pnor_const.H index 41d1ebdee..44050eb50 100644 --- a/src/include/usr/pnor/pnor_const.H +++ b/src/include/usr/pnor/pnor_const.H @@ -111,7 +111,8 @@ struct SectionInfo_t reprovision(false), Volatile(false), secure(false), - clearOnEccErr(false) + clearOnEccErr(false), + hasHashTable(false) {} SectionId id; /**< Identifier for this section */ const char* name; /**< Name of the section */ @@ -126,6 +127,7 @@ struct SectionInfo_t bool Volatile; /**< Section loses contents on non HB reboots */ bool secure; /**< Indicates if a section is secure */ bool clearOnEccErr; /**< Indicates on ECC errors, clear and reboot*/ + bool hasHashTable; /**< Indicates if there exists a hash page table*/ size_t secureProtectedPayloadSize; /**< Cache the secure payload size so that the secure container only needs to be parsed once */ diff --git a/src/include/usr/pnor/pnor_reasoncodes.H b/src/include/usr/pnor/pnor_reasoncodes.H index fb7435a33..10c3e7b22 100644 --- a/src/include/usr/pnor/pnor_reasoncodes.H +++ b/src/include/usr/pnor/pnor_reasoncodes.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2011,2018 */ +/* Contributors Listed Below - COPYRIGHT 2011,2019 */ /* [+] Google Inc. */ /* [+] International Business Machines Corp. */ /* */ @@ -98,8 +98,7 @@ namespace PNOR MOD_PNORCOMMON_PARSETOC = 0xC0, /**< PNOR::parseTOC */ // spnorrp.C - // Note: 0xD0 is available, so should be the next one used for spnorrp. - // Remove this comment after doing so. + MOD_SPNORRP_VERIFY_PAGE = 0xD0, /**< SPnorRP::verify_page */ MOD_SPNORRP_DIDSTARTUPFAIL = 0xD1, /**< didSecureStartupFail(rc) */ MOD_SPNORRP_ALLOCATE_BLOCK = 0xD2, /**< SPnorRP::initDaemon */ MOD_SPNORRP_WAITFORMESSAGE = 0xD3, /**< SPnorRP::waitForMessage */ @@ -192,7 +191,7 @@ namespace PNOR RC_NOT_PAGE_ALIGNED = PNOR_COMP_ID | 0x3B, RC_SECURE_PRO_SIZE_MISMATCH = PNOR_COMP_ID | 0x3C, RC_READ_ONLY_PERM_FAIL = PNOR_COMP_ID | 0x3D, - + RC_VERIFY_PAGE_FAILED = PNOR_COMP_ID | 0x3E, //@fixme-RTC:131607-Temporary value to allow HWSV compile //termination_rc RC_PNOR_CORRUPTION = PNOR_COMP_ID | 0x99, diff --git a/src/include/usr/pnor/pnorif.H b/src/include/usr/pnor/pnorif.H index 11cc98a10..835c100d7 100644 --- a/src/include/usr/pnor/pnorif.H +++ b/src/include/usr/pnor/pnorif.H @@ -269,7 +269,6 @@ bool cmpSecurebootMagicNumber(const uint8_t* i_vaddr); * False otherwise. */ bool isSectionEmpty(const PNOR::SectionId i_section); - } // PNOR #endif |
