diff options
author | Caleb Palmer <cnpalmer@us.ibm.com> | 2017-10-19 12:26:41 -0500 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-10-24 17:57:22 -0400 |
commit | 640ccb030c3b93321b605f77fc9b38692f9c5b26 (patch) | |
tree | 77124327625bfed496645ad2beda645e0dd7b9f0 /src | |
parent | 5060d077aa6fb4f6f917758e530c92ebbce1fff3 (diff) | |
download | talos-hostboot-640ccb030c3b93321b605f77fc9b38692f9c5b26.tar.gz talos-hostboot-640ccb030c3b93321b605f77fc9b38692f9c5b26.zip |
PRD: Rename new dimmBadDqBitmap functions
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>
Diffstat (limited to 'src')
-rw-r--r-- | src/include/usr/fapi2/dimmBadDqBitmapFuncs.H | 4 | ||||
-rw-r--r-- | src/usr/diag/prdf/common/plat/prdfPlatServices_common.C | 8 | ||||
-rw-r--r-- | src/usr/diag/prdf/prdf_hb_only.mk | 1 | ||||
-rw-r--r-- | src/usr/fapi2/dimmBadDqBitmapFuncs.C | 20 | ||||
-rw-r--r-- | src/usr/isteps/istep14/makefile | 1 |
5 files changed, 18 insertions, 16 deletions
diff --git a/src/include/usr/fapi2/dimmBadDqBitmapFuncs.H b/src/include/usr/fapi2/dimmBadDqBitmapFuncs.H index 0cc564b68..f295d452b 100644 --- a/src/include/usr/fapi2/dimmBadDqBitmapFuncs.H +++ b/src/include/usr/fapi2/dimmBadDqBitmapFuncs.H @@ -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, @@ -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, diff --git a/src/usr/diag/prdf/common/plat/prdfPlatServices_common.C b/src/usr/diag/prdf/common/plat/prdfPlatServices_common.C index 1fa0e43ff..905712f33 100644 --- a/src/usr/diag/prdf/common/plat/prdfPlatServices_common.C +++ b/src/usr/diag/prdf/common/plat/prdfPlatServices_common.C @@ -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 ); @@ -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 ); diff --git a/src/usr/diag/prdf/prdf_hb_only.mk b/src/usr/diag/prdf/prdf_hb_only.mk index abf567d31..fecc61e98 100644 --- a/src/usr/diag/prdf/prdf_hb_only.mk +++ b/src/usr/diag/prdf/prdf_hb_only.mk @@ -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/ diff --git a/src/usr/fapi2/dimmBadDqBitmapFuncs.C b/src/usr/fapi2/dimmBadDqBitmapFuncs.C index fb74a14ae..2bfe2d25f 100644 --- a/src/usr/fapi2/dimmBadDqBitmapFuncs.C +++ b/src/usr/fapi2/dimmBadDqBitmapFuncs.C @@ -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; @@ -150,7 +150,7 @@ 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; } @@ -158,20 +158,20 @@ fapi2::ReturnCode dimmGetBadDqBitmap( const fapi2::Target 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; @@ -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. @@ -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; } @@ -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; } diff --git a/src/usr/isteps/istep14/makefile b/src/usr/isteps/istep14/makefile index 77db145b7..307e033f1 100644 --- a/src/usr/isteps/istep14/makefile +++ b/src/usr/isteps/istep14/makefile @@ -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 |