From fd59bd865bfb0fae22e0eba5c9187eb0660b0732 Mon Sep 17 00:00:00 2001 From: Dan Crowell Date: Thu, 20 Jun 2019 15:21:07 -0500 Subject: Default NV state to Memory Not Preserved During the restore portion of the IPL we will force NV_STATUS_FLAG to indicate 'memory will not persist' (bit 0) since the logic is not armed until later on. Change-Id: I3008053081ae4f9cfe0406ab226639737e38b785 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/79334 Reviewed-by: Corey V. Swenson Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins Reviewed-by: Daniel M. Crowell --- src/usr/isteps/nvdimm/nvdimm.C | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/usr/isteps/nvdimm/nvdimm.C b/src/usr/isteps/nvdimm/nvdimm.C index 55170e5fd..7ae805df5 100644 --- a/src/usr/isteps/nvdimm/nvdimm.C +++ b/src/usr/isteps/nvdimm/nvdimm.C @@ -916,13 +916,15 @@ errlHndl_t nvdimmRestore(TargetHandleList i_nvdimmList, uint8_t &i_mpipl) for (TargetHandleList::iterator it = i_nvdimmList.begin(); it != i_nvdimmList.end();) { + // Default state during boot is unarmed, therefore not preserved + nvdimmSetStatusFlag(*it, NSTD_ERR_NOBKUP); + l_err = nvdimmValidImage(*it, l_imgValid); // No reason to run if we can't figure out // if there is an image or not if (l_err) { - nvdimmSetStatusFlag(*it, NSTD_ERR_NOPRSV); break; } -- cgit v1.2.1