diff options
| author | Tsung Yeung <tyeung@us.ibm.com> | 2019-08-26 09:33:35 -0500 |
|---|---|---|
| committer | Daniel M Crowell <dcrowell@us.ibm.com> | 2019-08-26 19:40:13 -0500 |
| commit | 80f6d1dc0597213782c0fcd159329f260761b27c (patch) | |
| tree | 5478057452d198c24090135d16ab22ee416ce6ba /src/usr/isteps | |
| parent | b94854d1f4aebe63361ee9baf6d3fa4e69b951ba (diff) | |
| download | talos-hostboot-80f6d1dc0597213782c0fcd159329f260761b27c.tar.gz talos-hostboot-80f6d1dc0597213782c0fcd159329f260761b27c.zip | |
Replaces nvdimmWrite() to reset controller with nvdimmResetController()
nvdimmResetController() will call nvdimm_encrypt_unlock() to unlock
encryption if needed. Without it nvdimm ops could fail on runtime
Change-Id: Iad4c4d354d3b9522ee0544b5c8de7484dcf89c6c
CQ:SW474050
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/82838
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: Matt Derksen <mderkse1@us.ibm.com>
Reviewed-by: Daniel M Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/isteps')
| -rw-r--r-- | src/usr/isteps/nvdimm/bpm_update.C | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/usr/isteps/nvdimm/bpm_update.C b/src/usr/isteps/nvdimm/bpm_update.C index c40c879e8..1749e4d43 100644 --- a/src/usr/isteps/nvdimm/bpm_update.C +++ b/src/usr/isteps/nvdimm/bpm_update.C @@ -3489,9 +3489,9 @@ errlHndl_t Bpm::runFirmwareUpdates(BpmFirmwareLidImage i_image) handleMultipleErrors(errl, exitErrl); } - exitErrl = nvdimmWriteReg(iv_nvdimm, - NVDIMM_MGT_CMD0, - 0x01); + // Reset controller and unlock encryption if necessary + exitErrl = nvdimmResetController(iv_nvdimm); + if (exitErrl != nullptr) { TRACFCOMP(g_trac_bpm, ERR_MRK"Bpm::runFirmwareUpdates() " |
