diff options
| author | Mark Pizzutillo <Mark.Pizzutillo@ibm.com> | 2019-05-28 15:10:10 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2019-05-31 13:57:09 -0500 |
| commit | ae412fdaabaa8341fae18243af62b6406cd42a8a (patch) | |
| tree | 736f713c4fb585fc15a14503f1fe336e2ffef0ff /src | |
| parent | 8fb322bab4c13a7901d944908705daa379812ecc (diff) | |
| download | talos-hostboot-ae412fdaabaa8341fae18243af62b6406cd42a8a.tar.gz talos-hostboot-ae412fdaabaa8341fae18243af62b6406cd42a8a.zip | |
Remove check for eff dimm size in gem_draminit
ATTR_EFF_DIMM_SIZE is set by eff_config which we don't run for Gemini
Therefore, the procedure errors out as the attribute contains 0.
Change-Id: Ie962a2105e744e1533cf686fc9ca26e35a28ad3c
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/77936
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Reviewed-by: Jennifer A Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/77950
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>
Diffstat (limited to 'src')
3 files changed, 3 insertions, 45 deletions
diff --git a/src/import/chips/ocmb/gemini/procedures/hwp/memory/gem_draminit.C b/src/import/chips/ocmb/gemini/procedures/hwp/memory/gem_draminit.C index c72dcfd23..e5533d6d9 100644 --- a/src/import/chips/ocmb/gemini/procedures/hwp/memory/gem_draminit.C +++ b/src/import/chips/ocmb/gemini/procedures/hwp/memory/gem_draminit.C @@ -48,7 +48,6 @@ extern "C" { mss::display_git_commit_info("gem_draminit"); - FAPI_TRY(mss::gem::gem_draminit_check_memory_size(i_target)); FAPI_TRY(mss::gem::gem_draminit_poll_check_calibration(i_target)); return fapi2::FAPI2_RC_SUCCESS; diff --git a/src/import/chips/ocmb/gemini/procedures/hwp/memory/lib/gem_draminit_utils.C b/src/import/chips/ocmb/gemini/procedures/hwp/memory/lib/gem_draminit_utils.C index 460727073..12a35acc5 100644 --- a/src/import/chips/ocmb/gemini/procedures/hwp/memory/lib/gem_draminit_utils.C +++ b/src/import/chips/ocmb/gemini/procedures/hwp/memory/lib/gem_draminit_utils.C @@ -46,40 +46,6 @@ namespace gem { /// -/// @brief Checks that DIMM sizes are 32GB -/// @param[in] i_target the controller -/// @return FAPI2_RC_SUCCESS iff ok -/// -fapi2::ReturnCode gem_draminit_check_memory_size(const fapi2::Target<fapi2::TARGET_TYPE_OCMB_CHIP>& i_target) -{ - if (mss::count_dimm(i_target) == 0) - { - FAPI_INF("NO DIMM on %s", mss::spd::c_str(i_target)); - return fapi2::FAPI2_RC_SUCCESS; - } - - uint32_t l_dimm_size = 0; - - constexpr uint32_t MEMORY_SIZE = 32; // GB - - // Verify 32GB memory size for each DIMM. - for (const auto& l_dimm : mss::find_targets<fapi2::TARGET_TYPE_DIMM>(i_target)) - { - //Function get_dimm_size returns in GB - FAPI_TRY(mss::attr::get_dimm_size(l_dimm, l_dimm_size), "Failed get_dimm_size() for %s", mss::spd::c_str(i_target)); - - FAPI_ASSERT(l_dimm_size == MEMORY_SIZE, fapi2::MSS_GEM_DRAMINIT_DIMM_SIZE_DOESNT_MATCH() - .set_TARGET(i_target) - .set_DIMM(l_dimm) - .set_SIZE_RETURNED(l_dimm_size), "Invalid DIMM size. Received size (%lu) for target DIMM %s", l_dimm_size, - mss::spd::c_str(l_dimm)); - } - -fapi_try_exit: - return fapi2::current_err; -} - -/// /// @brief Polls DRAM calibration register to check for complete /// @param[in] i_target the controller /// @return FAPI2_RC_SUCCESS iff ok @@ -88,8 +54,8 @@ fapi2::ReturnCode gem_draminit_poll_check_calibration(const fapi2::Target<fapi2: { // Address defined here as gemini SCOM address library does not exist constexpr uint64_t GEMINI_CALIBRATION_STATUS_ADDR = 0x08012428; - const uint64_t GEMINI_CALIBRATION_STATUS_BIT_1 = 0x0; - const uint64_t GEMINI_CALIBRATION_STATUS_BIT_2 = 0x1; + constexpr uint64_t GEMINI_CALIBRATION_STATUS_BIT_1 = 0x0; + constexpr uint64_t GEMINI_CALIBRATION_STATUS_BIT_2 = 0x1; // Using default parameters mss::poll_parameters l_poll_params; @@ -111,7 +77,7 @@ fapi2::ReturnCode gem_draminit_poll_check_calibration(const fapi2::Target<fapi2: fapi2::MSS_GEM_DRAMINIT_CALIBRATION_DID_NOT_COMPLETE() .set_OCMB_TARGET(i_target) .set_TARGET(i_target) - .set_REGISTER(GEMINI_CALIBRATION_STATUS_ADDR), "Calibration did not complete for target %s", + .set_REGISTER(GEMINI_CALIBRATION_STATUS_ADDR), "Calibration check timed out for target %s", mss::spd::c_str(i_target)); fapi_try_exit: diff --git a/src/import/chips/ocmb/gemini/procedures/hwp/memory/lib/gem_draminit_utils.H b/src/import/chips/ocmb/gemini/procedures/hwp/memory/lib/gem_draminit_utils.H index 5091d06d1..8a61b749d 100644 --- a/src/import/chips/ocmb/gemini/procedures/hwp/memory/lib/gem_draminit_utils.H +++ b/src/import/chips/ocmb/gemini/procedures/hwp/memory/lib/gem_draminit_utils.H @@ -44,13 +44,6 @@ namespace gem { /// -/// @brief Checks that DIMM sizes are 32GB -/// @param[in] i_target the controller -/// @return FAPI2_RC_SUCCESS iff ok -/// -fapi2::ReturnCode gem_draminit_check_memory_size(const fapi2::Target<fapi2::TARGET_TYPE_OCMB_CHIP>& i_target); - -/// /// @brief Polls DRAM calibration register to check for complete /// @param[in] i_target the controller /// @return FAPI2_RC_SUCCESS iff ok |
