diff options
author | Dan Crowell <dcrowell@us.ibm.com> | 2017-05-05 13:55:06 -0500 |
---|---|---|
committer | Matthew A. Ploetz <maploetz@us.ibm.com> | 2017-05-16 09:41:55 -0400 |
commit | 1f81cfb64752bf4b9139404856f6f9b7dc7acf1e (patch) | |
tree | 655a689a58a0f73a21d51448d02ca9319a38a771 | |
parent | 0db8285dd2c26790529646b0b2eb9b07bf2f0d68 (diff) | |
download | talos-hostboot-1f81cfb64752bf4b9139404856f6f9b7dc7acf1e.tar.gz talos-hostboot-1f81cfb64752bf4b9139404856f6f9b7dc7acf1e.zip |
Reload lids at runtime from PNOR correctly
While reloading lids (e.g. OCC image) at runtime we need to
remember where we found the lid the first time (vfs, pnor, host).
Change-Id: I040d4f0acfd551951cffdae5d51445269910649c
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40167
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Sheldon R. Bailey <baileysh@us.ibm.com>
Reviewed-by: Matthew A. Ploetz <maploetz@us.ibm.com>
-rw-r--r-- | src/usr/util/runtime/utillidmgr_rt.C | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/usr/util/runtime/utillidmgr_rt.C b/src/usr/util/runtime/utillidmgr_rt.C index eaa79194b..c7b6f46ec 100644 --- a/src/usr/util/runtime/utillidmgr_rt.C +++ b/src/usr/util/runtime/utillidmgr_rt.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2013,2016 */ +/* Contributors Listed Below - COPYRIGHT 2013,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -109,8 +109,16 @@ errlHndl_t UtilLidMgr::getStoredLidImage(void*& o_pLidImage, errlHndl_t UtilLidMgr::releaseLidImage(void) { + // we already figured out where the data is, remember that + bool l_inPnor = iv_isLidInPnor; + bool l_inVFS = iv_isLidInVFS; + errlHndl_t l_err = cleanup(); + // restore the presence info + iv_isLidInPnor = l_inPnor; + iv_isLidInVFS = l_inVFS; + return l_err; } |