diff options
| author | Corey Swenson <cswenson@us.ibm.com> | 2016-07-14 12:36:41 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2016-07-27 14:34:23 -0400 |
| commit | 08bd1261d0be0ff0335c97e2d2f6b2d4c3ea2484 (patch) | |
| tree | a06f07c664ef4357814fffa1b9f8898c839072c7 /src/usr/util | |
| parent | 3d565d0fd7f4f05803e53ab7274008fa448030f6 (diff) | |
| download | talos-hostboot-08bd1261d0be0ff0335c97e2d2f6b2d4c3ea2484.tar.gz talos-hostboot-08bd1261d0be0ff0335c97e2d2f6b2d4c3ea2484.zip | |
More fixes for issues found during start_pm_complex
Change-Id: I6011f2e13f616ff939ce74efd3fabdb2113cbe46
RTC:133847
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/27094
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/util')
| -rw-r--r-- | src/usr/util/runtime/utillidmgr_rt.C | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/usr/util/runtime/utillidmgr_rt.C b/src/usr/util/runtime/utillidmgr_rt.C index 79eba6225..eaa79194b 100644 --- a/src/usr/util/runtime/utillidmgr_rt.C +++ b/src/usr/util/runtime/utillidmgr_rt.C @@ -223,15 +223,17 @@ void UtilLidMgr::updateLid(uint32_t i_lidId) { iv_lidId = i_lidId; - //if it's in PNOR, it's not technically lid, so use a slightly - //different extension. - if (g_hostInterfaces->pnor_read) + // Check if PNOR is access is supported + if (!g_hostInterfaces->pnor_read || + INITSERVICE::spBaseServicesEnabled()) { - iv_isLidInPnor = getLidPnorSection(iv_lidId, iv_lidPnorInfo); + iv_isLidInPnor = false; } else { - iv_isLidInPnor = false; + // If it's in PNOR it's not technically a lid + // so use a slightly different extension + iv_isLidInPnor = getLidPnorSection(iv_lidId, iv_lidPnorInfo); } sprintf(iv_lidFileName, "%x.lidbin", iv_lidId); iv_isLidInVFS = VFS::module_exists(iv_lidFileName); |
