From f198534f2a1baf02e3e56fcb52b85c9abf274c75 Mon Sep 17 00:00:00 2001 From: Tsung Yeung Date: Mon, 6 Apr 2020 15:57:18 -0500 Subject: [PATCH] Do not deconfig on nvdimm erase fail Changing from DECONFIG to NO_DECONFIG on erase check per RAS feedback Change-Id: Ic50b8650e71fef3635a7730e3d439ac99c977ccf CQ:SW488769 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/94605 Tested-by: Jenkins Server Reviewed-by: Corey V Swenson Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins Reviewed-by: Matt Derksen Reviewed-by: Daniel M Crowell --- src/usr/isteps/nvdimm/nvdimm.C | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/usr/isteps/nvdimm/nvdimm.C b/src/usr/isteps/nvdimm/nvdimm.C index fea77a24ac6..e97e3f85c1d 100644 --- a/src/usr/isteps/nvdimm/nvdimm.C +++ b/src/usr/isteps/nvdimm/nvdimm.C @@ -1513,10 +1513,11 @@ errlHndl_t nvdimmEraseCheck(Target *i_nvdimm, bool i_statusOnly) if(l_err) { - // Callout nvdimm on high, gard and deconfig + // Callout nvdimm on high and gard. No deconfig to prevent + // re-ipl for ESS config since this is called during IPL l_err->addHwCallout( i_nvdimm, HWAS::SRCI_PRIORITY_HIGH, - HWAS::DECONFIG, + HWAS::NO_DECONFIG, HWAS::GARD_Fatal); // Collect register data for FFDC Traces