Fix PNOR sections loaded into reserve-mem for non secure sys

Prevent the header page from being loaded into HB reserved memory
for unsigned PNOR sections with a header.

Change-Id: I0fe80edc1a171b3e3066348cbf64205041082e2b
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/48760
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Dean Sanner <dsanner@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 3 insertions, 12 deletions

diff --git a/src/usr/util/runtime/utillidmgr_rt.C b/src/usr/util/runtime/utillidmgr_rt.C
index 338f22b87..52490cac1 100644
--- a/src/usr/util/runtime/utillidmgr_rt.C
+++ b/src/usr/util/runtime/utillidmgr_rt.C
@@ -178,20 +178,11 @@ errlHndl_t UtilLidMgr::loadLid()
                 else
                 {
                     // If no secure header, just use PNOR size
+                    // NOTE: Unsigned sections with sha512Version have already
+                    //       skipped over the header and decreased size while
+                    //       parsing the PNOR TOC
                     iv_lidSize = iv_lidPnorInfo.size;
                     UTIL_FT("UtilLidMgr::loadLid - iv_lidSize=%d", iv_lidSize );
-
-                    // Need to increment past header if one exists
-                    if (iv_lidPnorInfo.sha512Version)
-                    {
-                        UTIL_FT("UtilLidMgr::loadLid - resv mem section is not secure, but has header");
-                        // Increment by page size to not expose sha512 version header
-                        iv_lidBuffer = static_cast<uint8_t*>(iv_lidBuffer) +
-                                       PAGESIZE;
-                        iv_lidSize -= PAGESIZE;
-                        UTIL_FT("UtilLidMgr::loadLid - iv_lidSize=%d",
-                                iv_lidSize );
-                    }
                 }
             }
         }