From 3e8219fc02716052fd25528dd4541646bc5078ff Mon Sep 17 00:00:00 2001 From: Stephen Glancy Date: Thu, 23 Mar 2017 13:12:30 -0500 Subject: Fixed blue waterfall workaround bugs Bugs fixed: 1) Workaround was not running on DD1.03 2) Workaround was cuing off of number of ranks not rank pairs Change-Id: I704435ce217827a593d39c7c7ea536946bd86e0c Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38369 Tested-by: Jenkins Server Tested-by: Hostboot CI Reviewed-by: JACOB L. HARVEY Reviewed-by: Brian R. Silver Reviewed-by: Matt K. Light Reviewed-by: Louis Stermole Reviewed-by: Daniel M. Crowell Reviewed-by: ANDRE A. MARIN Reviewed-by: Jennifer A. Stofer Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38372 Tested-by: Jenkins OP Build CI Tested-by: FSP CI Jenkins --- .../p9/procedures/hwp/memory/lib/mss_attribute_accessors_manual.H | 4 +--- .../p9/procedures/hwp/memory/lib/workarounds/dp16_workarounds.C | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'src/import/chips/p9/procedures/hwp/memory') diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mss_attribute_accessors_manual.H b/src/import/chips/p9/procedures/hwp/memory/lib/mss_attribute_accessors_manual.H index c6ff97660..b0235fa73 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/mss_attribute_accessors_manual.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/mss_attribute_accessors_manual.H @@ -270,12 +270,10 @@ inline bool chip_ec_feature_blue_waterfall_adjust(const fapi2::Target& i_targ { const auto l_chip = mss::find_target(i_target); uint8_t l_value = 0; - uint8_t l_do_value = 0; FAPI_TRY( FAPI_ATTR_GET(fapi2::ATTR_CHIP_EC_FEATURE_MSS_BLUE_WATERFALL_ADJUST, l_chip, l_value) ); - FAPI_TRY( FAPI_ATTR_GET(fapi2::ATTR_DO_BLUE_WATERFALL_ADJUST, l_chip, l_do_value) ); - return (l_value != 0) && (l_do_value == fapi2::ENUM_ATTR_DO_BLUE_WATERFALL_ADJUST_YES); + return (l_value != 0); fapi_try_exit: FAPI_ERR("failed accessing ATTR_CHIP_EC_FEATURE_MSS_BLUE_WATERFALL_ADJUST or ATTR_DO_BLUE_WATERFALL_ADJUST: 0x%lx (target: %s)", diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/dp16_workarounds.C b/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/dp16_workarounds.C index 53d19a2ba..16d56cf69 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/dp16_workarounds.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/dp16_workarounds.C @@ -351,11 +351,11 @@ fapi2::ReturnCode fix_blue_waterfall_gate( const fapi2::Target l_primary_ranks; - FAPI_TRY(mss::rank::primary_ranks(i_target, l_primary_ranks)); + std::vector l_rank_pairs; + FAPI_TRY(mss::rank::get_rank_pairs(i_target, l_rank_pairs)); // Loops through all configured rank pairs - for(uint64_t l_rp = 0; l_rp < l_primary_ranks.size(); ++l_rp) + for(const auto& l_rp : l_rank_pairs) { // Loops through all DP16s for(const auto& l_reg : l_dp16_registers[l_rp]) -- cgit v1.2.1