summaryrefslogtreecommitdiffstats
path: root/src/usr/runtime
diff options
context:
space:
mode:
authorStephen Cprek <smcprek@us.ibm.com>2017-09-15 09:51:21 -0500
committerDaniel M. Crowell <dcrowell@us.ibm.com>2017-09-19 16:43:56 -0400
commit88342b08a1281b0244ba6cff72d64679319589a4 (patch)
tree51c78b7aa2974a5898e3c3ec92731086d5a9f09f /src/usr/runtime
parent97f44cca542f90537956f5f3932c3fdd1a4a829c (diff)
downloadtalos-hostboot-88342b08a1281b0244ba6cff72d64679319589a4.tar.gz
talos-hostboot-88342b08a1281b0244ba6cff72d64679319589a4.zip
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>
Diffstat (limited to 'src/usr/runtime')
-rw-r--r--src/usr/runtime/populate_hbruntime.C12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/usr/runtime/populate_hbruntime.C b/src/usr/runtime/populate_hbruntime.C
index 4a838ca15..dbf35db96 100644
--- 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);
OpenPOWER on IntegriCloud