summaryrefslogtreecommitdiffstats
path: root/src/usr
diff options
context:
space:
mode:
authorCorey Swenson <cswenson@us.ibm.com>2020-01-03 09:41:17 -0600
committerNicholas E Bofferding <bofferdn@us.ibm.com>2020-01-17 09:49:45 -0600
commit634b785321e11a1b8c888df5698c05d0d0384182 (patch)
tree1227ffb3b33fc66d133eb2867339a0599c7915ed /src/usr
parentd3c8aa5e5142087e081cbe8639af9ab740cf7a70 (diff)
downloadtalos-hostboot-634b785321e11a1b8c888df5698c05d0d0384182.tar.gz
talos-hostboot-634b785321e11a1b8c888df5698c05d0d0384182.zip
NVDIMM : Catch save error during MPIPL
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>
Diffstat (limited to 'src/usr')
-rw-r--r--src/usr/isteps/nvdimm/nvdimm.C4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/usr/isteps/nvdimm/nvdimm.C b/src/usr/isteps/nvdimm/nvdimm.C
index 273aa04e9..2f9f96c2b 100644
--- a/src/usr/isteps/nvdimm/nvdimm.C
+++ b/src/usr/isteps/nvdimm/nvdimm.C
@@ -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);
@@ -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)
OpenPOWER on IntegriCloud