Skip to content

Commit

Permalink
Suppress FAPI_ERR messages from DDIMM EFD probing
Browse files Browse the repository at this point in the history
The platform code was recently changed to output FAPI_ERR
messages from failed FAPI_TRY blocks, causing the ddimm_get_efd
to produce error messages in the non-failing code path.
This commit suppresses those errors by changing the FAPI_TRYs
to FAPI_TRY_NO_TRACE

Change-Id: I7a76526a14cb31aa2cd63f3f1393570e8b70f76e
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/96429
Reviewed-by: Devon A Baughen <devon.baughen1@ibm.com>
Reviewed-by: Mark Pizzutillo <mark.pizzutillo@ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Dev-Ready: Louis Stermole <stermole@us.ibm.com>
Reviewed-by: Jennifer A Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/96488
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M Crowell <dcrowell@us.ibm.com>
  • Loading branch information
stermole authored and dcrowell77 committed May 12, 2020
1 parent 9945d6b commit 37cdcf3
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions src/import/chips/p9/procedures/hwp/accessors/ddimm_get_efd.C
Expand Up @@ -425,11 +425,11 @@ extern "C"
SPD_DDR4_TYPE);

// Call the explicit code for a DDR4
FAPI_TRY(ddr4_get_efd( i_ocmbFapi2Target,
io_vpdInfo,
o_efdData,
i_spdBuffer,
i_spdBufferSize));
FAPI_TRY_NO_TRACE(ddr4_get_efd( i_ocmbFapi2Target,
io_vpdInfo,
o_efdData,
i_spdBuffer,
i_spdBufferSize));

fapi_try_exit:

Expand Down Expand Up @@ -740,7 +740,7 @@ extern "C"
DDR4_FREQ_VAL_2, DDR4_FREQ_VAL_3, DDR4_FREQ_VAL_4,
DDR4_FREQ_VAL_5, DDR4_FREQ_VAL_6);

FAPI_TRY(fapi2::FAPI2_RC_FALSE);
FAPI_TRY_NO_TRACE(fapi2::FAPI2_RC_FALSE);
}

FAPI_DBG ("ddr4_get_efd: Caller supplied frequency = %d, "
Expand Down Expand Up @@ -782,7 +782,7 @@ extern "C"
static_cast<uint32_t>(DDR_MR_VAL_2),
static_cast<uint32_t>(DDR_MR_VAL_3) );

FAPI_TRY(fapi2::FAPI2_RC_FALSE);
FAPI_TRY_NO_TRACE(fapi2::FAPI2_RC_FALSE);
}

FAPI_DBG ("ddr4_get_efd: Caller supplied master rank = %d, "
Expand Down Expand Up @@ -820,7 +820,7 @@ extern "C"
"supported mask = 0x%.4X)",
io_vpdInfo.iv_omi_freq_mhz, l_freqMask, l_supportedSpeeds);

FAPI_TRY(fapi2::FAPI2_RC_FALSE);
FAPI_TRY_NO_TRACE(fapi2::FAPI2_RC_FALSE);
}

// Point to the beginning of the EFD meta data, AKA EFD[0] meta data.
Expand Down Expand Up @@ -1006,7 +1006,7 @@ extern "C"
io_vpdInfo.iv_omi_freq_mhz, l_freqMask,
io_vpdInfo.iv_rank, l_rankMask);

FAPI_TRY(fapi2::FAPI2_RC_FALSE);
FAPI_TRY_NO_TRACE(fapi2::FAPI2_RC_FALSE);
}

fapi_try_exit:
Expand Down

0 comments on commit 37cdcf3

Please sign in to comment.