allow lid to be read from pnor at runtime

RTC:116595
Change-Id: I446c314e6675227293e50121b47d091276b817b0
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/15000
Tested-by: Jenkins Server
Reviewed-by: STEPHEN M. CPREK <smcprek@us.ibm.com>
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 16 insertions, 22 deletions

diff --git a/src/include/usr/util/utillidmgr.H b/src/include/usr/util/utillidmgr.H
index f36d8fbe1..ae37c1164 100644
--- a/src/include/usr/util/utillidmgr.H
+++ b/src/include/usr/util/utillidmgr.H
@@ -175,6 +175,11 @@ class UtilLidMgr
     */
    errlHndl_t cleanup();
 
+    /**
+     * @brief value indicating if lid is in its own pnor partition
+     *
+     */
+    bool iv_isLidInPnor;
 #ifndef __HOSTBOOT_RUNTIME
     /**
      *  @brief Get LID Size PNOR
@@ -318,17 +323,6 @@ class UtilLidMgr
      */
     msg_q_t iv_HbMsgQ;
 
-    /**
-     *  @brief search lidToPnor array for the pnor section for the given lid
-     *         lidToPnor array does not includes the ext img section
-     *
-     *  @param[in] i_lidId          - provide lid id to search for
-     *  @param[out] o_lidPnorInfo   - pnor section that the lid is in
-     *
-     *  @return bool - True if lid is in a section, false otherwise
-    */
-    bool getLidPnorSection(uint32_t i_lidId,
-                           PNOR::SectionInfo_t &o_lidPnorInfo);
 
 #else // __HOSTBOOT_RUNTIME
 
@@ -338,11 +332,6 @@ class UtilLidMgr
     errlHndl_t loadLid();
 
     /**
-     * @brief Cached value of the LID location.  (Host vs PNOR)
-     */
-    bool iv_isPnor;
-
-    /**
      * @brief Pointer to the buffer containing the LID.
      */
     void* iv_lidBuffer;
@@ -350,6 +339,17 @@ class UtilLidMgr
 #endif // __HOSTBOOT_RUNTIME
 
     /**
+     *  @brief search lidToPnor array for the pnor section for the given lid
+     *         lidToPnor array does not includes the ext img section
+     *
+     *  @param[in] i_lidId          - provide lid id to search for
+     *  @param[out] o_lidPnorInfo   - pnor section that the lid is in
+     *
+     *  @return bool - True if lid is in a section, false otherwise
+    */
+    bool getLidPnorSection(uint32_t i_lidId,
+                           PNOR::SectionInfo_t &o_lidPnorInfo);
+    /**
      * @brief LID fileName
      */
     char iv_lidFileName[16];
@@ -371,12 +371,6 @@ class UtilLidMgr
     PNOR::SectionInfo_t iv_lidPnorInfo;
 
     /**
-     * @brief value indicating if lid is in its own pnor partition
-     *
-     */
-    bool iv_isLidInPnor;
-
-    /**
      * @brief value indicating if a fsp exists
      */
     bool iv_spBaseServicesEnabled;