diff options
author | Stephen Glancy <sglancy@us.ibm.com> | 2018-08-02 16:35:37 -0500 |
---|---|---|
committer | Christian R. Geddes <crgeddes@us.ibm.com> | 2018-08-20 16:15:21 -0500 |
commit | 28b83673a11719bac517edb613f01a6ee9bfe566 (patch) | |
tree | 9da5c5789c907854829b13ad2800bfbabd318eb4 /src/import/chips/p9/procedures/hwp/memory/lib/dimm/eff_dimm.C | |
parent | 1b5a02cab7f8c7f0de2536a46ae8c8448023e484 (diff) | |
download | talos-hostboot-28b83673a11719bac517edb613f01a6ee9bfe566.tar.gz talos-hostboot-28b83673a11719bac517edb613f01a6ee9bfe566.zip |
Moves conversions to be in the generic code space
Change-Id: Id0270a97066a06615b165ccd8c84e444d134394e
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/63845
Dev-Ready: STEPHEN GLANCY <sglancy@us.ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/64048
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Diffstat (limited to 'src/import/chips/p9/procedures/hwp/memory/lib/dimm/eff_dimm.C')
-rw-r--r-- | src/import/chips/p9/procedures/hwp/memory/lib/dimm/eff_dimm.C | 34 |
1 files changed, 21 insertions, 13 deletions
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 2e2a49540..9b3243609 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 @@ -41,7 +41,7 @@ #include <lib/eff_config/timing.H> #include <lib/dimm/ddr4/mrs_load_ddr4.H> #include <lib/dimm/rank.H> -#include <lib/utils/conversions.H> +#include <lib/utils/mss_nimbus_conversions.H> #include <generic/memory/lib/utils/find.H> #include <lib/dimm/eff_dimm.H> #include <lib/dimm/mrs_load.H> @@ -2627,21 +2627,29 @@ fapi2::ReturnCode eff_dimm::dram_cwl() // Using an if branch because a ternary conditional wasn't working with params for find_value_from_key if (l_preamble == 0) { - FAPI_TRY( mss::find_value_from_key( CWL_TABLE_1, - iv_freq, - l_cwl), - "Failed finding CAS Write Latency (cwl), freq: %d, preamble %d", - iv_freq, - l_preamble); + FAPI_ASSERT( mss::find_value_from_key( CWL_TABLE_1, + iv_freq, + l_cwl), + fapi2::MSS_DRAM_CWL_ERROR() + .set_TARGET(iv_mca) + .set_FREQ(iv_freq) + .set_PREAMBLE(l_preamble), + "Failed finding CAS Write Latency (cwl), freq: %d, preamble %d", + iv_freq, + l_preamble); } else { - FAPI_TRY( mss::find_value_from_key( CWL_TABLE_2, - iv_freq, - l_cwl), - "Failed finding CAS Write Latency (cwl), freq: %d, preamble %d", - iv_freq, - l_preamble); + FAPI_ASSERT( mss::find_value_from_key( CWL_TABLE_2, + iv_freq, + l_cwl), + fapi2::MSS_DRAM_CWL_ERROR() + .set_TARGET(iv_mca) + .set_FREQ(iv_freq) + .set_PREAMBLE(l_preamble), + "Failed finding CAS Write Latency (cwl), freq: %d, preamble %d", + iv_freq, + l_preamble); } |