Disable OCC load from resv memory until FSP adds OCC pnor support

Change-Id: I751145be188d1d74f5465315c07495cac92781d2 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/46267 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Michael Baiocchi <mbaiocch@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: Daniel M. Crowell <dcrowell@us.ibm.com>
open-power · Sep 19, 2017 · 88342b0 · 88342b0
1 parent 97f44cc
commit 88342b0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/usr/runtime/populate_hbruntime.C b/src/usr/runtime/populate_hbruntime.C
@@ -1178,11 +1178,15 @@ errlHndl_t populate_HbRsvMem(uint64_t i_nodeId)
         //   -- HCODE
         // -- Non-verified Images
         ///  -- RINGOVD
-        l_elog = hbResvLoadSecureSection(PNOR::OCC, i_nodeId,
-                                         l_prevDataAddr, l_prevDataSize);
-        if (l_elog)
+        // @TODO CQ:SW400352 add OCC PNOR support for fsp back
+        if (!INITSERVICE::spBaseServicesEnabled())
         {
-            break;
+            l_elog = hbResvLoadSecureSection(PNOR::OCC, i_nodeId,
+                                             l_prevDataAddr, l_prevDataSize);
+            if (l_elog)
+            {
+                break;
+            }
         }
         l_elog = hbResvLoadSecureSection(PNOR::WOFDATA, i_nodeId,
                                          l_prevDataAddr, l_prevDataSize);

diff --git a/src/usr/util/runtime/utillidmgr_rt.C b/src/usr/util/runtime/utillidmgr_rt.C
@@ -327,6 +327,14 @@ const uint32_t * UtilLidMgr::getLidList(size_t * o_num)
 
 bool UtilLidMgr::lidInHbResvMem(const uint32_t i_lidId) const
 {
+    // @TODO CQ:SW400352 Remove this when fsp adds in PNOR support
+    // hostboot could not verify it from pnor, so it is not in hb resv meomory
+    if (iv_spBaseServicesEnabled &&
+        (i_lidId == Util::OCC_LIDID || i_lidId == Util::OCC_CONTAINER_LIDID))
+    {
+        return false;
+    }
+
     return i_lidId == Util::OCC_LIDID ||
            i_lidId == Util::OCC_CONTAINER_LIDID ||
            i_lidId == Util::WOF_LIDID ||