summaryrefslogtreecommitdiffstats
path: root/src/import/chips/p9/procedures/hwp/memory/lib/mcbist
diff options
context:
space:
mode:
authorJacob Harvey <jlharvey@us.ibm.com>2017-07-11 15:38:55 -0500
committerDaniel M. Crowell <dcrowell@us.ibm.com>2017-07-17 14:50:13 -0400
commit135432fd65c9dae658be432a2749355d4c3c9de1 (patch)
treeb9e090b83968431694b41bb415dc1e8d22279662 /src/import/chips/p9/procedures/hwp/memory/lib/mcbist
parente91a838b7fef46066fc90b622dacc99efd4b243e (diff)
downloadtalos-hostboot-135432fd65c9dae658be432a2749355d4c3c9de1.tar.gz
talos-hostboot-135432fd65c9dae658be432a2749355d4c3c9de1.zip
Clean up memdiags ffdc naming
Just changing the names of TARGET to MCBIST_TARGET or MCA_TARGET Better reflects the target type so we don't get errors collecting register data Change-Id: I9b450f2128ca425dee38cd7ea6f2879dd52581f5 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/43005 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com> Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com> Reviewed-by: Louis Stermole <stermole@us.ibm.com> Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com> Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/43118 Reviewed-by: Hostboot Team <hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-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/import/chips/p9/procedures/hwp/memory/lib/mcbist')
-rw-r--r--src/import/chips/p9/procedures/hwp/memory/lib/mcbist/mcbist.C10
-rw-r--r--src/import/chips/p9/procedures/hwp/memory/lib/mcbist/mcbist.H4
-rw-r--r--src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.C14
3 files changed, 14 insertions, 14 deletions
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/mcbist.C b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/mcbist.C
index 8a0f3a7c3..bd9ac2b89 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/mcbist.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/mcbist.C
@@ -386,7 +386,7 @@ fapi2::ReturnCode poll( const fapi2::Target<T>& i_target, const program<T>& i_pr
// 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_TARGET_IN_ERROR(i_target),
+ fapi2::MSS_MCBIST_TIMEOUT().set_MCBIST_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
@@ -400,7 +400,7 @@ fapi2::ReturnCode poll( const fapi2::Target<T>& i_target, const program<T>& i_pr
// 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_TARGET_IN_ERROR(i_target)
+ .set_MCBIST_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 );
@@ -411,7 +411,7 @@ fapi2::ReturnCode poll( const fapi2::Target<T>& i_target, const program<T>& i_pr
FAPI_ASSERT(false,
fapi2::MSS_MCBIST_DATA_FAIL()
- .set_TARGET_IN_ERROR(i_target)
+ .set_MCBIST_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 );
@@ -439,7 +439,7 @@ fapi2::ReturnCode execute( const fapi2::Target<TARGET_TYPE_MCBIST>& i_target,
// 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_TARGET(i_target),
+ fapi2::MSS_MEMDIAGS_NO_MCBIST_SUBTESTS().set_MCBIST_TARGET(i_target),
"Attempt to run an MCBIST program with no subtests on %s", mss::c_str(i_target));
// Implement any mcbist work-arounds.
@@ -495,7 +495,7 @@ fapi2::ReturnCode execute( const fapi2::Target<TARGET_TYPE_MCBIST>& i_target,
// 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_TARGET(i_target),
+ fapi2::MSS_MEMDIAGS_MCBIST_FAILED_TO_START().set_MCBIST_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/chips/p9/procedures/hwp/memory/lib/mcbist/mcbist.H b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/mcbist.H
index d3399197c..3d71e9ff7 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/mcbist.H
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/mcbist.H
@@ -2127,7 +2127,7 @@ class program
FAPI_ASSERT( l_port == 0,
fapi2::MSS_MEMDIAGS_COMPARE_ERROR_IN_LAST_PATTERN()
- .set_TARGET(i_target)
+ .set_MCBIST_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 );
@@ -2143,7 +2143,7 @@ class program
FAPI_ASSERT( ((l_read0 == 0) && (l_read1 == 0)),
fapi2::MSS_MEMDIAGS_ERROR_IN_LAST_PATTERN()
- .set_TARGET(i_target)
+ .set_MCBIST_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 );
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 3a25dd8c9..09ab4f568 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
@@ -96,7 +96,7 @@ fapi2::ReturnCode stop( const fapi2::Target<TARGET_TYPE_MCBIST>& 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_TARGET(i_target),
+ fapi2::MSS_MEMDIAGS_MCBIST_FAILED_TO_STOP().set_MCBIST_TARGET(i_target),
"The MCBIST engine failed to stop its program" );
fapi_try_exit:
@@ -164,7 +164,7 @@ fapi2::ReturnCode operation<TARGET_TYPE_MCBIST>::single_port_init()
fapi2::MSS_MEMDIAGS_PORT_NOT_FUNCTIONAL()
.set_RELATIVE_PORT_POSITION(l_relative_port_number)
.set_ADDRESS( uint64_t(iv_const.iv_start_address) )
- .set_TARGET(iv_target),
+ .set_MCBIST_TARGET(iv_target),
"Port with relative postion %d is not functional", l_relative_port_number );
// No broadcast mode for this one
@@ -522,7 +522,7 @@ fapi2::ReturnCode sf_init( const fapi2::Target<TARGET_TYPE_MCBIST>& i_target,
sf_init_operation<TARGET_TYPE_MCBIST> l_init_op(i_target, l_const, l_rc);
FAPI_ASSERT( l_rc == FAPI2_RC_SUCCESS,
- fapi2::MSS_MEMDIAGS_SUPERFAST_INIT_FAILED_TO_INIT().set_TARGET(i_target),
+ fapi2::MSS_MEMDIAGS_SUPERFAST_INIT_FAILED_TO_INIT().set_MCBIST_TARGET(i_target),
"Unable to initialize the MCBIST engine for a sf read %s", mss::c_str(i_target) );
return l_init_op.execute();
@@ -558,7 +558,7 @@ fapi2::ReturnCode sf_read( const fapi2::Target<TARGET_TYPE_MCBIST>& i_target,
sf_read_operation<TARGET_TYPE_MCBIST> l_read_op(i_target, l_const, l_rc);
FAPI_ASSERT( l_rc == FAPI2_RC_SUCCESS,
- fapi2::MSS_MEMDIAGS_SUPERFAST_READ_FAILED_TO_INIT().set_TARGET(i_target),
+ fapi2::MSS_MEMDIAGS_SUPERFAST_READ_FAILED_TO_INIT().set_MCBIST_TARGET(i_target),
"Unable to initialize the MCBIST engine for a sf read %s", mss::c_str(i_target) );
return l_read_op.execute();
@@ -590,7 +590,7 @@ fapi2::ReturnCode background_scrub( const fapi2::Target<TARGET_TYPE_MCBIST>& i_t
continuous_scrub_operation<TARGET_TYPE_MCBIST> l_op(i_target, l_const, l_rc);
FAPI_ASSERT( l_rc == FAPI2_RC_SUCCESS,
- fapi2::MSS_MEMDIAGS_CONTINUOUS_SCRUB_FAILED_TO_INIT().set_TARGET(i_target),
+ fapi2::MSS_MEMDIAGS_CONTINUOUS_SCRUB_FAILED_TO_INIT().set_MCBIST_TARGET(i_target),
"Unable to initialize the MCBIST engine for a continuous scrub %s", mss::c_str(i_target) );
return l_op.execute();
@@ -624,7 +624,7 @@ fapi2::ReturnCode targeted_scrub( const fapi2::Target<TARGET_TYPE_MCBIST>& i_tar
targeted_scrub_operation<TARGET_TYPE_MCBIST> l_op(i_target, l_const, l_rc);
FAPI_ASSERT( l_rc == FAPI2_RC_SUCCESS,
- fapi2::MSS_MEMDIAGS_TARGETED_SCRUB_FAILED_TO_INIT().set_TARGET(i_target),
+ fapi2::MSS_MEMDIAGS_TARGETED_SCRUB_FAILED_TO_INIT().set_MCBIST_TARGET(i_target),
"Unable to initialize the MCBIST engine for a targeted scrub %s", mss::c_str(i_target) );
return l_op.execute();
@@ -708,7 +708,7 @@ fapi2::ReturnCode continue_cmd( const fapi2::Target<TARGET_TYPE_MCBIST>& i_targe
};
FAPI_ASSERT( l_stopped_at_boundary == false,
- fapi2::MSS_MEMDIAGS_ALREADY_AT_BOUNDARY().set_TARGET(i_target).set_BOUNDARY(i_stop),
+ fapi2::MSS_MEMDIAGS_ALREADY_AT_BOUNDARY().set_MCBIST_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.
OpenPOWER on IntegriCloud