Skip to content

Commit

Permalink
Replaces nvdimmWrite() to reset controller with nvdimmResetController()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tsung Yeung authored and dcrowell77 committed Aug 27, 2019
1 parent b94854d commit 80f6d1d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/usr/isteps/nvdimm/bpm_update.C
Original file line number Diff line number Diff line change
Expand Up @@ -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() "
Expand Down

0 comments on commit 80f6d1d

Please sign in to comment.