Skip to content

Commit

Permalink
PRD: Rename new dimmBadDqBitmap functions
Browse files Browse the repository at this point in the history 
Change-Id: If677cc7d08b2502b7932bac768aeba6a353c90bc
CQ: SW405539
CQ: SW405850
Backport: release-op910
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/48640
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Tested-by: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
@cnpalmer @dcrowell77
cnpalmer authored and dcrowell77 committed Oct 24, 2017
1 parent 5060d07 commit 640ccb0
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 16 deletions.
4 changes: 2 additions & 2 deletions src/include/usr/fapi2/dimmBadDqBitmapFuncs.H
View file
Expand Up @@ -49,7 +49,7 @@ extern "C"
*
* @return ReturnCode
*/
fapi2::ReturnCode dimmGetBadDqBitmap( const fapi2::Target
fapi2::ReturnCode p9DimmGetBadDqBitmap( const fapi2::Target
<fapi2::TARGET_TYPE_MCA|fapi2::TARGET_TYPE_MBA> & i_fapiTrgt,
const uint8_t i_dimm,
const uint8_t i_rank,
Expand All @@ -74,7 +74,7 @@ fapi2::ReturnCode dimmGetBadDqBitmap( const fapi2::Target
*
* @return ReturnCode
*/
fapi2::ReturnCode dimmSetBadDqBitmap( const fapi2::Target
fapi2::ReturnCode p9DimmSetBadDqBitmap( const fapi2::Target
<fapi2::TARGET_TYPE_MCA|fapi2::TARGET_TYPE_MBA> & i_fapiTrgt,
const uint8_t i_dimm,
const uint8_t i_rank,
Expand Down
8 changes: 4 additions & 4 deletions src/usr/diag/prdf/common/plat/prdfPlatServices_common.C
View file
Expand Up @@ -357,13 +357,13 @@ int32_t getBadDqBitmap( TargetHandle_t i_trgt, const MemRank & i_rank,

fapi2::Target<l_trgtType> l_fapiTrgt( i_trgt );

FAPI_INVOKE_HWP( errl, dimmGetBadDqBitmap, l_fapiTrgt,
FAPI_INVOKE_HWP( errl, p9DimmGetBadDqBitmap, l_fapiTrgt,
i_rank.getDimmSlct(), i_rank.getRankSlct(),
data[ps], ps );

if ( nullptr != errl )
{
PRDF_ERR( PRDF_FUNC "dimmGetBadDqBitmap() failed: i_trgt=0x%08x "
PRDF_ERR( PRDF_FUNC "p9DimmGetBadDqBitmap() failed: i_trgt=0x%08x "
"ps=%d ds=%d rs=%d", getHuid(i_trgt), ps,
i_rank.getDimmSlct(), i_rank.getRankSlct() );
PRDF_COMMIT_ERRL( errl, ERRL_ACTION_REPORT );
Expand Down Expand Up @@ -423,13 +423,13 @@ int32_t setBadDqBitmap( TargetHandle_t i_trgt, const MemRank & i_rank,

fapi2::Target<l_trgtType> l_fapiTrgt( i_trgt );

FAPI_INVOKE_HWP( errl, dimmSetBadDqBitmap, l_fapiTrgt,
FAPI_INVOKE_HWP( errl, p9DimmSetBadDqBitmap, l_fapiTrgt,
i_rank.getDimmSlct(), i_rank.getRankSlct(),
data[ps], ps );

if ( nullptr != errl )
{
PRDF_ERR( PRDF_FUNC "dimmSetBadDqBitmap() failed: "
PRDF_ERR( PRDF_FUNC "p9DimmSetBadDqBitmap() failed: "
"i_trgt=0x%08x ps=%d ds=%d rs=%d", getHuid(i_trgt),
ps, i_rank.getDimmSlct(), i_rank.getRankSlct() );
PRDF_COMMIT_ERRL( errl, ERRL_ACTION_REPORT );
Expand Down
1 change: 1 addition & 0 deletions src/usr/diag/prdf/prdf_hb_only.mk
View file
Expand Up @@ -183,6 +183,7 @@ prd_obj_no_sim += p9_l2_flush.o

prd_vpath += ${ROOTPATH}/src/import/chips/centaur/procedures/hwp/memory
prd_obj_no_sim += p9c_mss_maint_cmds.o
prd_obj_no_sim += p9c_dimmBadDqBitmapFuncs.o

prd_vpath += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/memory/lib/dimm/
prd_vpath += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/memory/lib/eff_config/
Expand Down
20 changes: 10 additions & 10 deletions src/usr/fapi2/dimmBadDqBitmapFuncs.C
View file
Expand Up @@ -129,14 +129,14 @@ fapi2::ReturnCode dimmBadDqCheckParamGetBitmap( const fapi2::Target
}

//------------------------------------------------------------------------------
fapi2::ReturnCode dimmGetBadDqBitmap( const fapi2::Target
fapi2::ReturnCode p9DimmGetBadDqBitmap( const fapi2::Target
<fapi2::TARGET_TYPE_MCA|fapi2::TARGET_TYPE_MBA> & i_fapiTrgt,
const uint8_t i_dimm,
const uint8_t i_rank,
uint8_t (&o_data)[mss::BAD_DQ_BYTE_COUNT],
const uint8_t i_port )
{
FAPI_INF( ">>dimmGetBadDqBitmap. %d:%d", i_dimm, i_rank );
FAPI_INF( ">>p9DimmGetBadDqBitmap. %d:%d", i_dimm, i_rank );

fapi2::ReturnCode l_rc;

Expand All @@ -150,28 +150,28 @@ fapi2::ReturnCode dimmGetBadDqBitmap( const fapi2::Target
l_dimmTrgt, l_dqBitmap );
if ( l_rc )
{
FAPI_ERR( "dimmGetBadDqBitmap: Error from "
FAPI_ERR( "p9DimmGetBadDqBitmap: Error from "
"dimmBadDqCheckParamGetBitmap." );
break;
}
// Write contents of DQ bitmap for specific rank to o_data.
memcpy( o_data, l_dqBitmap[i_rank], mss::BAD_DQ_BYTE_COUNT );
}while(0);

FAPI_INF( "<<dimmGetBadDqBitmap" );
FAPI_INF( "<<p9DimmGetBadDqBitmap" );

return l_rc;
}

//------------------------------------------------------------------------------
fapi2::ReturnCode dimmSetBadDqBitmap( const fapi2::Target
fapi2::ReturnCode p9DimmSetBadDqBitmap( const fapi2::Target
<fapi2::TARGET_TYPE_MCA|fapi2::TARGET_TYPE_MBA> & i_fapiTrgt,
const uint8_t i_dimm,
const uint8_t i_rank,
const uint8_t (&i_data)[mss::BAD_DQ_BYTE_COUNT],
const uint8_t i_port )
{
FAPI_INF( ">>dimmSetBadDqBitmap. %d:%d", i_dimm, i_rank );
FAPI_INF( ">>p9DimmSetBadDqBitmap. %d:%d", i_dimm, i_rank );

fapi2::ReturnCode l_rc;

Expand All @@ -186,7 +186,7 @@ fapi2::ReturnCode dimmSetBadDqBitmap( const fapi2::Target
l_dimmTrgt, l_dqBitmap );
if ( l_rc )
{
FAPI_ERR( "dimmSetBadDqBitmap: Error getting ATTR_BAD_DQ_BITMAP." );
FAPI_ERR("p9DimmSetBadDqBitmap: Error getting ATTR_BAD_DQ_BITMAP.");
break;
}
// Add the rank bitmap to the DIMM bitmap and write the bitmap.
Expand All @@ -197,7 +197,7 @@ fapi2::ReturnCode dimmSetBadDqBitmap( const fapi2::Target
l_errl = fapi2::platAttrSvc::getTargetingTarget(i_fapiTrgt, l_trgt);
if ( l_errl )
{
FAPI_ERR( "dimmSetBadDqBitmap: Error from getTargetingTarget" );
FAPI_ERR( "p9DimmSetBadDqBitmap: Error from getTargetingTarget" );
break;
}

Expand All @@ -206,11 +206,11 @@ fapi2::ReturnCode dimmSetBadDqBitmap( const fapi2::Target

if ( l_rc )
{
FAPI_ERR( "dimmSetBadDqBitmap: Error setting ATTR_BAD_DQ_BITMAP." );
FAPI_ERR("p9DimmSetBadDqBitmap: Error setting ATTR_BAD_DQ_BITMAP.");
}
}while(0);

FAPI_INF( "<<dimmSetBadDqBitmap" );
FAPI_INF( "<<p9DimmSetBadDqBitmap" );

return l_rc;
}
Expand Down
1 change: 1 addition & 0 deletions src/usr/isteps/istep14/makefile
View file
Expand Up @@ -77,6 +77,7 @@ OBJS += p9c_mss_unmask_errors.o
OBJS += p9c_mss_power_cleanup.o
OBJS += p9c_cen_stopclocks.o
OBJS += p9c_mss_maint_cmds.o
OBJS += p9c_dimmBadDqBitmapFuncs.o

#include ${PROCEDURE_PATH}/hwp/nest/p9_htm_setup.mk
#include ${PROCEDURE_PATH}/hwp/nest/p9_pcie_config.mk
Expand Down

0 comments on commit 640ccb0

Please sign in to comment.