diff options
| author | Stephen Glancy <sglancy@us.ibm.com> | 2017-11-06 15:29:02 -0600 |
|---|---|---|
| committer | Christian R. Geddes <crgeddes@us.ibm.com> | 2017-11-16 17:56:43 -0500 |
| commit | 5ef4ce5ebbcdd8800fbbf4b20ca44e7443d4ebaf (patch) | |
| tree | ef8a27119c1370883efee95a7a1b8496ec99d191 /src/import/chips/p9/procedures/hwp/memory/lib/mcbist | |
| parent | 79acd9f3a8346e5d78c4f6a78264d50298906c5e (diff) | |
| download | talos-hostboot-5ef4ce5ebbcdd8800fbbf4b20ca44e7443d4ebaf.tar.gz talos-hostboot-5ef4ce5ebbcdd8800fbbf4b20ca44e7443d4ebaf.zip | |
Fixes memdiags bad address check
Change-Id: Ie155571594e12335b2a5a0b40360f16277fc7fd2
CQ:SW407643
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/49325
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
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: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: TSUNG K. YEUNG <tyeung@us.ibm.com>
Reviewed-by: ANDRE A. MARIN <aamarin@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/49333
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
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: Christian R. Geddes <crgeddes@us.ibm.com>
Diffstat (limited to 'src/import/chips/p9/procedures/hwp/memory/lib/mcbist')
| -rw-r--r-- | src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.C | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.C b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.C index 91a2cac7f..ba528bffa 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.C @@ -384,19 +384,21 @@ fapi2::ReturnCode operation<TARGET_TYPE_MCBIST>::multi_port_init() FAPI_INF("%s Updating l_dimms size to be %lu", mss::c_str(iv_target), l_dimms.size()); // Bomb out if we have incorrect addresses - // The following asssert catches the error earlier and keeps the error meaningful + // The following asssert catches the error incorrect address error earlier + // It also keeps the error meaningful with an invalid address callout rather than a generic MCBIST error callout { // Note: we are guaranteed to have at least one DIMM, as we are not broadcast capable without DIMM's // The ports are also required to have the same number and type of DIMM's to be broadcast capable // As such, we can be guaranteed that we have at least one DIMM below const uint64_t l_portdimm_this_dimm = mss::relative_pos<TARGET_TYPE_MCBIST>(l_dimms[0]); - FAPI_ASSERT(l_portdimm_this_dimm == l_portdimm_start_address, + FAPI_ASSERT(l_portdimm_this_dimm >= l_portdimm_start_address, fapi2::MSS_MEMDIAGS_BCMODE_INVALID_ADDRESS() .set_MCA_TARGET(l_mcas[0]) .set_START_ADDRESS(l_portdimm_start_address) .set_MCA_START_ADDRESS(l_portdimm_this_dimm) .set_PATTERN(iv_const.iv_pattern), - "%s was passed an invalid address", mss::c_str(l_mcas[0])); + "%s address (%lu) is greater than this MCBIST's first port's address (%lu)", + mss::c_str(l_mcas[0]), l_portdimm_start_address, l_portdimm_this_dimm); } } |
