Skip to content

Commit

Permalink
NVDIMM : Catch save error during MPIPL
Browse files Browse the repository at this point in the history
During MPIPL, call nvdimm_init() from nvdimmRestore() to catch errors
skipped during SAVE step.

Change-Id: I5a4177af59b0a5909ece27700cc3d51840e29440
CQ:SW476125
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/89682
Tested-by: Jenkins Server <pfd-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>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Roland Veloz <rveloz@us.ibm.com>
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Reviewed-by: Nicholas E Bofferding <bofferdn@us.ibm.com>
  • Loading branch information
cvswen authored and Nicholas E Bofferding committed Jan 17, 2020
1 parent d3c8aa5 commit 634b785
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/usr/isteps/nvdimm/nvdimm.C
Expand Up @@ -1187,6 +1187,7 @@ errlHndl_t nvdimmRestore(TargetHandleList& io_nvdimmList, uint8_t &i_mpipl)
for (TargetHandleList::iterator it = io_nvdimmList.begin();
it != io_nvdimmList.end();)
{

// Default state during boot is unarmed, therefore not preserved
nvdimmSetStatusFlag(*it, NSTD_VAL_DISARMED);

Expand All @@ -1206,6 +1207,9 @@ errlHndl_t nvdimmRestore(TargetHandleList& io_nvdimmList, uint8_t &i_mpipl)
// Note: a regular IPL will already have this masked
maskMbacalfir_eventn(*it);

// Call init for error checking skipped in the SAVE step
nvdimm_init(*it);

FAPI_INVOKE_HWP(l_err, mss::ddr_resetn, l_fapi_mca, HIGH);

if (l_err)
Expand Down

0 comments on commit 634b785

Please sign in to comment.