From 11066067e94b1924b331d6b918b64129dfde5bd2 Mon Sep 17 00:00:00 2001 From: Stephen Glancy Date: Tue, 14 May 2019 12:45:57 -0400 Subject: [PATCH] Fixes FFDC for files moved to generic Change-Id: Ibd639646548cfe0745127419c151a67635e8ae75 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/77343 Tested-by: FSP CI Jenkins Tested-by: Jenkins Server Reviewed-by: Mark Pizzutillo Reviewed-by: Louis Stermole Tested-by: PPE CI Tested-by: Hostboot CI Tested-by: HWSV CI Reviewed-by: Jennifer A Stofer Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/77422 Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Reviewed-by: Daniel M. Crowell --- .../hwp/memory/lib/mcbist/exp_mcbist_traits.H | 117 ++++++ .../xml/error_info/mss_exp_errors.xml | 254 +++++++++++++ .../procedures/hwp/memory/lib/dimm/eff_dimm.C | 8 +- .../hwp/memory/lib/mcbist/mcbist_traits.H | 117 ++++++ .../hwp/memory/lib/shared/mss_const.H | 1 + .../hwp/memory/lib/spd/spd_factory.C | 3 +- .../p9/procedures/hwp/memory/p9_mss_memdiag.C | 2 +- .../error_info/p9_memory_mss_eff_config.xml | 31 +- .../xml/error_info/p9_memory_mss_freq.xml | 70 ---- .../xml/error_info/p9_memory_mss_lib.xml | 67 ---- .../xml/error_info/p9_memory_mss_memdiags.xml | 117 ++++-- .../error_info/p9_memory_mss_spd_decode.xml | 221 +---------- .../lib/spd/common/ddr4/spd_decoder_ddr4.H | 18 +- .../generic/memory/lib/spd/spd_checker.H | 5 +- .../memory/lib/utils/freq/gen_mss_freq.H | 2 +- .../lib/utils/freq/mss_freq_scoreboard.H | 2 +- .../memory/lib/utils/mcbist/gen_mss_mcbist.H | 28 +- .../lib/utils/mcbist/gen_mss_memdiags.H | 28 +- .../xml/error_info/generic_error.xml | 349 +++++++++++++++++- 19 files changed, 972 insertions(+), 468 deletions(-) diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/mcbist/exp_mcbist_traits.H b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/mcbist/exp_mcbist_traits.H index 70830f58f44..aa9e6bdcd37 100644 --- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/mcbist/exp_mcbist_traits.H +++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/mcbist/exp_mcbist_traits.H @@ -58,6 +58,123 @@ class mcbistMCTraits< mss::mc_type::EXPLORER> public: static constexpr fapi2::TargetType MC_TARGET_TYPE = fapi2::TARGET_TYPE_OCMB_CHIP; static constexpr fapi2::TargetType FWMS_ADDR_TARGET_TYPE = fapi2::TARGET_TYPE_MEM_PORT; + + /// + /// @brief Returns an error for memdiags compare error in last pattern + /// @return memdiags error + /// + static fapi2::EXP_MEMDIAGS_COMPARE_ERROR_IN_LAST_PATTERN memdiags_compare_error_in_last_pattern() + { + return fapi2::EXP_MEMDIAGS_COMPARE_ERROR_IN_LAST_PATTERN(); + } + + /// + /// @brief Returns an error for memdiags error in last pattern + /// @return memdiags error + /// + static fapi2::EXP_MEMDIAGS_ERROR_IN_LAST_PATTERN memdiags_error_in_last_pattern() + { + return fapi2::EXP_MEMDIAGS_ERROR_IN_LAST_PATTERN(); + } + + /// + /// @brief Returns an error if memdiags failed to start + /// @return memdiags error + /// + static fapi2::EXP_MEMDIAGS_MCBIST_FAILED_TO_START memdiags_failed_to_start() + { + return fapi2::EXP_MEMDIAGS_MCBIST_FAILED_TO_START(); + } + + /// + /// @brief Returns an error if memdiags failed to stop + /// @return memdiags error + /// + static fapi2::EXP_MEMDIAGS_MCBIST_FAILED_TO_STOP memdiags_failed_to_stop() + { + return fapi2::EXP_MEMDIAGS_MCBIST_FAILED_TO_STOP(); + } + + /// + /// @brief Returns an error if memdiags has a non-functional port + /// @return memdiags error + /// + static fapi2::EXP_MEMDIAGS_PORT_NOT_FUNCTIONAL memdiags_port_not_functional() + { + return fapi2::EXP_MEMDIAGS_PORT_NOT_FUNCTIONAL(); + } + + /// + /// @brief Returns an error if memdiags super fast init failed to init + /// @return memdiags error + /// + static fapi2::EXP_MEMDIAGS_SUPERFAST_INIT_FAILED_TO_INIT memdiags_sf_init_failed_init() + { + return fapi2::EXP_MEMDIAGS_SUPERFAST_INIT_FAILED_TO_INIT(); + } + + /// + /// @brief Returns an error if memdiags super fast read failed to init + /// @return memdiags error + /// + static fapi2::EXP_MEMDIAGS_SUPERFAST_READ_FAILED_TO_INIT memdiags_sf_read_failed_init() + { + return fapi2::EXP_MEMDIAGS_SUPERFAST_READ_FAILED_TO_INIT(); + } + + /// + /// @brief Returns an error if memdiags super fast read failed to init + /// @return memdiags error + /// + static fapi2::EXP_MEMDIAGS_CONTINUOUS_SCRUB_FAILED_TO_INIT memdiags_continuous_scrub_failed_init() + { + return fapi2::EXP_MEMDIAGS_CONTINUOUS_SCRUB_FAILED_TO_INIT(); + } + + /// + /// @brief Returns an error if memdiags targeted scrub failed to init + /// @return memdiags error + /// + static fapi2::EXP_MEMDIAGS_TARGETED_SCRUB_FAILED_TO_INIT memdiags_targeted_scrub_failed_init() + { + return fapi2::EXP_MEMDIAGS_TARGETED_SCRUB_FAILED_TO_INIT(); + } + + /// + /// @brief Returns an error if memdiags is already at a boundary + /// @return memdiags error + /// + static fapi2::EXP_MEMDIAGS_ALREADY_AT_BOUNDARY memdiags_already_at_boundary() + { + return fapi2::EXP_MEMDIAGS_ALREADY_AT_BOUNDARY(); + } + + /// + /// @brief Returns an error if MCBIST timesout + /// @return MCBIST error + /// + static fapi2::EXP_MCBIST_TIMEOUT mcbist_timeout() + { + return fapi2::EXP_MCBIST_TIMEOUT(); + } + + /// + /// @brief Returns an error if MCBIST has an unknown failure + /// @return MCBIST error + /// + static fapi2::EXP_MCBIST_UNKNOWN_FAILURE mcbist_unknown_failure() + { + return fapi2::EXP_MCBIST_UNKNOWN_FAILURE(); + } + + /// + /// @brief Returns an error if MCBIST has a data miscompare + /// @return MCBIST error + /// + static fapi2::EXP_MCBIST_DATA_FAIL mcbist_data_fail() + { + return fapi2::EXP_MCBIST_DATA_FAIL(); + } }; /// diff --git a/src/import/chips/ocmb/explorer/procedures/xml/error_info/mss_exp_errors.xml b/src/import/chips/ocmb/explorer/procedures/xml/error_info/mss_exp_errors.xml index c6a941e2d79..d3d2312265e 100644 --- a/src/import/chips/ocmb/explorer/procedures/xml/error_info/mss_exp_errors.xml +++ b/src/import/chips/ocmb/explorer/procedures/xml/error_info/mss_exp_errors.xml @@ -24,6 +24,260 @@ + + REG_FFDC_EXP_MEMDIAGS_FAILURE + EXPLR_MCBIST_MCBMR0Q + EXPLR_MCBIST_MCBCFGQ + EXPLR_MCBIST_MCB_CNTLQ + EXPLR_MCBIST_MCB_CNTLSTATQ + EXPLR_MCBIST_MCBSTATQ + EXPLR_MCBIST_MCBMCATQ + EXPLR_MCBIST_MCBPARMQ + EXPLR_MCBIST_MCBAGRAQ + EXPLR_MCBIST_MBSEC1Q + EXPLR_MCBIST_MBSTRQ + EXPLR_MCBIST_MCBISTFIRQ + EXPLR_MCBIST_MCBAMR0A0Q + EXPLR_MCBIST_MCBAMR1A0Q + EXPLR_MCBIST_MCBAMR2A0Q + EXPLR_MCBIST_MCBAMR3A0Q + + EXPLR_MCBIST_MCBFD0Q + EXPLR_MCBIST_MCBFD1Q + EXPLR_MCBIST_MCBFD2Q + EXPLR_MCBIST_MCBFD3Q + EXPLR_MCBIST_MCBFD4Q + EXPLR_MCBIST_MCBFD5Q + EXPLR_MCBIST_MCBFD6Q + EXPLR_MCBIST_MCBFD7Q + + EXPLR_MCBIST_MCBSA0Q + EXPLR_MCBIST_MCBSA1Q + EXPLR_MCBIST_MCBSA2Q + EXPLR_MCBIST_MCBSA3Q + EXPLR_MCBIST_MCBEA0Q + EXPLR_MCBIST_MCBEA1Q + EXPLR_MCBIST_MCBEA2Q + EXPLR_MCBIST_MCBEA3Q + + + + RC_EXP_MEMDIAGS_COMPARE_ERROR_IN_LAST_PATTERN + A miscompare error was caused by the last MCBIST pattern + PORT + SUBTEST + + REG_FFDC_EXP_MEMDIAGS_FAILURE + MC_TARGET + TARGET_TYPE_OCMB_CHIP + + + MC_TARGET + HIGH + + + + + RC_EXP_MEMDIAGS_ERROR_IN_LAST_PATTERN + An error was caused by the last MCBIST pattern + STATUS0 + STATUS1 + + REG_FFDC_EXP_MEMDIAGS_FAILURE + MC_TARGET + TARGET_TYPE_OCMB_CHIP + + + MC_TARGET + HIGH + + + + + RC_EXP_MEMDIAGS_MCBIST_FAILED_TO_START + The MCBIST engine failed to start its program + + REG_FFDC_EXP_MEMDIAGS_FAILURE + MC_TARGET + TARGET_TYPE_OCMB_CHIP + + + MC_TARGET + HIGH + + + + + RC_EXP_MEMDIAGS_PORT_NOT_FUNCTIONAL + The port used in an MCBIST program is not functional + RELATIVE_PORT_POSITION + ADDRESS + MC_TARGET + + REG_FFDC_EXP_MEMDIAGS_FAILURE + MC_TARGET + TARGET_TYPE_OCMB_CHIP + + + CODE + HIGH + + + + + RC_EXP_MEMDIAGS_SUPERFAST_INIT_FAILED_TO_INIT + A superfast init operation failed initialization + + REG_FFDC_EXP_MEMDIAGS_FAILURE + MC_TARGET + TARGET_TYPE_OCMB_CHIP + + + MC_TARGET + HIGH + + + + + RC_EXP_MEMDIAGS_SUPERFAST_READ_FAILED_TO_INIT + A superfast read operation failed initialization + + REG_FFDC_EXP_MEMDIAGS_FAILURE + MC_TARGET + TARGET_TYPE_OCMB_CHIP + + + MC_TARGET + HIGH + + + + + RC_EXP_MEMDIAGS_MCBIST_FAILED_TO_STOP + The MCBIST engine failed to stop its program + + REG_FFDC_EXP_MEMDIAGS_FAILURE + MC_TARGET + TARGET_TYPE_OCMB_CHIP + + POLL_COUNT + + MC_TARGET + HIGH + + + + + RC_EXP_MEMDIAGS_CONTINUOUS_SCRUB_FAILED_TO_INIT + A continuous scrub operation failed initialization + + REG_FFDC_EXP_MEMDIAGS_FAILURE + MC_TARGET + TARGET_TYPE_OCMB_CHIP + + + MC_TARGET + HIGH + + + + + RC_EXP_MEMDIAGS_TARGETED_SCRUB_FAILED_TO_INIT + A continuous scrub operation failed initialization + + REG_FFDC_EXP_MEMDIAGS_FAILURE + MC_TARGET + TARGET_TYPE_OCMB_CHIP + + + MC_TARGET + HIGH + + + + + RC_EXP_MEMDIAGS_ALREADY_AT_BOUNDARY + A continue request asked to stop at a boundary, but we are there already + MC_TARGET + BOUNDARY + + REG_FFDC_EXP_MEMDIAGS_FAILURE + MC_TARGET + TARGET_TYPE_OCMB_CHIP + + + CODE + HIGH + + + + + RC_EXP_MCBIST_TIMEOUT + + MCBIST program failed to return in the time allowed + Software timer, MCBIST has not finished in the time allowed + + + REG_FFDC_EXP_MEMDIAGS_FAILURE + MC_TARGET + TARGET_TYPE_OCMB_CHIP + + + MC_TARGET + HIGH + + + MC_TARGET + + + MC_TARGET + + + + + RC_EXP_MCBIST_DATA_FAIL + + MCBIST program appeared to have failed, but set conflicting bits in the status register + + STATUS_REGISTER + + REG_FFDC_EXP_MEMDIAGS_FAILURE + MC_TARGET + TARGET_TYPE_OCMB_CHIP + + + MC_TARGET + HIGH + + + MC_TARGET + + + MC_TARGET + + + + + RC_EXP_MCBIST_UNKNOWN_FAILURE + MCBIST program reported a failure but no error status was found + STATUS_REGISTER + + REG_FFDC_EXP_MEMDIAGS_FAILURE + MC_TARGET + TARGET_TYPE_OCMB_CHIP + + + MC_TARGET + HIGH + + + MC_TARGET + + + MC_TARGET + + + RC_MSS_EXP_DRAMINIT_BAD_NUM_RANKS Bad number of ranks were passed in the bad bits functionality diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/eff_dimm.C b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/eff_dimm.C index 7fe4f2e97ea..baac38c300b 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/eff_dimm.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/eff_dimm.C @@ -5686,7 +5686,7 @@ fapi2::ReturnCode eff_dimm::decode_vpd(const fapi2::Target& i_t set_MAX(mss::VPD_KEYWORD_MAX). set_ACTUAL(l_vpd_info.iv_size). set_KEYWORD(fapi2::MemVpdData::MT). - set_MCS_TARGET(i_target), + set_VPD_TARGET(i_target), "VPD MT keyword size retrieved: %d, is larger than max: %d for %s", l_vpd_info.iv_size, mss::VPD_KEYWORD_MAX, mss::c_str(i_target)); @@ -5710,7 +5710,7 @@ fapi2::ReturnCode eff_dimm::decode_vpd(const fapi2::Target& i_t set_MAX(mss::VPD_KEYWORD_MAX). set_ACTUAL(l_vpd_info.iv_size). set_KEYWORD(fapi2::MemVpdData::MR). - set_MCS_TARGET(i_target), + set_VPD_TARGET(i_target), "VPD MR keyword size retrieved: %d, is larger than max: %d for %s", l_vpd_info.iv_size, mss::VPD_KEYWORD_MAX, mss::c_str(i_target)); @@ -5731,7 +5731,7 @@ fapi2::ReturnCode eff_dimm::decode_vpd(const fapi2::Target& i_t set_MAX(mss::VPD_KEYWORD_MAX). set_ACTUAL(l_vpd_info.iv_size). set_KEYWORD(fapi2::MemVpdData::CK). - set_MCS_TARGET(i_target), + set_VPD_TARGET(i_target), "VPD CK keyword size retrieved: %d, is larger than max: %d for %s", l_vpd_info.iv_size, mss::VPD_KEYWORD_MAX, mss::c_str(i_target)); @@ -5750,7 +5750,7 @@ fapi2::ReturnCode eff_dimm::decode_vpd(const fapi2::Target& i_t set_MAX(mss::VPD_KEYWORD_MAX). set_ACTUAL(l_vpd_info.iv_size). set_KEYWORD(fapi2::MemVpdData::DQ). - set_MCS_TARGET(i_target), + set_VPD_TARGET(i_target), "VPD DQ keyword size retrieved: %d, is larger than max: %d for %s", l_vpd_info.iv_size, mss::VPD_KEYWORD_MAX, mss::c_str(i_target)); diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/mcbist_traits.H b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/mcbist_traits.H index ec47c1397a8..69ca5694c10 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/mcbist_traits.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/mcbist_traits.H @@ -58,6 +58,123 @@ class mcbistMCTraits public: static constexpr fapi2::TargetType MC_TARGET_TYPE = fapi2::TARGET_TYPE_MCBIST; static constexpr fapi2::TargetType FWMS_ADDR_TARGET_TYPE = fapi2::TARGET_TYPE_MCA; + + /// + /// @brief Returns an error for memdiags compare error in last pattern + /// @return memdiags error + /// + static fapi2::MSS_MEMDIAGS_COMPARE_ERROR_IN_LAST_PATTERN memdiags_compare_error_in_last_pattern() + { + return fapi2::MSS_MEMDIAGS_COMPARE_ERROR_IN_LAST_PATTERN(); + } + + /// + /// @brief Returns an error for memdiags error in last pattern + /// @return memdiags error + /// + static fapi2::MSS_MEMDIAGS_ERROR_IN_LAST_PATTERN memdiags_error_in_last_pattern() + { + return fapi2::MSS_MEMDIAGS_ERROR_IN_LAST_PATTERN(); + } + + /// + /// @brief Returns an error if memdiags failed to start + /// @return memdiags error + /// + static fapi2::MSS_MEMDIAGS_MCBIST_FAILED_TO_START memdiags_failed_to_start() + { + return fapi2::MSS_MEMDIAGS_MCBIST_FAILED_TO_START(); + } + + /// + /// @brief Returns an error if memdiags failed to stop + /// @return memdiags error + /// + static fapi2::MSS_MEMDIAGS_MCBIST_FAILED_TO_STOP memdiags_failed_to_stop() + { + return fapi2::MSS_MEMDIAGS_MCBIST_FAILED_TO_STOP(); + } + + /// + /// @brief Returns an error if memdiags has a non-functional port + /// @return memdiags error + /// + static fapi2::MSS_MEMDIAGS_PORT_NOT_FUNCTIONAL memdiags_port_not_functional() + { + return fapi2::MSS_MEMDIAGS_PORT_NOT_FUNCTIONAL(); + } + + /// + /// @brief Returns an error if memdiags super fast init failed to init + /// @return memdiags error + /// + static fapi2::MSS_MEMDIAGS_SUPERFAST_INIT_FAILED_TO_INIT memdiags_sf_init_failed_init() + { + return fapi2::MSS_MEMDIAGS_SUPERFAST_INIT_FAILED_TO_INIT(); + } + + /// + /// @brief Returns an error if memdiags super fast read failed to init + /// @return memdiags error + /// + static fapi2::MSS_MEMDIAGS_SUPERFAST_READ_FAILED_TO_INIT memdiags_sf_read_failed_init() + { + return fapi2::MSS_MEMDIAGS_SUPERFAST_READ_FAILED_TO_INIT(); + } + + /// + /// @brief Returns an error if memdiags continuous scrub failed to init + /// @return memdiags error + /// + static fapi2::MSS_MEMDIAGS_CONTINUOUS_SCRUB_FAILED_TO_INIT memdiags_continuous_scrub_failed_init() + { + return fapi2::MSS_MEMDIAGS_CONTINUOUS_SCRUB_FAILED_TO_INIT(); + } + + /// + /// @brief Returns an error if memdiags targeted scrub failed to init + /// @return memdiags error + /// + static fapi2::MSS_MEMDIAGS_TARGETED_SCRUB_FAILED_TO_INIT memdiags_targeted_scrub_failed_init() + { + return fapi2::MSS_MEMDIAGS_TARGETED_SCRUB_FAILED_TO_INIT(); + } + + /// + /// @brief Returns an error if memdiags is already at a boundary + /// @return memdiags error + /// + static fapi2::MSS_MEMDIAGS_ALREADY_AT_BOUNDARY memdiags_already_at_boundary() + { + return fapi2::MSS_MEMDIAGS_ALREADY_AT_BOUNDARY(); + } + + /// + /// @brief Returns an error if MCBIST timesout + /// @return MCBIST error + /// + static fapi2::MSS_MCBIST_TIMEOUT mcbist_timeout() + { + return fapi2::MSS_MCBIST_TIMEOUT(); + } + + /// + /// @brief Returns an error if MCBIST has an unknown failure + /// @return MCBIST error + /// + static fapi2::MSS_MCBIST_UNKNOWN_FAILURE mcbist_unknown_failure() + { + return fapi2::MSS_MCBIST_UNKNOWN_FAILURE(); + } + + /// + /// @brief Returns an error if MCBIST has a data miscompare + /// @return MCBIST error + /// + static fapi2::MSS_MCBIST_DATA_FAIL mcbist_data_fail() + { + return fapi2::MSS_MCBIST_DATA_FAIL(); + } }; /// diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/shared/mss_const.H b/src/import/chips/p9/procedures/hwp/memory/lib/shared/mss_const.H index 4cec1ad77fb..dc213b0ca60 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/shared/mss_const.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/shared/mss_const.H @@ -172,6 +172,7 @@ enum ffdc_function_codes DRAM_TO_RP_REG = 101, // eff_dimm.C + RAW_CARD_FACTORY = 115, PRIMARY_STACK_TYPE = 116, // CW engine information diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/spd/spd_factory.C b/src/import/chips/p9/procedures/hwp/memory/lib/spd/spd_factory.C index be8343c7125..dfd09044907 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/spd/spd_factory.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/spd/spd_factory.C @@ -131,7 +131,8 @@ fapi2::ReturnCode raw_card_factory(const fapi2::Target& i_targ FAPI_ASSERT( false, fapi2::MSS_INVALID_DIMM_TYPE() .set_DIMM_TYPE(l_dimm_type) - .set_DIMM_TARGET(i_target), + .set_DIMM_TARGET(i_target) + .set_FUNCTION(mss::ffdc_function_codes::RAW_CARD_FACTORY), "Recieved invalid dimm type: %d for %s", l_dimm_type, mss::spd::c_str(i_target) ); break; diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_memdiag.C b/src/import/chips/p9/procedures/hwp/memory/p9_mss_memdiag.C index f88ad8f4677..7146460b4d9 100644 --- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_memdiag.C +++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_memdiag.C @@ -180,7 +180,7 @@ extern "C" l_probes); FAPI_ASSERT( l_poll_results == true, - fapi2::MSS_MEMDIAGS_SUPERFAST_INIT_FAILED_TO_INIT().set_MCBIST_TARGET(i_target), + fapi2::MSS_MEMDIAGS_SUPERFAST_INIT_FAILED_TO_INIT().set_MC_TARGET(i_target), "p9_mss_memdiag (init) timedout %s", mss::c_str(i_target) ); // Unmask firs after memdiags and turn off FIFO mode diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_eff_config.xml b/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_eff_config.xml index 9d9aea1744f..56fb232dc78 100644 --- a/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_eff_config.xml +++ b/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_eff_config.xml @@ -5,7 +5,7 @@ - + @@ -108,18 +108,6 @@ - - RC_MSS_INVALID_CAST_CALC_NCK - Invalid cast or calculation for calc_nck - TIMING_PS - NCK_NS - CORRECTION_FACTOR - - CODE - HIGH - - - RC_MSS_INVALID_SPD_SLAVE_RANKS @@ -521,23 +509,6 @@ - - RC_MSS_INVALID_VPD_KEYWORD_MAX - - VPD keyword is too big for space allocated for it. - - MAX - ACTUAL - KEYWORD - - - VPD_PART - MCS_TARGET - - HIGH - - - RC_MSS_OFFSET_WR_VREF_OUT_OF_RANGE diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_freq.xml b/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_freq.xml index 4f964f8ac96..e2a9bf1ab71 100644 --- a/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_freq.xml +++ b/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_freq.xml @@ -126,32 +126,6 @@ - - RC_MSS_INVALID_VPD_FREQ_LIST_PASSED - - Wrong size vector passed into limit_freq_by_vpd function - - SIZE - EXPECTED - - CODE - HIGH - - - - - RC_MSS_INVALID_FREQ_LIST_PASSED - - Wrong size vector passed into frequency scoreboard function - - SIZE - EXPECTED - - CODE - HIGH - - - RC_MSS_ERROR_FINDING_DIMM_SPEED_MAP @@ -204,22 +178,6 @@ - - - RC_MSS_MAX_FREQ_ATTR_SIZE_CHANGED - - Number of entries for MSS_MRW_MAX_FREQ attribute from VPD has changed without updating the code - Asserted because direct accesses to array - - ACTUAL_SIZE - SUPPOSED_SIZE - MCA_TARGET - - CODE - HIGH - - - RC_MSS_MRW_FREQ_MAX_FREQ_EMPTY_SET @@ -285,34 +243,6 @@ - - RC_MSS_TOO_MANY_DIMMS_ON_PORT - There seem to be too many dimms on the port - DIMM_COUNT - - CODE - HIGH - - - - PORT_TARGET - TARGET_TYPE_DIMM - - MEDIUM - - - - - RC_MSS_FREQ_INDEX_TOO_LARGE - Error calculating the index into max_freq array - INDEX - NUM_MAX_FREQS - - CODE - HIGH - - - RC_MSS_FREQ_TO_NEST_FREQ_RATIO_TOO_LARGE diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_lib.xml b/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_lib.xml index 8d8c68b9a9e..6a6d2e1c835 100644 --- a/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_lib.xml +++ b/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_lib.xml @@ -281,73 +281,6 @@ - - RC_MSS_MCBIST_TIMEOUT - - MCBIST program failed to return in the time allowed - Software timer, MCBIST has not finished in the time allowed - - - REG_FFDC_MSS_CCS_FAILURE - MCBIST_TARGET - TARGET_TYPE_MCBIST - - - MCBIST_TARGET - HIGH - - - MCBIST_TARGET - - - MCBIST_TARGET - - - - - RC_MSS_MCBIST_DATA_FAIL - - MCBIST program appeared to have failed, but set conflicting bits in the status register - - STATUS_REGISTER - - REG_FFDC_MSS_CCS_FAILURE - MCBIST_TARGET - TARGET_TYPE_MCBIST - - - MCBIST_TARGET - HIGH - - - MCBIST_TARGET - - - MCBIST_TARGET - - - - - RC_MSS_MCBIST_UNKNOWN_FAILURE - MCBIST program reported a failure but no error status was found - STATUS_REGISTER - - REG_FFDC_MSS_CCS_FAILURE - MCBIST_TARGET - TARGET_TYPE_MCBIST - - - MCBIST_TARGET - HIGH - - - MCBIST_TARGET - - - MCBIST_TARGET - - - RC_MSS_APB_INVALID_ADDRESS PHY APB interface is reporting an invalid address was read or written diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_memdiags.xml b/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_memdiags.xml index fb9567e9ced..a94ae9804dd 100644 --- a/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_memdiags.xml +++ b/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_memdiags.xml @@ -83,6 +83,73 @@ MCA_FWMS7 + + RC_MSS_MCBIST_TIMEOUT + + MCBIST program failed to return in the time allowed + Software timer, MCBIST has not finished in the time allowed + + + REG_FFDC_MSS_MEMDIAGS_FAILURE + MC_TARGET + TARGET_TYPE_MCBIST + + + MC_TARGET + HIGH + + + MC_TARGET + + + MC_TARGET + + + + + RC_MSS_MCBIST_DATA_FAIL + + MCBIST program appeared to have failed, but set conflicting bits in the status register + + STATUS_REGISTER + + REG_FFDC_MSS_CCS_FAILURE + MC_TARGET + TARGET_TYPE_MCBIST + + + MC_TARGET + HIGH + + + MC_TARGET + + + MC_TARGET + + + + + RC_MSS_MCBIST_UNKNOWN_FAILURE + MCBIST program reported a failure but no error status was found + STATUS_REGISTER + + REG_FFDC_MSS_MEMDIAGS_FAILURE + MC_TARGET + TARGET_TYPE_MCBIST + + + MC_TARGET + HIGH + + + MC_TARGET + + + MC_TARGET + + + RC_MSS_MEMDIAGS_ERROR_IN_LAST_PATTERN An error was caused by the last MCBIST pattern @@ -90,11 +157,11 @@ STATUS1 REG_FFDC_MSS_MEMDIAGS_FAILURE - MCBIST_TARGET + MC_TARGET TARGET_TYPE_MCBIST - MCBIST_TARGET + MC_TARGET HIGH @@ -106,11 +173,11 @@ SUBTEST REG_FFDC_MSS_MEMDIAGS_FAILURE - MCBIST_TARGET + MC_TARGET TARGET_TYPE_MCBIST - MCBIST_TARGET + MC_TARGET HIGH @@ -209,11 +276,11 @@ The MCBIST engine failed to start its program REG_FFDC_MSS_MEMDIAGS_FAILURE - MCBIST_TARGET + MC_TARGET TARGET_TYPE_MCBIST - MCBIST_TARGET + MC_TARGET HIGH @@ -223,12 +290,12 @@ The MCBIST engine failed to stop its program REG_FFDC_MSS_MEMDIAGS_FAILURE - MCBIST_TARGET + MC_TARGET TARGET_TYPE_MCBIST POLL_COUNT - MCBIST_TARGET + MC_TARGET HIGH @@ -238,10 +305,10 @@ The port used in an MCBIST program is not functional RELATIVE_PORT_POSITION ADDRESS - MCBIST_TARGET + MC_TARGET REG_FFDC_MSS_MEMDIAGS_FAILURE - MCBIST_TARGET + MC_TARGET TARGET_TYPE_MCBIST @@ -255,11 +322,11 @@ A superfast read operation failed initialization REG_FFDC_MSS_MEMDIAGS_FAILURE - MCBIST_TARGET + MC_TARGET TARGET_TYPE_MCBIST - MCBIST_TARGET + MC_TARGET HIGH @@ -269,11 +336,11 @@ A superfast init operation failed initialization REG_FFDC_MSS_MEMDIAGS_FAILURE - MCBIST_TARGET + MC_TARGET TARGET_TYPE_MCBIST - MCBIST_TARGET + MC_TARGET HIGH @@ -283,11 +350,11 @@ A continuous scrub operation failed initialization REG_FFDC_MSS_MEMDIAGS_FAILURE - MCBIST_TARGET + MC_TARGET TARGET_TYPE_MCBIST - MCBIST_TARGET + MC_TARGET HIGH @@ -297,11 +364,11 @@ A continuous scrub operation failed initialization REG_FFDC_MSS_MEMDIAGS_FAILURE - MCBIST_TARGET + MC_TARGET TARGET_TYPE_MCBIST - MCBIST_TARGET + MC_TARGET HIGH @@ -309,11 +376,11 @@ RC_MSS_MEMDIAGS_ALREADY_AT_BOUNDARY A continue request asked to stop at a boundary, but we are there already - MCBIST_TARGET + MC_TARGET BOUNDARY REG_FFDC_MSS_MEMDIAGS_FAILURE - MCBIST_TARGET + MC_TARGET TARGET_TYPE_MCBIST @@ -322,16 +389,6 @@ - - RC_MSS_MEMDIAGS_NO_MCBIST_SUBTESTS - Attempt to run an MCBIST program with no subtests - MCBIST_TARGET - - CODE - HIGH - - - RC_MSS_MEMDIAGS_REPAIRS_EXCEEDED A mark repair operation failed to repair enough bad bits diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_spd_decode.xml b/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_spd_decode.xml index a1310dec2af..eec22838093 100644 --- a/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_spd_decode.xml +++ b/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_spd_decode.xml @@ -5,7 +5,7 @@ - + @@ -36,140 +36,6 @@ - - RC_MSS_INVALID_SPD_RESERVED_BITS - - Invalid SPD reserved bits received. - This could be code problem (decoding) or bad SPD. - - FUNCTION_CODE - - CODE - MEDIUM - - - TARGET - HIGH - - - TARGET - - - - - RC_MSS_INVALID_DIMM_SPEED - - Invalid DIMM speed received. Possibly a programming error. - - DIMM_SPEED - - CODE - MEDIUM - - - TARGET - HIGH - - - TARGET - - - - - RC_MSS_INVALID_DB_MDQ_DRIVE_STRENGTH - - Bad SPD data for bytes 145 - 147. - Reserved settings for data buffer MDQ drive strength received. - This could be code problem (decoding) or bad SPD. - - DATA_RATE - - CODE - MEDIUM - - - TARGET - HIGH - - - TARGET - - - - - RC_MSS_INVALID_DRAM_GEN - - Received a DRAM gen unsupported by the SPD decoder factory - - DRAM_GEN - FUNCTION - - MEMORY_PLUGGING_ERROR - HIGH - - - DIMM_TARGET - LOW - - - DIMM_TARGET - - - CODE - MEDIUM - - - - - RC_MSS_INVALID_HYBRID_MODULE - - Received an invalid or unsupported hybrid media (SPD byte 3, bits [6:4]) - for a specified hybrid modue (SPD byte 3, bit [7]) - - HYBRID - HYBRID_MEDIA - FUNCTION - - MEMORY_PLUGGING_ERROR - HIGH - - - TARGET - LOW - - - TARGET - - - CODE - MEDIUM - - - - - RC_MSS_INVALID_DIMM_TYPE - - Received a DIMM type unsupported by the SPD decoder factory - - DIMM_TYPE - FUNCTION - - MEMORY_PLUGGING_ERROR - HIGH - - - DIMM_TARGET - LOW - - - DIMM_TARGET - - - CODE - MEDIUM - - - RC_MSS_INVALID_RAW_CARD @@ -194,89 +60,4 @@ - - RC_MSS_FAILED_SPD_REVISION_FALLBACK - - Unable to fall back SPD decoder to the highest decoded - revision. Most likely a programming error. - - FAILED_REVISION - FUNCTION_CODE - - CODE - MEDIUM - - - TARGET - MEDIUM - - - TARGET - - - - - RC_MSS_SPD_TIMING_FAIL - - Timing SPD parameter failed to meet JEDEC SPD timing - bounds. FUNCTION_CODE ffdc field encodes which timing param. - - FAILED_REVISION - FUNCTION_CODE - - CODE - MEDIUM - - - TARGET - MEDIUM - - - TARGET - - - - - RC_MSS_INVALID_SPD_PARAMETER_RECEIVED - - Unable to fall back SPD decoder to the highest decoded - revision. Most likely a programming error. - - SPD_PARAM - FUNCTION_CODE - - CODE - MEDIUM - - - TARGET - MEDIUM - - - TARGET - - - - - RC_MSS_SPD_REV_ENCODING_LEVEL_NOT_SUPPORTED - - SPD revision on byte 1 (bits 7~4) has a unsupported encoding level - that is greater than the largest decoded SPD decoder. There is - no backward compatible revision to fallback to. This could be - bad SPD or a programming error. - - ENCODING_LEVEL - - CODE - MEDIUM - - - TARGET - MEDIUM - - - TARGET - - - diff --git a/src/import/generic/memory/lib/spd/common/ddr4/spd_decoder_ddr4.H b/src/import/generic/memory/lib/spd/common/ddr4/spd_decoder_ddr4.H index 12821c76ff8..1ebd481159f 100644 --- a/src/import/generic/memory/lib/spd/common/ddr4/spd_decoder_ddr4.H +++ b/src/import/generic/memory/lib/spd/common/ddr4/spd_decoder_ddr4.H @@ -493,7 +493,7 @@ class decoder : public base_cnfg_decoder right_aligned_insert(l_buffer, l_twrmin_msn, l_twrmin_lsb); // Update output only after check passes - FAPI_TRY( check::max_timing_range(i_target, l_buffer, TWRMIN)); + FAPI_TRY( check::max_timing_range(i_target, l_buffer, U, TWRMIN)); o_value = l_buffer; FAPI_INF("%s. Minimum Write Recovery Time (tWRmin) in MTB units: %d", @@ -526,7 +526,7 @@ class decoder : public base_cnfg_decoder right_aligned_insert(l_buffer, l_twtr_lmin_msn, l_twtr_lmin_lsb); // Update output only after check passes - FAPI_TRY( check::max_timing_range(i_target, l_buffer, TWTR_L_MIN)); + FAPI_TRY( check::max_timing_range(i_target, l_buffer, U, TWTR_L_MIN)); o_value = l_buffer; FAPI_INF("%s. Minimum Write to Read Time - Different Bank Group (tWTR_Lmin) in MTB units: %d", @@ -560,7 +560,7 @@ class decoder : public base_cnfg_decoder right_aligned_insert(l_buffer, l_twtr_smin_msn, l_twtr_smin_lsb); // Update output only after check passes - FAPI_TRY( check::max_timing_range(i_target, l_buffer, TWTR_S_MIN)); + FAPI_TRY( check::max_timing_range(i_target, l_buffer, U, TWTR_S_MIN)); o_value = l_buffer; FAPI_INF("%s. Minimum Write to Read Time - Different Bank Group (tWTR_Smin) in MTB units: %d", @@ -1275,7 +1275,7 @@ class decoder : public base_cnfg_decoder right_aligned_insert(l_buffer, l_tRASmin_msn, l_tRASmin_lsb); // Update output only after check passes - FAPI_TRY( check::max_timing_range(iv_target, l_buffer, TRASMIN)); + FAPI_TRY( check::max_timing_range(iv_target, l_buffer, R, TRASMIN)); o_value = l_buffer; FAPI_INF("%s. Minimum Active to Precharge Delay Time (tRASmin) in MTB units: %d", @@ -1305,7 +1305,7 @@ class decoder : public base_cnfg_decoder right_aligned_insert(l_buffer, l_trcmin_msn, l_trcmin_lsb); // Update output only after check passes - FAPI_TRY( check::max_timing_range(iv_target, l_buffer, TRCMIN)); + FAPI_TRY( check::max_timing_range(iv_target, l_buffer, R, TRCMIN)); o_value = l_buffer; FAPI_INF("%s. Minimum Active to Active/Refresh Delay Time (tRCmin) in MTB units: %d", @@ -1336,7 +1336,7 @@ class decoder : public base_cnfg_decoder right_aligned_insert(l_buffer, l_trfc1min_msb, l_trfc1min_lsb); // Update output only after check passes - FAPI_TRY( check::max_timing_range(iv_target, l_buffer, TRFC1MIN)); + FAPI_TRY( check::max_timing_range(iv_target, l_buffer, R, TRFC1MIN)); o_value = l_buffer; FAPI_INF("%s. Minimum Refresh Recovery Delay Time 1 (tRFC1min) in MTB units: %d", @@ -1366,7 +1366,7 @@ class decoder : public base_cnfg_decoder right_aligned_insert(l_buffer, l_trfc2min_msb, l_trfc2min_lsb); // Update output only after check passes - FAPI_TRY( check::max_timing_range(iv_target, l_buffer, TRFC2MIN)); + FAPI_TRY( check::max_timing_range(iv_target, l_buffer, R, TRFC2MIN)); o_value = l_buffer; FAPI_INF("%s. Minimum Refresh Recovery Delay Time 2 (tRFC2min) in MTB units: %d", @@ -1396,7 +1396,7 @@ class decoder : public base_cnfg_decoder right_aligned_insert(l_buffer, l_trfc4min_msb, l_trfc4min_lsb); // Update output only after check passes - FAPI_TRY( check::max_timing_range(iv_target, l_buffer, TRFC4MIN)); + FAPI_TRY( check::max_timing_range(iv_target, l_buffer, R, TRFC4MIN)); o_value = l_buffer; FAPI_INF("%s. Minimum Refresh Recovery Delay Time 4 (tRFC4min) in MTB units: %d", @@ -1426,7 +1426,7 @@ class decoder : public base_cnfg_decoder right_aligned_insert(l_buffer, l_tfawmin_msn, l_tfawmin_lsb); // Update output only after check passes - FAPI_TRY( check::max_timing_range(iv_target, l_buffer, TFAWMIN)); + FAPI_TRY( check::max_timing_range(iv_target, l_buffer, R, TFAWMIN)); o_value = l_buffer; FAPI_INF("%s. Minimum Four Activate Window Delay Time (tFAWmin) in MTB units: %d", diff --git a/src/import/generic/memory/lib/spd/spd_checker.H b/src/import/generic/memory/lib/spd/spd_checker.H index 0b2a330768e..50e6ef3472d 100644 --- a/src/import/generic/memory/lib/spd/spd_checker.H +++ b/src/import/generic/memory/lib/spd/spd_checker.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2017 */ +/* Contributors Listed Below - COPYRIGHT 2017,2019 */ /* [+] Evan Lojewski */ /* [+] International Business Machines Corp. */ /* */ @@ -103,17 +103,20 @@ namespace check /// @tparam TT defaulted to bitRangeTraits /// @param[in] i_target fapi2 target /// @param[in] i_timing the timing value +/// @param[in] i_rev the SPD revision that needs to be checked /// @param[in] i_ffdc ffdc function code /// @return FAPI2_RC_SUCCESS iff okay /// template < bit_len BL, fapi2::TargetType T, typename TT = bitRangeTraits > fapi2::ReturnCode max_timing_range(const fapi2::Target& i_target, const int64_t i_timing, + const rev i_rev, const generic_ffdc_codes i_ffdc) { FAPI_ASSERT( (i_timing <= TT::UPPER_BOUND) && (i_timing >= TT::LOWER_BOUND), fapi2::MSS_SPD_TIMING_FAIL() + .set_FAILED_REVISION(i_rev) .set_FUNCTION_CODE(i_ffdc) .set_TARGET(i_target), "Failed timing parameter check for %s", diff --git a/src/import/generic/memory/lib/utils/freq/gen_mss_freq.H b/src/import/generic/memory/lib/utils/freq/gen_mss_freq.H index 4df0eeb06e6..c1c51cd8768 100644 --- a/src/import/generic/memory/lib/utils/freq/gen_mss_freq.H +++ b/src/import/generic/memory/lib/utils/freq/gen_mss_freq.H @@ -164,7 +164,7 @@ fapi2::ReturnCode is_vpd_config_supported( const fapi2::Target i_target ) const { + // MCBIST error traits + using ET = mcbistMCTraits; + // Until reading the error array is documented, comparison errors 'just' result in // a flag indicating there was a problem on port. { @@ -2144,8 +2147,8 @@ class program l_data.extractToRight(l_subtest); FAPI_ASSERT( l_port == 0, - fapi2::MSS_MEMDIAGS_COMPARE_ERROR_IN_LAST_PATTERN() - .set_MCBIST_TARGET(i_target) + ET::memdiags_compare_error_in_last_pattern() + .set_MC_TARGET(i_target) .set_PORT(mss::first_bit_set(l_port)) .set_SUBTEST(l_subtest), "%s MCBIST error on port %d subtest %d", mss::c_str(i_target), mss::first_bit_set(l_port), l_subtest ); @@ -2160,8 +2163,8 @@ class program FAPI_TRY( fapi2::getScom(i_target, TT::SRERR1_REG, l_read1), "%s Failed getScom", mss::c_str(i_target) ); FAPI_ASSERT( ((l_read0 == 0) && (l_read1 == 0)), - fapi2::MSS_MEMDIAGS_ERROR_IN_LAST_PATTERN() - .set_MCBIST_TARGET(i_target) + ET::memdiags_error_in_last_pattern() + .set_MC_TARGET(i_target) .set_STATUS0(l_read0) .set_STATUS1(l_read1), "%s MCBIST scrub/read error reg0: 0x%016lx reg1: 0x%016lx", mss::c_str(i_target), l_read0, l_read1 ); @@ -3477,6 +3480,7 @@ fapi2::ReturnCode read_rb_array(const fapi2::Target& i_target, template< mss::mc_type MC = DEFAULT_MC_TYPE, fapi2::TargetType T, typename TT = mcbistTraits > fapi2::ReturnCode poll( const fapi2::Target& i_target, const program& i_program ) { + using ET = mss::mcbistMCTraits; fapi2::buffer l_status; const uint64_t l_done = fapi2::buffer().setBit(); @@ -3500,7 +3504,7 @@ fapi2::ReturnCode poll( const fapi2::Target& i_target, const program& i_p // Check to see if we're still in progress - meaning we timed out. FAPI_ASSERT((l_status & l_in_progress) != l_in_progress, - fapi2::MSS_MCBIST_TIMEOUT().set_MCBIST_TARGET(i_target), + ET::mcbist_timeout().set_MC_TARGET(i_target), "MCBIST timed out %s", mss::c_str(i_target)); // The control register has a bit for done-and-happy and a bit for done-and-unhappy @@ -3513,8 +3517,8 @@ fapi2::ReturnCode poll( const fapi2::Target& i_target, const program& i_p // If we're here there were no errors, but lets report if the fail bit was set anyway. FAPI_ASSERT( (l_status & l_fail) != l_fail, - fapi2::MSS_MCBIST_UNKNOWN_FAILURE() - .set_MCBIST_TARGET(i_target) + ET::mcbist_unknown_failure() + .set_MC_TARGET(i_target) .set_STATUS_REGISTER(l_status), "%s MCBIST reported a fail, but process_errors didn't find it 0x%016llx", mss::c_str(i_target), l_status ); @@ -3524,8 +3528,8 @@ fapi2::ReturnCode poll( const fapi2::Target& i_target, const program& i_p } FAPI_ASSERT(false, - fapi2::MSS_MCBIST_DATA_FAIL() - .set_MCBIST_TARGET(i_target) + ET::mcbist_data_fail() + .set_MC_TARGET(i_target) .set_STATUS_REGISTER(l_status), "%s MCBIST executed but we got corrupted data in the control register 0x%016llx", mss::c_str(i_target), l_status ); @@ -3563,7 +3567,7 @@ fapi_try_exit: /// @param[in] i_program the mcbist program to execute /// @return fapi2::ReturnCode, FAPI2_RC_SUCCESS iff OK /// -template< mss::mc_type MC = DEFAULT_MC_TYPE, fapi2::TargetType T, typename TT = mcbistTraits > +template< mss::mc_type MC = DEFAULT_MC_TYPE, fapi2::TargetType T, typename TT = mcbistTraits, typename ET = mcbistMCTraits > fapi2::ReturnCode execute( const fapi2::Target& i_target, const program& i_program ) { fapi2::buffer l_status; @@ -3576,7 +3580,7 @@ fapi2::ReturnCode execute( const fapi2::Target& i_target, const program& // Before we go off into the bushes, lets see if there are any instructions in the // program. If not, we can save everyone the hassle FAPI_ASSERT(0 != i_program.iv_subtests.size(), - fapi2::MSS_MEMDIAGS_NO_MCBIST_SUBTESTS().set_MCBIST_TARGET(i_target), + fapi2::MSS_MEMDIAGS_NO_MCBIST_SUBTESTS().set_MC_TARGET(i_target), "Attempt to run an MCBIST program with no subtests on %s", mss::c_str(i_target)); FAPI_TRY( clear_error_helper(i_target, const_cast&>(i_program)) ); @@ -3625,7 +3629,7 @@ fapi2::ReturnCode execute( const fapi2::Target& i_target, const program& // So we've either run/are running or we timed out waiting for the start. FAPI_ASSERT( l_poll_result == true, - fapi2::MSS_MEMDIAGS_MCBIST_FAILED_TO_START().set_MCBIST_TARGET(i_target), + ET::memdiags_failed_to_start().set_MC_TARGET(i_target), "The MCBIST engine failed to start its program" ); // If the user asked for async mode, we can leave. Otherwise, poll and check for errors diff --git a/src/import/generic/memory/lib/utils/mcbist/gen_mss_memdiags.H b/src/import/generic/memory/lib/utils/mcbist/gen_mss_memdiags.H index 7464675a52f..33a3156f341 100644 --- a/src/import/generic/memory/lib/utils/mcbist/gen_mss_memdiags.H +++ b/src/import/generic/memory/lib/utils/mcbist/gen_mss_memdiags.H @@ -226,6 +226,7 @@ fapi2::ReturnCode stop( const fapi2::Target& i_target ) { // Too long, make shorter using TT = mss::mcbistTraits; + using ET = mss::mcbistMCTraits; // Poll parameters are defined as TK so that we wait a nice time for operations // For now use the defaults @@ -257,8 +258,8 @@ fapi2::ReturnCode stop( const fapi2::Target& i_target ) // So we've either stopped or we timed out FAPI_ASSERT( l_poll_result == true, - fapi2::MSS_MEMDIAGS_MCBIST_FAILED_TO_STOP() - .set_MCBIST_TARGET(i_target) + ET::memdiags_failed_to_stop() + .set_MC_TARGET(i_target) .set_POLL_COUNT(l_poll_parameters.iv_poll_count), "%s The MCBIST engine failed to stop its program", mss::c_str(i_target) ); @@ -448,6 +449,7 @@ fapi_try_exit: template< mss::mc_type MC, fapi2::TargetType T, typename TT > inline fapi2::ReturnCode operation::single_port_init() { + using ET = mcbistMCTraits; FAPI_INF("single port init for %s", mss::c_str(iv_target)); const uint64_t l_relative_port_number = iv_const.iv_start_address.get_port(); @@ -455,10 +457,10 @@ inline fapi2::ReturnCode operation::single_port_init() // Make sure the specificed port is functional FAPI_ASSERT( mss::is_functional(iv_target, l_relative_port_number), - fapi2::MSS_MEMDIAGS_PORT_NOT_FUNCTIONAL() + ET::memdiags_port_not_functional() .set_RELATIVE_PORT_POSITION(l_relative_port_number) .set_ADDRESS( uint64_t(iv_const.iv_start_address) ) - .set_MCBIST_TARGET(iv_target), + .set_MC_TARGET(iv_target), "Port with relative postion %d is not functional for %s", l_relative_port_number, mss::c_str(iv_target)); @@ -846,6 +848,7 @@ template< mss::mc_type MC = DEFAULT_MC_TYPE, fapi2::TargetType T > fapi2::ReturnCode sf_init( const fapi2::Target& i_target, const uint64_t i_pattern = PATTERN_0 ) { + using ET = mss::mcbistMCTraits; FAPI_INF("superfast init start for %s", mss::c_str(i_target)); uint8_t l_sim = false; @@ -866,7 +869,7 @@ fapi2::ReturnCode sf_init( const fapi2::Target& i_target, sf_init_operation l_init_op(i_target, l_const, l_rc); FAPI_ASSERT( l_rc == fapi2::FAPI2_RC_SUCCESS, - fapi2::MSS_MEMDIAGS_SUPERFAST_INIT_FAILED_TO_INIT().set_MCBIST_TARGET(i_target), + ET::memdiags_sf_init_failed_init().set_MC_TARGET(i_target), "Unable to initialize the MCBIST engine for a sf read %s", mss::c_str(i_target) ); return l_init_op.execute(); @@ -901,6 +904,7 @@ fapi2::ReturnCode sf_read( const fapi2::Target& i_target, const end_boundary i_end = end_boundary::STOP_AFTER_SLAVE_RANK, const mss::mcbist::address& i_end_address = mss::mcbist::address(TT::LARGEST_ADDRESS) ) { + using ET = mss::mcbistMCTraits; FAPI_INF("superfast read - start for %s", mss::c_str(i_target)); fapi2::ReturnCode l_rc; @@ -908,7 +912,7 @@ fapi2::ReturnCode sf_read( const fapi2::Target& i_target, sf_read_operation l_read_op(i_target, l_const, l_rc); FAPI_ASSERT( l_rc == fapi2::FAPI2_RC_SUCCESS, - fapi2::MSS_MEMDIAGS_SUPERFAST_READ_FAILED_TO_INIT().set_MCBIST_TARGET(i_target), + ET::memdiags_sf_init_failed_init().set_MC_TARGET(i_target), "Unable to initialize the MCBIST engine for a sf read %s", mss::c_str(i_target) ); return l_read_op.execute(); @@ -936,6 +940,7 @@ fapi2::ReturnCode background_scrub( const fapi2::Target& i_target, const speed i_speed, const mss::mcbist::address& i_address ) { + using ET = mss::mcbistMCTraits; FAPI_INF("continuous (background) scrub for %s", mss::c_str(i_target)); fapi2::ReturnCode l_rc; @@ -943,7 +948,7 @@ fapi2::ReturnCode background_scrub( const fapi2::Target& i_target, continuous_scrub_operation l_op(i_target, l_const, l_rc); FAPI_ASSERT( l_rc == fapi2::FAPI2_RC_SUCCESS, - fapi2::MSS_MEMDIAGS_CONTINUOUS_SCRUB_FAILED_TO_INIT().set_MCBIST_TARGET(i_target), + ET::memdiags_continuous_scrub_failed_init().set_MC_TARGET(i_target), "Unable to initialize the MCBIST engine for a continuous scrub %s", mss::c_str(i_target) ); return l_op.execute(); @@ -974,6 +979,7 @@ fapi2::ReturnCode targeted_scrub( const fapi2::Target& i_target, const mss::mcbist::address& i_end_address, const end_boundary i_end ) { + using ET = mss::mcbistMCTraits; FAPI_INF("targeted scrub for %s", mss::c_str(i_target)); fapi2::ReturnCode l_rc; @@ -981,7 +987,7 @@ fapi2::ReturnCode targeted_scrub( const fapi2::Target& i_target, targeted_scrub_operation l_op(i_target, l_const, l_rc); FAPI_ASSERT( l_rc == fapi2::FAPI2_RC_SUCCESS, - fapi2::MSS_MEMDIAGS_TARGETED_SCRUB_FAILED_TO_INIT().set_MCBIST_TARGET(i_target), + ET::memdiags_targeted_scrub_failed_init().set_MC_TARGET(i_target), "Unable to initialize the MCBIST engine for a targeted scrub %s", mss::c_str(i_target) ); return l_op.execute(); @@ -1010,6 +1016,7 @@ fapi2::ReturnCode continue_cmd( const fapi2::Target& i_target, { // Too long, make shorter using TT = mss::mcbistTraits; + using ET = mss::mcbistMCTraits; // We can use a local mcbist::program to help with the bit processing, and then write just the registers we touch. mss::mcbist::program l_program; @@ -1067,7 +1074,7 @@ fapi2::ReturnCode continue_cmd( const fapi2::Target& i_target, }; FAPI_ASSERT( l_stopped_at_boundary == false, - fapi2::MSS_MEMDIAGS_ALREADY_AT_BOUNDARY().set_MCBIST_TARGET(i_target).set_BOUNDARY(i_stop), + ET::memdiags_already_at_boundary().set_MC_TARGET(i_target).set_BOUNDARY(i_stop), "Asked to stop at a boundary, but we're already there" ); // Ok, if we're here either we need to change the stop and boundary conditions. @@ -1118,6 +1125,7 @@ fapi_try_exit: template< mss::mc_type MC = DEFAULT_MC_TYPE, fapi2::TargetType T, typename TT = mcbistTraits > fapi2::ReturnCode mss_scrub_helper(const fapi2::Target& i_target ) { + using ET = mss::mcbistMCTraits; FAPI_INF("Start mss_scrub_helper for %s", mss::c_str(i_target)); // If there are no DIMM we don't need to bother. In fact, we can't as we didn't setup @@ -1183,7 +1191,7 @@ fapi2::ReturnCode mss_scrub_helper(const fapi2::Target& i_target ) l_probes); FAPI_ASSERT( l_poll_results == true, - fapi2::MSS_MEMDIAGS_SUPERFAST_INIT_FAILED_TO_INIT().set_MCBIST_TARGET(i_target), + ET::memdiags_sf_init_failed_init().set_MC_TARGET(i_target), "p9_mss_scrub (init) timedout %s", mss::c_str(i_target) ); // Unmask firs after memdiags and turn off FIFO mode diff --git a/src/import/generic/procedures/xml/error_info/generic_error.xml b/src/import/generic/procedures/xml/error_info/generic_error.xml index 08a7ef84a0e..af5fb64f004 100644 --- a/src/import/generic/procedures/xml/error_info/generic_error.xml +++ b/src/import/generic/procedures/xml/error_info/generic_error.xml @@ -67,6 +67,27 @@ + + RC_MSS_FAILED_SPD_REVISION_FALLBACK + + Unable to fall back SPD decoder to the highest decoded + revision. Most likely a programming error. + + FAILED_REVISION + FUNCTION_CODE + + CODE + MEDIUM + + + TARGET + MEDIUM + + + TARGET + + + RC_MSS_FREQ_CL_EXCEEDS_TAA_MAX @@ -128,6 +149,17 @@ + + RC_MSS_FREQ_INDEX_TOO_LARGE + Error calculating the index into max_freq array + INDEX + NUM_MAX_FREQS + + CODE + HIGH + + + RC_MSS_FREQ_INVALID_CALCULATED_TCK @@ -204,6 +236,18 @@ + + RC_MSS_INVALID_CAST_CALC_NCK + Invalid cast or calculation for calc_nck + TIMING_PS + NCK_NS + CORRECTION_FACTOR + + CODE + HIGH + + + RC_MSS_INVALID_CLOCK_PERIOD @@ -216,17 +260,144 @@ - - RC_MSS_INVALID_FREQUENCY - - An invalid frequency was passed to frequency to clock period - - FREQ - - CODE - HIGH - - + + RC_MSS_INVALID_DB_MDQ_DRIVE_STRENGTH + + Bad SPD data for bytes 145 - 147. + Reserved settings for data buffer MDQ drive strength received. + This could be code problem (decoding) or bad SPD. + + DATA_RATE + + CODE + MEDIUM + + + TARGET + HIGH + + + TARGET + + + + + RC_MSS_INVALID_DIMM_SPEED + + Invalid DIMM speed received. Possibly a programming error. + + DIMM_SPEED + + CODE + MEDIUM + + + TARGET + HIGH + + + TARGET + + + + + RC_MSS_INVALID_DIMM_TYPE + + Received a DIMM type unsupported by the SPD decoder factory + + DIMM_TYPE + FUNCTION + + MEMORY_PLUGGING_ERROR + HIGH + + + DIMM_TARGET + LOW + + + DIMM_TARGET + + + CODE + MEDIUM + + + + + RC_MSS_INVALID_DRAM_GEN + + Received a DRAM gen unsupported by the SPD decoder factory + + DRAM_GEN + FUNCTION + + MEMORY_PLUGGING_ERROR + HIGH + + + DIMM_TARGET + LOW + + + DIMM_TARGET + + + CODE + MEDIUM + + + + + RC_MSS_INVALID_FREQUENCY + + An invalid frequency was passed to frequency to clock period + + FREQ + + CODE + HIGH + + + + + RC_MSS_INVALID_FREQ_LIST_PASSED + + Wrong size vector passed into frequency scoreboard function + + SIZE + EXPECTED + + CODE + HIGH + + + + + RC_MSS_INVALID_HYBRID_MODULE + + Received an invalid or unsupported hybrid media (SPD byte 3, bits [6:4]) + for a specified hybrid modue (SPD byte 3, bit [7]) + + HYBRID + HYBRID_MEDIA + FUNCTION + + MEMORY_PLUGGING_ERROR + HIGH + + + TARGET + LOW + + + TARGET + + + CODE + MEDIUM + + RC_MSS_INVALID_PORT_INDEX_PASSED @@ -253,6 +424,47 @@ + + RC_MSS_INVALID_SPD_PARAMETER_RECEIVED + + Unable to fall back SPD decoder to the highest decoded + revision. Most likely a programming error. + + SPD_PARAM + FUNCTION_CODE + + CODE + MEDIUM + + + TARGET + MEDIUM + + + TARGET + + + + + RC_MSS_INVALID_SPD_RESERVED_BITS + + Invalid SPD reserved bits received. + This could be code problem (decoding) or bad SPD. + + FUNCTION_CODE + + CODE + MEDIUM + + + TARGET + HIGH + + + TARGET + + + RC_MSS_INVALID_TIMING_VALUE Invalid value calculated for timing value based on MTB and FTB from SPD. @@ -270,6 +482,36 @@ + + RC_MSS_INVALID_VPD_FREQ_LIST_PASSED + + Wrong size vector passed into limit_freq_by_vpd function + + SIZE + EXPECTED + + CODE + HIGH + + + + + RC_MSS_INVALID_VPD_KEYWORD_MAX + + VPD keyword is too big for space allocated for it. + + MAX + ACTUAL + KEYWORD + + + VPD_PART + VPD_TARGET + + HIGH + + + RC_MSS_LOOKUP_FAILED @@ -287,6 +529,16 @@ + + RC_MSS_MEMDIAGS_NO_MCBIST_SUBTESTS + Attempt to run an MCBIST program with no subtests + MC_TARGET + + CODE + HIGH + + + RC_MSS_VOLT_WRONG_NUMBER_OF_VOLTAGES Incorrect number of voltages supplied to set_voltage_attributes function @@ -543,6 +795,21 @@ + + RC_MSS_MAX_FREQ_ATTR_SIZE_CHANGED + + Number of entries for MSS_MRW_MAX_FREQ attribute from VPD has changed without updating the code + Asserted because direct accesses to array + + ACTUAL_SIZE + SUPPOSED_SIZE + PORT_TARGET + + CODE + HIGH + + + RC_MSS_CALC_PORT_POWER_EXCEEDS_MAX @@ -570,6 +837,66 @@ + + RC_MSS_SPD_REV_ENCODING_LEVEL_NOT_SUPPORTED + + SPD revision on byte 1 (bits 7~4) has a unsupported encoding level + that is greater than the largest decoded SPD decoder. There is + no backward compatible revision to fallback to. This could be + bad SPD or a programming error. + + ENCODING_LEVEL + + CODE + MEDIUM + + + TARGET + MEDIUM + + + TARGET + + + + + RC_MSS_SPD_TIMING_FAIL + + Timing SPD parameter failed to meet JEDEC SPD timing + bounds. FUNCTION_CODE ffdc field encodes which timing param. + + FAILED_REVISION + FUNCTION_CODE + + CODE + MEDIUM + + + TARGET + MEDIUM + + + TARGET + + + + + RC_MSS_TOO_MANY_DIMMS_ON_PORT + There seem to be too many dimms on the port + DIMM_COUNT + + CODE + HIGH + + + + PORT_TARGET + TARGET_TYPE_DIMM + + MEDIUM + + + RC_MSS_SLOT_UTIL_EXCEEDS_PORT