From c318ab00116d92f08c4bc6d6239061ced44c473e Mon Sep 17 00:00:00 2001 From: Louis Stermole Date: Tue, 4 Feb 2020 13:12:59 -0500 Subject: [PATCH] Add unmask_after_exp_omi_setup and FIR checks Adds FIR checks for BOOT_CONFIG_1 fails exp_omi_train Adds disabled FIR checks for BOOT_CONFIG_0 fails until FIR register availability is understood for that type of fail Change-Id: Ice99fbf0f59ddb9cca809b9f70e39fa929a1ef16 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/90851 Tested-by: FSP CI Jenkins Reviewed-by: STEPHEN GLANCY Reviewed-by: Mark Pizzutillo Tested-by: Jenkins Server Tested-by: PPE CI Tested-by: Hostboot CI Dev-Ready: Louis Stermole Reviewed-by: Jennifer A Stofer Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/91574 Reviewed-by: RAJA DAS --- .../include/p9a_mc_scom_addresses_fixes.H | 1 - .../memory/lib/utils/mss_generic_check.H | 22 ++++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/import/chips/p9/common/include/p9a_mc_scom_addresses_fixes.H b/src/import/chips/p9/common/include/p9a_mc_scom_addresses_fixes.H index 7077547bf..b27fbcd86 100644 --- a/src/import/chips/p9/common/include/p9a_mc_scom_addresses_fixes.H +++ b/src/import/chips/p9/common/include/p9a_mc_scom_addresses_fixes.H @@ -58,5 +58,4 @@ static const uint64_t P9A_MC_REG0_OMI_FIR_ACTION1 = 0x static const uint64_t P9A_MC_REG0_OMI_FIR_MASK_AND = 0x07013344ull; static const uint64_t P9A_MC_REG0_OMI_FIR_MASK_OR = 0x07013345ull; - #endif diff --git a/src/import/generic/memory/lib/utils/mss_generic_check.H b/src/import/generic/memory/lib/utils/mss_generic_check.H index 11a7bb6d0..d6bb90cdf 100644 --- a/src/import/generic/memory/lib/utils/mss_generic_check.H +++ b/src/import/generic/memory/lib/utils/mss_generic_check.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER sbe Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2018,2019 */ +/* Contributors Listed Below - COPYRIGHT 2018,2020 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -49,6 +49,26 @@ namespace mss namespace check { #ifndef __PPE__ +/// +/// @brief Helper function to log an error as related if needed +/// @tparam T the target type on which to log the error +/// @param[in] i_target - the target to log the error on +/// @param[in] i_fir_error - true IFF a fir is present on the passed in target +/// @param[in,out] io_rc - the return code to log +/// +template< fapi2::TargetType T > +inline void log_fir_helper( const fapi2::Target& i_target, + const bool i_fir_error, + fapi2::ReturnCode& io_rc) +{ + if(i_fir_error && (io_rc != fapi2::FAPI2_RC_SUCCESS)) + { + fapi2::log_related_error(i_target, io_rc, fapi2::FAPI2_ERRL_SEV_RECOVERED); + + io_rc = fapi2::FAPI2_RC_SUCCESS; + } +} + /// /// @brief Checks whether any FIRs have lit up on a target /// @tparam MC MC type for which to check FIR's