From 135432fd65c9dae658be432a2749355d4c3c9de1 Mon Sep 17 00:00:00 2001 From: Jacob Harvey Date: Tue, 11 Jul 2017 15:38:55 -0500 Subject: 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 Tested-by: Hostboot CI Reviewed-by: STEPHEN GLANCY Reviewed-by: Louis Stermole Reviewed-by: Jennifer A. Stofer Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/43118 Reviewed-by: Hostboot Team Tested-by: Jenkins OP Build CI Tested-by: FSP CI Jenkins Tested-by: Jenkins OP HW Reviewed-by: Daniel M. Crowell --- .../chips/p9/procedures/hwp/memory/lib/ccs/ccs.C | 10 ++-- .../p9/procedures/hwp/memory/lib/mcbist/mcbist.C | 10 ++-- .../p9/procedures/hwp/memory/lib/mcbist/mcbist.H | 4 +- .../p9/procedures/hwp/memory/lib/mcbist/memdiags.C | 14 +++--- .../p9/procedures/hwp/memory/p9_mss_memdiag.C | 6 +-- .../chips/p9/procedures/hwp/memory/p9_mss_scrub.C | 2 +- .../xml/error_info/p9_memory_mss_lib.xml | 52 ++++++++++---------- .../xml/error_info/p9_memory_mss_memdiags.xml | 55 ++++++++++------------ 8 files changed, 75 insertions(+), 78 deletions(-) (limited to 'src/import/chips') diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/ccs/ccs.C b/src/import/chips/p9/procedures/hwp/memory/lib/ccs/ccs.C index fdb81388b..521bd0a87 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/ccs/ccs.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/ccs/ccs.C @@ -89,24 +89,24 @@ fapi2::ReturnCode fail_type( const fapi2::Target& i_target, // If the problem lies with the MCBIST, it'll just have to loop FAPI_ASSERT(STAT_READ_MISCOMPARE != i_type, fapi2::MSS_CCS_READ_MISCOMPARE() - .set_TARGET_IN_ERROR(i_target) + .set_MCBIST_TARGET(i_target) .set_MCA_TARGET(i_mca), "%s CCS FAIL Read Miscompare", mss::c_str(i_mca)); // This error is likely due to a bad CCS engine/ MCBIST FAPI_ASSERT(STAT_UE_SUE != i_type, - fapi2::MSS_CCS_UE_SUE().set_TARGET_IN_ERROR(i_target), + fapi2::MSS_CCS_UE_SUE().set_MCBIST_TARGET(i_target), "%s CCS FAIL UE or SUE Error", mss::c_str(i_target)); FAPI_ASSERT(STAT_CAL_TIMEOUT != i_type, fapi2::MSS_CCS_CAL_TIMEOUT() - .set_TARGET_IN_ERROR(i_target) + .set_MCBIST_TARGET(i_target) .set_MCA_TARGET(i_mca), "%s CCS FAIL Calibration Operation Time Out", mss::c_str(i_mca)); // Problem with the CCS engine FAPI_ASSERT(STAT_HUNG != i_type, - fapi2::MSS_CCS_HUNG().set_TARGET_IN_ERROR(i_target), + fapi2::MSS_CCS_HUNG().set_MCBIST_TARGET(i_target), "%s CCS appears hung", mss::c_str(i_target)); fapi_try_exit: return fapi2::current_err; @@ -188,7 +188,7 @@ fapi2::ReturnCode execute( const fapi2::Target& i_target, FAPI_INF("ccs statq (stop) 0x%llx, remaining: %d", stat_reg, poll_remaining); return stat_reg.getBit() != 1; }), - fapi2::MSS_CCS_HUNG_TRYING_TO_STOP().set_TARGET_IN_ERROR(i_target), + fapi2::MSS_CCS_HUNG_TRYING_TO_STOP().set_MCBIST_TARGET(i_target), "CCS appears hung (trying to stop)"); while (l_inst_iter != i_program.iv_instructions.end()) 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& i_target, const program& 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& i_target, const program& 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& i_target, const program& 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& 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& 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& 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::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& i_target, sf_init_operation 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& i_target, sf_read_operation 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& i_t continuous_scrub_operation 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& i_tar targeted_scrub_operation 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& 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. diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_memdiag.C b/src/import/chips/p9/procedures/hwp/memory/p9_mss_memdiag.C index 5f182a8b9..e5b082077 100644 --- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_memdiag.C +++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_memdiag.C @@ -85,7 +85,7 @@ extern "C" { // Note: using MCA here as the scoms used to collect FFDC data fail on the DIMM level target FAPI_ASSERT( !(l_repairs_exceeded.getBit(mss::index(l_dimm))), - fapi2::MSS_MEMDIAGS_REPAIRS_EXCEEDED().set_TARGET(l_mca), + fapi2::MSS_MEMDIAGS_REPAIRS_EXCEEDED().set_MCA_TARGET(l_mca), "p9_mss_memdiag bad bit repairs exceeded %s", mss::c_str(l_mca) ); } @@ -111,7 +111,7 @@ extern "C" FAPI_TRY( mss::ecc::get_fwms(l_mca, l_rank, l_galois, l_type, l_region, l_addr) ); FAPI_ASSERT( l_region == mss::ecc::fwms::mark_region::DISABLED, - fapi2::MSS_MEMDIAGS_CHIPMARK_AND_SYMBOLMARK().set_TARGET(l_mca).set_RANK(l_rank), + fapi2::MSS_MEMDIAGS_CHIPMARK_AND_SYMBOLMARK().set_MCA_TARGET(l_mca).set_RANK(l_rank), "p9_mss_memdiag both chip mark and symbol mark on rank %d: %s", l_rank, mss::c_str(l_mca) ); } } @@ -149,7 +149,7 @@ extern "C" l_probes); FAPI_ASSERT( l_poll_results == true, - 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), "p9_mss_memdiags timedout %s", mss::c_str(i_target) ); } diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_scrub.C b/src/import/chips/p9/procedures/hwp/memory/p9_mss_scrub.C index a6cd6bb7d..11ad22d99 100644 --- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_scrub.C +++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_scrub.C @@ -123,7 +123,7 @@ fapi2::ReturnCode p9_mss_scrub( const fapi2::Target& i_targe l_probes); FAPI_ASSERT( l_poll_results == true, - 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), "p9_mss_scrub (init) timedout %s", mss::c_str(i_target) ); // Unmask firs after memdiags and turn off FIFO mode diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_lib.xml b/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_lib.xml index 1eaa9a8a3..359235310 100644 --- a/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_lib.xml +++ b/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_lib.xml @@ -170,7 +170,7 @@ REG_CONTENTS REG_FFDC_MSS_CCS_FAILURE - TARGET_IN_ERROR + MCBIST_TARGET TARGET_TYPE_MCBIST @@ -194,18 +194,18 @@ REG_CONTENTS REG_FFDC_MSS_CCS_FAILURE - TARGET_IN_ERROR + MCBIST_TARGET TARGET_TYPE_MCBIST - TARGET_IN_ERROR + MCBIST_TARGET HIGH - TARGET_IN_ERROR + MCBIST_TARGET - TARGET_IN_ERROR + MCBIST_TARGET @@ -217,7 +217,7 @@ REG_CONTENTS REG_FFDC_MSS_CCS_FAILURE - TARGET_IN_ERROR + MCBIST_TARGET TARGET_TYPE_MCBIST @@ -239,18 +239,18 @@ REG_FFDC_MSS_CCS_FAILURE - TARGET_IN_ERROR + MCBIST_TARGET TARGET_TYPE_MCBIST - TARGET_IN_ERROR + MCBIST_TARGET HIGH - TARGET_IN_ERROR + MCBIST_TARGET - TARGET_IN_ERROR + MCBIST_TARGET @@ -262,18 +262,18 @@ REG_FFDC_MSS_CCS_FAILURE - TARGET_IN_ERROR + MCBIST_TARGET TARGET_TYPE_MCBIST - TARGET_IN_ERROR + MCBIST_TARGET HIGH - TARGET_IN_ERROR + MCBIST_TARGET - TARGET_IN_ERROR + MCBIST_TARGET @@ -285,18 +285,18 @@ REG_FFDC_MSS_CCS_FAILURE - TARGET_IN_ERROR + MCBIST_TARGET TARGET_TYPE_MCBIST - TARGET_IN_ERROR + MCBIST_TARGET HIGH - TARGET_IN_ERROR + MCBIST_TARGET - TARGET_IN_ERROR + MCBIST_TARGET @@ -308,18 +308,18 @@ STATUS_REGISTER REG_FFDC_MSS_CCS_FAILURE - TARGET_IN_ERROR + MCBIST_TARGET TARGET_TYPE_MCBIST - TARGET_IN_ERROR + MCBIST_TARGET HIGH - TARGET_IN_ERROR + MCBIST_TARGET - TARGET_IN_ERROR + MCBIST_TARGET @@ -329,18 +329,18 @@ STATUS_REGISTER REG_FFDC_MSS_CCS_FAILURE - TARGET_IN_ERROR + MCBIST_TARGET TARGET_TYPE_MCBIST - TARGET_IN_ERROR + MCBIST_TARGET HIGH - TARGET_IN_ERROR + MCBIST_TARGET - TARGET_IN_ERROR + MCBIST_TARGET diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_memdiags.xml b/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_memdiags.xml index 539759838..f587c4067 100644 --- a/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_memdiags.xml +++ b/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_memdiags.xml @@ -89,11 +89,11 @@ STATUS1 REG_FFDC_MSS_MEMDIAGS_FAILURE - TARGET + MCBIST_TARGET TARGET_TYPE_MCBIST - TARGET + MCBIST_TARGET HIGH @@ -105,11 +105,11 @@ SUBTEST REG_FFDC_MSS_MEMDIAGS_FAILURE - TARGET + MCBIST_TARGET TARGET_TYPE_MCBIST - TARGET + MCBIST_TARGET HIGH @@ -203,7 +203,7 @@ SIZE REG_FFDC_MSS_MEMDIAGS_FAILURE - TARGET + MCBIST_TARGET TARGET_TYPE_MCBIST @@ -215,14 +215,13 @@ RC_MSS_MEMDIAGS_MCBIST_FAILED_TO_START The MCBIST engine failed to start its program - TARGET REG_FFDC_MSS_MEMDIAGS_FAILURE - TARGET + MCBIST_TARGET TARGET_TYPE_MCBIST - TARGET + MCBIST_TARGET HIGH @@ -230,14 +229,13 @@ RC_MSS_MEMDIAGS_MCBIST_FAILED_TO_STOP The MCBIST engine failed to stop its program - TARGET REG_FFDC_MSS_MEMDIAGS_FAILURE - TARGET + MCBIST_TARGET TARGET_TYPE_MCBIST - TARGET + MCBIST_TARGET HIGH @@ -247,10 +245,10 @@ The port used in an MCBIST program is not functional RELATIVE_PORT_POSITION ADDRESS - TARGET + MCBIST_TARGET REG_FFDC_MSS_MEMDIAGS_FAILURE - TARGET + MCBIST_TARGET TARGET_TYPE_MCBIST @@ -264,11 +262,11 @@ A superfast read operation failed initialization REG_FFDC_MSS_MEMDIAGS_FAILURE - TARGET + MCBIST_TARGET TARGET_TYPE_MCBIST - TARGET + MCBIST_TARGET HIGH @@ -278,11 +276,11 @@ A superfast init operation failed initialization REG_FFDC_MSS_MEMDIAGS_FAILURE - TARGET + MCBIST_TARGET TARGET_TYPE_MCBIST - TARGET + MCBIST_TARGET HIGH @@ -292,11 +290,11 @@ A continuous scrub operation failed initialization REG_FFDC_MSS_MEMDIAGS_FAILURE - TARGET + MCBIST_TARGET TARGET_TYPE_MCBIST - TARGET + MCBIST_TARGET HIGH @@ -306,11 +304,11 @@ A continuous scrub operation failed initialization REG_FFDC_MSS_MEMDIAGS_FAILURE - TARGET + MCBIST_TARGET TARGET_TYPE_MCBIST - TARGET + MCBIST_TARGET HIGH @@ -318,11 +316,11 @@ RC_MSS_MEMDIAGS_ALREADY_AT_BOUNDARY A continue request asked to stop at a boundary, but we are there already - TARGET + MCBIST_TARGET BOUNDARY REG_FFDC_MSS_MEMDIAGS_FAILURE - TARGET + MCBIST_TARGET TARGET_TYPE_MCBIST @@ -334,7 +332,7 @@ RC_MSS_MEMDIAGS_NO_MCBIST_SUBTESTS Attempt to run an MCBIST program with no subtests - TARGET + MCBIST_TARGET CODE HIGH @@ -344,14 +342,13 @@ RC_MSS_MEMDIAGS_REPAIRS_EXCEEDED A mark repair operation failed to repair enough bad bits - TARGET REG_FFDC_MSS_MARK_REPAIR_FAILURE - TARGET + MCA_TARGET TARGET_TYPE_MCA - TARGET + MCA_TARGET HIGH @@ -359,11 +356,11 @@ RC_MSS_MEMDIAGS_CHIPMARK_AND_SYMBOLMARK A mark repair operation set both a chipmark and symbol mark on one rank - TARGET + MCA_TARGET RANK REG_FFDC_MSS_MARK_REPAIR_FAILURE - TARGET + MCA_TARGET TARGET_TYPE_MCA -- cgit v1.2.1