diff options
| author | Matt Derksen <mderkse1@us.ibm.com> | 2019-01-29 10:04:26 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2019-03-01 15:11:42 -0600 |
| commit | 2df122342fae6aef5c971218acfe994cd523d251 (patch) | |
| tree | 8cdb6560b0d24221a43500fa9ad5d098365c0f04 /src | |
| parent | 518a05ca5136d3b2149ed6502871a7de52d9b794 (diff) | |
| download | blackbird-hostboot-2df122342fae6aef5c971218acfe994cd523d251.tar.gz blackbird-hostboot-2df122342fae6aef5c971218acfe994cd523d251.zip | |
Use NVDIMM lids for update
This will enable grabbing NVDIMM images from
lids.
Change-Id: I7b8da696dd629ba41834a98e9e2cc1b9c0d872b4
CMVC-Prereq: 1075393
RTC: 201197
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/71045
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Roland Veloz <rveloz@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@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')
| -rw-r--r-- | src/include/usr/util/utillidmgr.H | 7 | ||||
| -rw-r--r-- | src/usr/isteps/nvdimm/nvdimm_update.C | 16 |
2 files changed, 5 insertions, 18 deletions
diff --git a/src/include/usr/util/utillidmgr.H b/src/include/usr/util/utillidmgr.H index abd77a81f..64e77cfd3 100644 --- a/src/include/usr/util/utillidmgr.H +++ b/src/include/usr/util/utillidmgr.H @@ -61,11 +61,8 @@ enum LidId HCODE_CONTAINER_LIDID = 0x80d0000c, HWREFIMG_RINGOVD_LIDID = 0x81e00620, TARGETING_BINARY_LIDID = 0x81e00630, - - // two lids for 16GB and 32GB NVDIMMs - // @todo RTC 201197 - update when valid lids are created - NVDIMM_16GB_LIDID = 0xBADBAD16, - NVDIMM_32GB_LIDID = 0xBADBAD32, + NVDIMM_16GB_LIDID = 0x81e00640, + NVDIMM_32GB_LIDID = 0x81e00641, INVALID_LIDID = 0xFFFFFFFF }; diff --git a/src/usr/isteps/nvdimm/nvdimm_update.C b/src/usr/isteps/nvdimm/nvdimm_update.C index a3191cb53..27ab0be58 100644 --- a/src/usr/isteps/nvdimm/nvdimm_update.C +++ b/src/usr/isteps/nvdimm/nvdimm_update.C @@ -337,13 +337,7 @@ bool NvdimmsUpdate::runUpdate(void) Util::NVDIMM_16GB_LIDID, ERRL_GETRC_SAFE(l_err), ERRL_GETPLID_SAFE(l_err)); - - // @todo RTC 201197 - enable when valid LIDs are present - //commitPredictiveNvdimmError(l_err); - delete l_err; - l_err = nullptr; - // -------------------------------- // - + commitPredictiveNvdimmError(l_err); o_no_error_found = false; // leaving pSmallLid object so don't continuously post the // same error for each NVDIMM @@ -366,12 +360,7 @@ bool NvdimmsUpdate::runUpdate(void) Util::NVDIMM_32GB_LIDID, ERRL_GETRC_SAFE(l_err), ERRL_GETPLID_SAFE(l_err)); - - // @todo RTC 201197 - enable when valid LIDs are present - //commitPredictiveNvdimmError(l_err); - delete l_err; - l_err = nullptr; - // -------------------------------- // + commitPredictiveNvdimmError(l_err); o_no_error_found = false; // leaving pLargeLid object so don't continuously post the // same error for each NVDIMM @@ -413,6 +402,7 @@ bool NvdimmsUpdate::runUpdate(void) l_err->addProcedureCallout( HWAS::EPUB_PRC_HB_CODE, HWAS::SRCI_PRIORITY_LOW ); ERRORLOG::errlCommit(l_err, NVDIMM_COMP_ID); + o_no_error_found = false; pCurLid = nullptr; continue; } |
