Skip to content

Commit

Permalink
PRD: RTC TODO updates for memory subsystem
Browse files Browse the repository at this point in the history 
Change-Id: I898bee4977df94c54cf1f9a4bae66c6a522a5c37
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38593
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38699
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
  • Loading branch information
@zane131
zane131 committed Apr 3, 2017
1 parent 5284cb4 commit dfb45d7
Show file tree
Hide file tree
Showing 15 changed files with 69 additions and 56 deletions.
28 changes: 14 additions & 14 deletions src/usr/diag/prdf/common/plat/prdfPlatServices_common.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
#include <prdfTrace.H>
#include <prdfErrlUtil.H>

//#include <prdfCenAddress.H> TODO RTC 136126
//#include <prdfCenDqBitmap.H> TODO RTC 136126
//#include <prdfCenMarkstore.H> TODO RTC 136126
//#include <prdfCenAddress.H> TODO RTC 157888
//#include <prdfCenDqBitmap.H> TODO RTC 157888
//#include <prdfCenMarkstore.H> TODO RTC 157888

//#include <dimmBadDqBitmapFuncs.H> // for dimm[S|G]etBadDqBitmap() TODO RTC 136126
//#include <dimmBadDqBitmapFuncs.H> // for dimm[S|G]etBadDqBitmap() TODO RTC 164707

//#include <io_read_erepair.H> TODO RTC 136120
//#include <io_power_down_lanes.H> TODO RTC 136120
Expand Down Expand Up @@ -269,7 +269,7 @@ int32_t erepairFirIsolation(TargetHandle_t i_rxBusTgt)
//## Memory specific functions
//##############################################################################

/* TODO RTC 136126
/* TODO RTC 157888
// Helper function for the for several other memory functions.
int32_t getMemAddrRange( TargetHandle_t i_mba, uint8_t i_mrank,
ecmdDataBufferBase & o_startAddr,
Expand Down Expand Up @@ -343,7 +343,7 @@ int32_t getMemAddrRange( TargetHandle_t i_mba, uint8_t i_mrank,

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

/* TODO RTC 136126
/* TODO RTC 164707
int32_t getBadDqBitmap( TargetHandle_t i_mba, const CenRank & i_rank,
CenDqBitmap & o_bitmap, bool i_allowNoDimm )
{
Expand Down Expand Up @@ -391,7 +391,7 @@ int32_t getBadDqBitmap( TargetHandle_t i_mba, const CenRank & i_rank,

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

/* TODO RTC 136126
/* TODO RTC 164707
int32_t setBadDqBitmap( TargetHandle_t i_mba, const CenRank & i_rank,
const CenDqBitmap & i_bitmap )
{
Expand Down Expand Up @@ -429,7 +429,7 @@ int32_t setBadDqBitmap( TargetHandle_t i_mba, const CenRank & i_rank,

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

/* TODO RTC 136126
/* TODO RTC 157888
int32_t mssGetMarkStore( TargetHandle_t i_mba, const CenRank & i_rank,
CenMark & o_mark )
{
Expand Down Expand Up @@ -495,7 +495,7 @@ int32_t mssGetMarkStore( TargetHandle_t i_mba, const CenRank & i_rank,

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

/* TODO RTC 136126
/* TODO RTC 157888
int32_t mssSetMarkStore( TargetHandle_t i_mba, const CenRank & i_rank,
CenMark & io_mark, bool & o_writeBlocked,
bool i_allowWriteBlocked )
Expand Down Expand Up @@ -554,7 +554,7 @@ int32_t mssSetMarkStore( TargetHandle_t i_mba, const CenRank & i_rank,

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

/* TODO RTC 136126
/* TODO RTC 157888
int32_t mssGetSteerMux( TargetHandle_t i_mba, const CenRank & i_rank,
CenSymbol & o_port0Spare, CenSymbol & o_port1Spare,
CenSymbol & o_eccSpare )
Expand Down Expand Up @@ -588,7 +588,7 @@ int32_t mssGetSteerMux( TargetHandle_t i_mba, const CenRank & i_rank,

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

/* TODO RTC 136126
/* TODO RTC 157888
int32_t mssSetSteerMux( TargetHandle_t i_mba, const CenRank & i_rank,
const CenSymbol & i_symbol, bool i_x4EccSpare )
{
Expand Down Expand Up @@ -616,7 +616,7 @@ int32_t mssSetSteerMux( TargetHandle_t i_mba, const CenRank & i_rank,

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

/* TODO RTC 136126
/* TODO RTC 157888
int32_t getMemAddrRange( TargetHandle_t i_mba, CenAddr & o_startAddr,
CenAddr & o_endAddr )
{
Expand All @@ -642,7 +642,7 @@ int32_t getMemAddrRange( TargetHandle_t i_mba, CenAddr & o_startAddr,

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

/* TODO RTC 136126
/* TODO RTC 157888
int32_t getMemAddrRange( TargetHandle_t i_mba, const CenRank & i_rank,
CenAddr & o_startAddr, CenAddr & o_endAddr,
bool i_slaveOnly )
Expand Down Expand Up @@ -916,7 +916,7 @@ int32_t getMemBufRawCardType( TargetHandle_t i_mba,
//## Maintenance Command class wrapper
//##############################################################################

/* TODO RTC 136126
/* TODO RTC 157888
mss_MaintCmdWrapper::mss_MaintCmdWrapper( mss_MaintCmd * i_maintCmd ) :
iv_cmd(i_maintCmd)
{}
Expand Down
26 changes: 13 additions & 13 deletions src/usr/diag/prdf/common/plat/prdfPlatServices_common.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#include <prdfTimer.H>
#include <prdfParserEnums.H>

//#include <dimmConsts.H> // for DIMM_DQ_RANK_BITMAP_SIZE TODO RTC 136126
//#include <dimmConsts.H> // for DIMM_DQ_RANK_BITMAP_SIZE TODO RTC 164707

#include <plat_hwp_invoker.H>

Expand Down Expand Up @@ -213,7 +213,7 @@ int32_t erepairFirIsolation(TARGETING::TargetHandle_t i_rxBusTgt);
* possible ranks. Default is FALSE.
* @return Non-SUCCESS if an internal function fails, SUCCESS otherwise.
*/
/* TODO RTC 136126
/* TODO RTC 164707
int32_t getBadDqBitmap( TARGETING::TargetHandle_t i_mba, const CenRank & i_rank,
CenDqBitmap & o_bitmap, bool i_allowNoDimm = false );
*/
Expand All @@ -226,7 +226,7 @@ int32_t getBadDqBitmap( TARGETING::TargetHandle_t i_mba, const CenRank & i_rank,
* @note This is a no-op if DRAM Repairs are disabled in manufacturing.
* @return Non-SUCCESS if an internal function fails, SUCCESS otherwise.
*/
/* TODO RTC 136126
/* TODO RTC 164707
int32_t setBadDqBitmap( TARGETING::TargetHandle_t i_mba, const CenRank & i_rank,
const CenDqBitmap & i_bitmap );
*/
Expand All @@ -238,7 +238,7 @@ int32_t setBadDqBitmap( TARGETING::TargetHandle_t i_mba, const CenRank & i_rank,
* @param o_mark The returned mark.
* @return Non-SUCCESS in internal function fails, SUCCESS otherwise.
*/
/* TODO RTC 136126
/* TODO RTC 157888
int32_t mssGetMarkStore( TARGETING::TargetHandle_t i_mba,
const CenRank & i_rank, CenMark & o_mark );
*/
Expand All @@ -263,7 +263,7 @@ int32_t mssGetMarkStore( TARGETING::TargetHandle_t i_mba,
* time, so do a RMW operation to avoid overwritting a previous mark.
* @return Non-SUCCESS in internal function fails, SUCCESS otherwise.
*/
/* TODO RTC 136126
/* TODO RTC 157888
int32_t mssSetMarkStore( TARGETING::TargetHandle_t i_mba,
const CenRank & i_rank, CenMark & io_mark,
bool & o_writeBlocked,
Expand All @@ -279,7 +279,7 @@ int32_t mssSetMarkStore( TARGETING::TargetHandle_t i_mba,
* @param o_eccSpare A symbol associated with the ECC spare (x4 mode only).
* @return Non-SUCCESS in internal function fails, SUCCESS otherwise.
*/
/* TODO RTC 136126
/* TODO RTC 157888
int32_t mssGetSteerMux( TARGETING::TargetHandle_t i_mba, const CenRank & i_rank,
CenSymbol & o_port0Spare, CenSymbol & o_port1Spare,
CenSymbol & o_eccSpare );
Expand All @@ -294,7 +294,7 @@ int32_t mssGetSteerMux( TARGETING::TargetHandle_t i_mba, const CenRank & i_rank,
* @note The procedure will be able to derive the port from the given symbol.
* @return Non-SUCCESS in internal function fails, SUCCESS otherwise.
*/
/* TODO RTC 136126
/* TODO RTC 157888
int32_t mssSetSteerMux( TARGETING::TargetHandle_t i_mba, const CenRank & i_rank,
const CenSymbol & i_symbol, bool i_x4EccSpare );
*/
Expand All @@ -306,7 +306,7 @@ int32_t mssSetSteerMux( TARGETING::TargetHandle_t i_mba, const CenRank & i_rank,
* @param o_endAddr The return end address.
* @return Non-SUCCESS in internal function fails, SUCCESS otherwise.
*/
/* TODO RTC 136126
/* TODO RTC 157888
int32_t getMemAddrRange( TARGETING::TargetHandle_t i_mba, CenAddr & o_startAddr,
CenAddr & o_endAddr );
*/
Expand All @@ -321,7 +321,7 @@ int32_t getMemAddrRange( TARGETING::TargetHandle_t i_mba, CenAddr & o_startAddr,
* @param i_slaveOnly true = slave rank only, false = master rank (default).
* @return Non-SUCCESS in internal function fails, SUCCESS otherwise.
*/
/* TODO RTC 136126
/* TODO RTC 157888
int32_t getMemAddrRange( TARGETING::TargetHandle_t i_mba,
const CenRank & i_rank, CenAddr & o_startAddr,
CenAddr & o_endAddr, bool i_slaveOnly = false );
Expand All @@ -347,7 +347,7 @@ TARGETING::TargetHandle_t getMasterCore( TARGETING::TargetHandle_t i_procTgt );
* spare can be on High nibble or low nibble. This function will
* populate spare config information in o_spareConfig.
*/
/* TODO RTC 136126
/* TODO RTC 157888
int32_t getDimmSpareConfig( TARGETING::TargetHandle_t i_mba, CenRank i_rank,
uint8_t i_ps, uint8_t & o_spareConfig );
*/
Expand Down Expand Up @@ -377,7 +377,7 @@ void getDimmDqAttr( TARGETING::TargetHandle_t i_target,
//## Maintenance Command class wrapper
//##############################################################################

// TODO: RTC 136126
// TODO: RTC 157888
///**
// * @brief This is a wrapper class for underlying maintenance class object
// *
Expand Down Expand Up @@ -473,7 +473,7 @@ void getDimmDqAttr( TARGETING::TargetHandle_t i_target,
* that contains i_rank, but the target address range can be modified
* with i_flags and/or i_sAddrOverride.
*/
/* TODO RTC 136126
/* TODO RTC 157888
mss_MaintCmdWrapper * createMssCmd( mss_MaintCmdWrapper::CmdType i_cmdType,
TARGETING::TargetHandle_t i_mba,
const CenRank & i_rank, uint32_t i_stopCond,
Expand All @@ -490,7 +490,7 @@ mss_MaintCmdWrapper * createMssCmd( mss_MaintCmdWrapper::CmdType i_cmdType,
* @note This function allocates memory on heap for mss_MaintCmdWrapper
* object. It is the caller's responsibilty to delete this object.
*/
/* TODO RTC 136126
/* TODO RTC 157888
mss_MaintCmdWrapper * createIncAddrMssCmd( TARGETING::TargetHandle_t i_mba );
*/

Expand Down
1 change: 0 additions & 1 deletion src/usr/diag/prdf/common/plat/prdfRasServices_common.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
#include <prdfCallouts.H>
#include <prdfMemoryMru.H>
#include <prdfPlatServices.H>
//#include <prdfCenMbaCaptureData.H> TODO: RTC 136126

// For compression routines
#define PRDF_COMPRESSBUFFER_COMPRESS_FUNCTIONS
Expand Down
1 change: 0 additions & 1 deletion src/usr/diag/prdf/common/plat/prdfTargetServices.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@

// External includes
#include <algorithm>
//#include <fapi.H> TODO RTC 136126
#include <targeting/common/targetservice.H>
#include <targeting/common/utilFilter.H>

Expand Down
4 changes: 3 additions & 1 deletion src/usr/diag/prdf/common/plugins/prdfLogParse_common.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -431,11 +431,13 @@ bool parseCaptureData( void * i_buffer, uint32_t i_buflen,
{
parseMemCeTable( sigData, sigDataSize, i_parser );
}
/* TODO: RTC 136126
/* TODO: RTC 157888
else if ( Util::hashString("MEM_RCE_TABLE") == sigId )
{
parseMemRceTable( sigData, sigDataSize, i_parser );
}
*/
/* TODO: RTC 164707
else if ( Util::hashString("DRAM_REPAIRS_DATA") == sigId )
{
parseDramRepairsData( sigData, sigDataSize, i_parser );
Expand Down
10 changes: 5 additions & 5 deletions src/usr/diag/prdf/common/plugins/prdfMemLogParse.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2774,7 +2774,7 @@ uint8_t dqSiteIdx2DramSiteIdx( uint8_t i_dqSiteIdx, bool i_isX4Dram )
// Helper functions
//------------------------------------------------------------------------------

/* TODO RTC 136126
/* TODO RTC 164707
// Displays symbol value. If symbol is not valid, will display '--' in output.
void getDramRepairSymbolStr( uint8_t i_value, char * o_str, uint32_t i_strSize )
{
Expand Down Expand Up @@ -3176,7 +3176,7 @@ bool parseMemCeTable( uint8_t * i_buffer, uint32_t i_buflen,

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

/* TODO RTC 136126
/* TODO RTC 157888
bool parseMemRceTable( uint8_t * i_buffer, uint32_t i_buflen,
ErrlUsrParser & i_parser )
{
Expand Down Expand Up @@ -3224,7 +3224,7 @@ bool parseMemRceTable( uint8_t * i_buffer, uint32_t i_buflen,

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

/* TODO RTC 136126
/* TODO RTC 164707
bool parseDramRepairsData( uint8_t * i_buffer, uint32_t i_buflen,
ErrlUsrParser & i_parser )
{
Expand Down Expand Up @@ -3294,7 +3294,7 @@ bool parseDramRepairsData( uint8_t * i_buffer, uint32_t i_buflen,

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

/* TODO RTC 136126
/* TODO RTC 164707
bool parseDramRepairsVpd( uint8_t * i_buffer, uint32_t i_buflen,
ErrlUsrParser & i_parser )
{
Expand All @@ -3320,7 +3320,7 @@ bool parseDramRepairsVpd( uint8_t * i_buffer, uint32_t i_buflen,

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

/* TODO RTC 136126
/* TODO RTC 164707
bool parseBadDqBitmap( uint8_t * i_buffer, uint32_t i_buflen,
ErrlUsrParser & i_parser )
{
Expand Down
2 changes: 1 addition & 1 deletion src/usr/diag/prdf/common/plugins/prdfParserEnums.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ namespace RCE_TABLE

} // namespace RCE_TABLE

/* TODO: RTC 136126
/* TODO: RTC 164707
namespace DQ_BITMAP
{
enum
Expand Down
12 changes: 9 additions & 3 deletions src/usr/diag/prdf/plat/mem/prdfMemTdCtlr_rt.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ uint32_t MemTdCtlr<T>::handleTdEvent( STEP_CODE_DATA_STRUCT & io_sc,
break;
}

// Since we had to manually stop the maintenance command, refresh all
// relevant registers that may have changed since the initial capture.
// TODO: RTC 166837

// Move onto the next step in the state machine.
o_rc = nextStep( io_sc );
if ( SUCCESS != o_rc )
Expand Down Expand Up @@ -107,7 +111,7 @@ uint32_t MemTdCtlr<T>::initialize()
if ( iv_initialized ) break; // nothing to do

// Add any unverified chip marks to the TD queue
// TODO: RTC 136126
// TODO: RTC 171866

// At this point, the TD controller is initialized.
iv_initialized = true;
Expand Down Expand Up @@ -139,6 +143,8 @@ uint32_t MemTdCtlr<T>::defaultStep( STEP_CODE_DATA_STRUCT & io_sc )
nextRank.getRank().getSlave() );

// Restart background scrubbing on the next rank.
// TODO: RTC 171875 Need mechanism to resume on next address (via HWP)
// if no targeted diagnostics have been run.
o_rc = startBgScrub<T>( nextRank.getChip(), nextRank.getRank() );
if ( SUCCESS != o_rc )
{
Expand Down Expand Up @@ -168,7 +174,7 @@ uint32_t MemTdCtlr<TYPE_MCBIST>::checkEcc( bool & o_errorsFound,

o_errorsFound = false;

/* TODO: RTC 136126
/* TODO: RTC 171915
MemRank rank = iv_stoppedRank.getRank();
do
Expand Down Expand Up @@ -220,7 +226,7 @@ uint32_t MemTdCtlr<TYPE_MBA>::checkEcc( bool & o_errorsFound,

o_errorsFound = false;

/* TODO: RTC 136126
/* TODO: RTC 171915
MemRank rank = iv_stoppedRank.getRank();
o_rc = __checkEcc<TYPE_MBA>( iv_chip, rank, iv_queue, io_sc,
Expand Down
4 changes: 2 additions & 2 deletions src/usr/diag/prdf/plat/mem/prdfMemTps_rt.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2016 */
/* Contributors Listed Below - COPYRIGHT 2016,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -35,7 +35,7 @@ namespace PRDF

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

// TODO: RTC 136126 Actual implementation of this procedure will be done later.
// TODO: RTC 171914 Actual implementation of this procedure will be done later.
template<>
uint32_t TpsEvent<TYPE_MCA>::nextStep( STEP_CODE_DATA_STRUCT & io_sc,
bool & o_done )
Expand Down
4 changes: 2 additions & 2 deletions src/usr/diag/prdf/plat/mem/prdfMemVcm_rt.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2016 */
/* Contributors Listed Below - COPYRIGHT 2016,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -35,7 +35,7 @@ namespace PRDF

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

// TODO: RTC 136126 Actual implementation of this procedure will be done later.
// TODO: RTC 171913 Actual implementation of this procedure will be done later.
template<>
uint32_t VcmEvent<TYPE_MCA>::nextStep( STEP_CODE_DATA_STRUCT & io_sc,
bool & o_done )
Expand Down

0 comments on commit dfb45d7

Please sign in to comment.