diff options
author | Matt Derksen <mderkse1@us.ibm.com> | 2019-04-11 14:19:23 -0500 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2019-04-12 15:00:04 -0500 |
commit | b6e503999c4cc5404f9b485c8109fa667919bbf5 (patch) | |
tree | c16bf5df9924e2411ded84242321d13d7e4762db | |
parent | 882f15ebfdcd4edf4a053b1d4171133daee04e95 (diff) | |
download | blackbird-hostboot-b6e503999c4cc5404f9b485c8109fa667919bbf5.tar.gz blackbird-hostboot-b6e503999c4cc5404f9b485c8109fa667919bbf5.zip |
Allow update of zeroed NVDIMM level
Version 00 means the slot is blank,
so a code update should be allowed.
Change-Id: I0dc685ff72c699e1c3062a5b92e8679516305ca4
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/75889
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>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: TSUNG K. YEUNG <tyeung@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
-rw-r--r-- | src/usr/isteps/nvdimm/nvdimm_update.C | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/usr/isteps/nvdimm/nvdimm_update.C b/src/usr/isteps/nvdimm/nvdimm_update.C index 8f95fb27f..2e1f61c8c 100644 --- a/src/usr/isteps/nvdimm/nvdimm_update.C +++ b/src/usr/isteps/nvdimm/nvdimm_update.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2018 */ +/* Contributors Listed Below - COPYRIGHT 2018,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -2031,8 +2031,8 @@ errlHndl_t NvdimmsUpdate::isUpdateNeeded(bool & o_update_needed, // Put a check here for non-updateable SMART NVDIMMs. // Anything before 0x0030 should bypass the update, as update // would fail due to a bug in the backlevel firmware on the - // nvdimm card - if (le16toh(curVersion) < 0x0030) + // nvdimm card (exception: 0x0000 = slot blank so allow update) + if ((curVersion != 0x0000) && (le16toh(curVersion) < 0x0030)) { TRACFCOMP(g_trac_nvdimm_upd, "isUpdateNeeded(): non-updatable SMART NVDIMM 0x%.8X " |