Skip to content

Commit

Permalink
PRD: TPS analyzePhase() for Centaur
Browse files Browse the repository at this point in the history 
Change-Id: I70450c469d1ed0066d2b216dcbf3e1d4e7dd09c6
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/59181
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com>
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/59515
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>
  • Loading branch information
@zane131
zane131 committed May 30, 2018
1 parent b869f42 commit 0848823
Show file tree
Hide file tree
Showing 2 changed files with 109 additions and 72 deletions.
8 changes: 0 additions & 8 deletions src/usr/diag/prdf/plat/mem/prdfMemTps.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,6 @@ class TpsEvent : public TdEntry

#ifdef __HOSTBOOT_RUNTIME

/**
* @brief Analyzes phase 1 of the procedure.
* @param io_sc The step code data struct.
* @param o_done True if the procedure is complete or has aborted.
* @return Non-SUCCESS if an internal function fails, SUCCESS otherwise.
*/
uint32_t analyzeTpsPhase1_rt(STEP_CODE_DATA_STRUCT & io_sc, bool & o_done);

/**
* @brief Does isolation for ECC attentions.
* @param i_eccAttns Mask of all currently active maintenance attentions.
Expand Down
173 changes: 109 additions & 64 deletions src/usr/diag/prdf/plat/mem/prdfMemTps_rt.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,69 +301,6 @@ uint32_t __updateVpdSumAboveOne( CeCount i_sumAboveOneCount,

//------------------------------------------------------------------------------

template<TARGETING::TYPE T>
uint32_t TpsEvent<T>::analyzeTpsPhase1_rt( STEP_CODE_DATA_STRUCT & io_sc,
bool & o_done )
{
#define PRDF_FUNC "[TpsEvent<T>::analyzeTpsPhase1_rt] "

uint32_t o_rc = SUCCESS;

do
{
// Analyze Ecc Attentions
uint32_t eccAttns;
o_rc = checkEccFirs<T>( iv_chip, eccAttns );
if ( SUCCESS != o_rc )
{
PRDF_ERR( PRDF_FUNC "checkEccFirs(0x%08x) failed",
iv_chip->getHuid() );
break;
}

o_rc = analyzeEcc( eccAttns, io_sc, o_done );
if ( SUCCESS != o_rc )
{
PRDF_ERR( PRDF_FUNC "analyzeEcc() failed." );
break;
}
if ( o_done ) break;

// Analyze CEs
o_rc = analyzeCe( io_sc );
if ( SUCCESS != o_rc )
{
PRDF_ERR( PRDF_FUNC "analyzeCe() failed." );
break;
}

// At this point, we are done with the procedure.
o_done = true;

} while (0);

if ( (SUCCESS == o_rc) && o_done )
{
// Clear the ECC FFDC for this master rank.
MemDbUtils::resetEccFfdc<T>( iv_chip, iv_rank, MASTER_RANK );

if ( iv_ban )
{
// Ban TPS on this rank.
MemDbUtils::banTps<T>( iv_chip, iv_rank );

// Permanently mask mainline NCEs and TCEs.
getMcaDataBundle(iv_chip)->iv_maskMainlineNceTce = true;
}
}

return o_rc;

#undef PRDF_FUNC
}

//------------------------------------------------------------------------------

template <>
uint32_t TpsEvent<TYPE_MCA>::analyzeEcc( const uint32_t & i_eccAttns,
STEP_CODE_DATA_STRUCT & io_sc,
Expand Down Expand Up @@ -1134,6 +1071,71 @@ uint32_t TpsEvent<TYPE_MCA>::analyzeCe( STEP_CODE_DATA_STRUCT & io_sc )

//------------------------------------------------------------------------------

template<>
uint32_t TpsEvent<TYPE_MCA>::analyzePhase( STEP_CODE_DATA_STRUCT & io_sc,
bool & o_done )
{
#define PRDF_FUNC "[TpsEvent::analyzePhase] "

uint32_t o_rc = SUCCESS;

do
{
if ( TD_PHASE_0 == iv_phase ) break; // Nothing to analyze yet.

// Analyze Ecc Attentions
uint32_t eccAttns;
o_rc = checkEccFirs<TYPE_MCA>( iv_chip, eccAttns );
if ( SUCCESS != o_rc )
{
PRDF_ERR( PRDF_FUNC "checkEccFirs(0x%08x) failed",
iv_chip->getHuid() );
break;
}

o_rc = analyzeEcc( eccAttns, io_sc, o_done );
if ( SUCCESS != o_rc )
{
PRDF_ERR( PRDF_FUNC "analyzeEcc() failed." );
break;
}
if ( o_done ) break;

// Analyze CEs
o_rc = analyzeCe( io_sc );
if ( SUCCESS != o_rc )
{
PRDF_ERR( PRDF_FUNC "analyzeCe() failed." );
break;
}

// At this point, we are done with the procedure.
o_done = true;

} while (0);

if ( (SUCCESS == o_rc) && o_done )
{
// Clear the ECC FFDC for this master rank.
MemDbUtils::resetEccFfdc<TYPE_MCA>( iv_chip, iv_rank, SLAVE_RANK );

if ( iv_ban )
{
// Ban TPS on this rank.
MemDbUtils::banTps<TYPE_MCA>( iv_chip, iv_rank );

// Permanently mask mainline NCEs and TCEs.
getMcaDataBundle(iv_chip)->iv_maskMainlineNceTce = true;
}
}

return o_rc;

#undef PRDF_FUNC
}

//------------------------------------------------------------------------------

template<>
uint32_t TpsEvent<TYPE_MCA>::nextStep( STEP_CODE_DATA_STRUCT & io_sc,
bool & o_done )
Expand Down Expand Up @@ -1161,7 +1163,7 @@ uint32_t TpsEvent<TYPE_MCA>::nextStep( STEP_CODE_DATA_STRUCT & io_sc,
break;
case TD_PHASE_1:
case TD_PHASE_2:
o_rc = analyzeTpsPhase1_rt( io_sc, o_done );
//o_rc = analyzeTpsPhase1_rt( io_sc, o_done );
break;
default: PRDF_ASSERT( false ); // invalid phase
}
Expand Down Expand Up @@ -1298,6 +1300,49 @@ uint32_t TpsEvent<TYPE_MCA>::startCmd()
//
//##############################################################################

template<>
uint32_t TpsEvent<TYPE_MBA>::analyzePhase( STEP_CODE_DATA_STRUCT & io_sc,
bool & o_done )
{
#define PRDF_FUNC "[TpsEvent::analyzePhase] "

uint32_t o_rc = SUCCESS;

do
{
if ( TD_PHASE_0 == iv_phase ) break; // Nothing to analyze yet.

// Look for any ECC errors that occurred during the command.
uint32_t eccAttns;
o_rc = checkEccFirs<TYPE_MBA>( iv_chip, eccAttns );
if ( SUCCESS != o_rc )
{
PRDF_ERR( PRDF_FUNC "checkEccFirs(0x%08x) failed",
iv_chip->getHuid() );
break;
}

// TODO

} while (0);

if ( (SUCCESS == o_rc) && o_done )
{
// Clear the ECC FFDC for this master rank.
MemDbUtils::resetEccFfdc<TYPE_MBA>( iv_chip, iv_rank, SLAVE_RANK );

// Ban TPS on this rank, if needed.
if ( iv_ban ) MemDbUtils::banTps<TYPE_MBA>( iv_chip, iv_rank );

}

return o_rc;

#undef PRDF_FUNC
}

//------------------------------------------------------------------------------

template<>
uint32_t TpsEvent<TYPE_MBA>::startCmd()
{
Expand Down

0 comments on commit 0848823

Please sign in to comment.