Skip to content

Commit

Permalink
NVDIMM: correct the RC for BLOCK write failure
Browse files Browse the repository at this point in the history
Used NVDIMM_FW_OPS_IN_PROGRESS_TIMEOUT instead of
NVDIMM_BLOCK_NOT_RECEIVED return code.
The error log parser was confused since the documentation
was correct but the code had it wrong.

Change-Id: Ic17b58a7183a473014cae8b99a8dddd23546111b
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/90935
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: Corey V Swenson <cswenson@us.ibm.com>
Reviewed-by: TSUNG K YEUNG <tyeung@us.ibm.com>
Reviewed-by: Daniel M Crowell <dcrowell@us.ibm.com>
  • Loading branch information
mderkse1 authored and dcrowell77 committed Feb 20, 2020
1 parent 7460967 commit a426054
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions src/usr/isteps/nvdimm/nvdimm_update.C
Expand Up @@ -1134,10 +1134,11 @@ errlHndl_t NvdimmInstalledImage::waitFwOpsBlockReceived()
opStatus.whole);
if (l_err)
{
TRACFCOMP(g_trac_nvdimm_upd, ERR_MRK"waitFwOpsBlockReceived: "
TRACFCOMP( g_trac_nvdimm_upd, ERR_MRK"waitFwOpsBlockReceived: "
"FIRMWARE_OPS_STATUS read failed on NVDIMM 0x%.8X "
"(timeout: 0x%04X ms of 100 ms)",
TARGETING::get_huid(iv_dimm), timeout_ms_val);
"(timeout: %d ms out of %d ms)",
TARGETING::get_huid(iv_dimm),
timeout_ms_val, MAX_WAIT_FOR_OPS_BLOCK_RECEIVED );
break;
}

Expand Down Expand Up @@ -1185,7 +1186,7 @@ errlHndl_t NvdimmInstalledImage::waitFwOpsBlockReceived()
l_err = new ERRORLOG::ErrlEntry(
ERRORLOG::ERRL_SEV_PREDICTIVE,
WAIT_FW_OPS_BLOCK_RECEIVED,
NVDIMM_FW_OPS_IN_PROGRESS_TIMEOUT,
NVDIMM_BLOCK_NOT_RECEIVED,
TARGETING::get_huid(iv_dimm),
TWO_UINT16_ONE_UINT32_TO_UINT64
(
Expand Down

0 comments on commit a426054

Please sign in to comment.