From c336a77283197bd63475f0773b78473c7c239567 Mon Sep 17 00:00:00 2001 From: Stephen Cprek Date: Fri, 17 Nov 2017 15:49:30 -0600 Subject: Handle comments from pre-verify and runtime lid loading commits Change-Id: I224079808493c062f04b7c3a59d45128a8f2e699 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/49875 Tested-by: Jenkins Server Reviewed-by: Michael Baiocchi Reviewed-by: Nicholas E. Bofferding Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins Reviewed-by: Daniel M. Crowell --- src/include/usr/runtime/common/runtime_utils.H | 3 +++ src/include/usr/runtime/populate_hbruntime.H | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'src/include/usr/runtime') diff --git a/src/include/usr/runtime/common/runtime_utils.H b/src/include/usr/runtime/common/runtime_utils.H index c7f318bc1..afb88bd47 100644 --- a/src/include/usr/runtime/common/runtime_utils.H +++ b/src/include/usr/runtime/common/runtime_utils.H @@ -29,7 +29,10 @@ namespace RUNTIME { +// Pair indicating if a PNOR section is expected to have a secure header +// regardless of the compiler options typedef std::pair PreVerifyPair; +// A vector of all PNOR sections that are pre-verified for runtime typedef std::vector PreVerifyVector; // PNOR sections that will be pre-verified and loaded into HB reserved memory diff --git a/src/include/usr/runtime/populate_hbruntime.H b/src/include/usr/runtime/populate_hbruntime.H index 9f0466172..c2c0c224e 100644 --- a/src/include/usr/runtime/populate_hbruntime.H +++ b/src/include/usr/runtime/populate_hbruntime.H @@ -70,13 +70,13 @@ errlHndl_t unmapVirtAddr(uint64_t i_addr); * @brief Pre verify Pnor sections and load into HB reserved memory * * @param[in] i_sec - pnor section to pre-verify and load - * @param[in] i_verified - Indicates if pnor section is expected to have a - * secure header. - * e.g. RINGOVD currently never has a secure header + * @param[in] i_secHdrExpected - Indicates if pnor section is expected to have + * a secure header. + * e.g. RINGOVD currently never has a secure header * * @return Error handle if error */ errlHndl_t hbResvLoadSecureSection (const PNOR::SectionId i_sec, - const bool i_verified); + const bool i_secHdrExpected); } // End of Namespace \ No newline at end of file -- cgit v1.2.1