From 686bbf502fc63b486fb54816e3f7d4e7a7ce6bd7 Mon Sep 17 00:00:00 2001 From: Caleb Palmer Date: Thu, 9 May 2019 15:52:30 -0500 Subject: Add OCMB_CHIP support for BAD_DQ_BITMAP getters/setters Change-Id: I67225be7e72f7a5194e6a47412ef0895683b8329 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/77217 Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins Reviewed-by: Brian J. Stegmiller Reviewed-by: Zane C. Shelley --- src/include/usr/fapi2/dimmBadDqBitmapFuncs.H | 14 +++++++------- src/usr/fapi2/dimmBadDqBitmapFuncs.C | 25 ++++++++----------------- 2 files changed, 15 insertions(+), 24 deletions(-) diff --git a/src/include/usr/fapi2/dimmBadDqBitmapFuncs.H b/src/include/usr/fapi2/dimmBadDqBitmapFuncs.H index 5d51b7153..a51f5c92e 100644 --- a/src/include/usr/fapi2/dimmBadDqBitmapFuncs.H +++ b/src/include/usr/fapi2/dimmBadDqBitmapFuncs.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2017 */ +/* Contributors Listed Below - COPYRIGHT 2017,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -41,7 +41,7 @@ extern "C" * dimmBadDqBitmapAccessHwp to get the DQ bitmap and returns the data * for the specified rank. * - * @param[in] i_fapiTrgt Reference to MCA/MBA/MEM_PORT Target + * @param[in] i_fapiTrgt Reference to MCA/MBA/MEM_PORT/OCMB_CHIP Target * @param[in] i_dimm MCA/MBA port DIMM number * @param[in] i_rank DIMM rank number * @param[out] o_data Reference to data where Bad DQ bitmap is copied to @@ -50,8 +50,8 @@ extern "C" * @return ReturnCode */ fapi2::ReturnCode p9DimmGetBadDqBitmap( const fapi2::Target - - & i_fapiTrgt, + & i_fapiTrgt, const uint8_t i_dimm, const uint8_t i_rank, uint8_t (&o_data)[mss::BAD_DQ_BYTE_COUNT], @@ -67,7 +67,7 @@ fapi2::ReturnCode p9DimmGetBadDqBitmap( const fapi2::Target * dimmBadDqBitmapAccessHwp to get the DQ bitmap, fills in the data for the * specified rank and calls dimmBadDqBitmapAccessHwp to set the DQ bitmap * - * @param[in] i_fapiTrgt Reference to MCA/MBA/MEM_PORT Target + * @param[in] i_fapiTrgt Reference to MCA/MBA/MEM_PORT/OCMB_CHIP Target * @param[in] i_dimm MCA/MBA port DIMM number * @param[in] i_rank DIMM rank number * @param[in] i_data Reference to data where Bad DQ bitmap is copied from @@ -76,8 +76,8 @@ fapi2::ReturnCode p9DimmGetBadDqBitmap( const fapi2::Target * @return ReturnCode */ fapi2::ReturnCode p9DimmSetBadDqBitmap( const fapi2::Target - - & i_fapiTrgt, + & i_fapiTrgt, const uint8_t i_dimm, const uint8_t i_rank, const uint8_t (&i_data)[mss::BAD_DQ_BYTE_COUNT], diff --git a/src/usr/fapi2/dimmBadDqBitmapFuncs.C b/src/usr/fapi2/dimmBadDqBitmapFuncs.C index 8fb4b9fe0..170c022c5 100644 --- a/src/usr/fapi2/dimmBadDqBitmapFuncs.C +++ b/src/usr/fapi2/dimmBadDqBitmapFuncs.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2017,2018 */ +/* Contributors Listed Below - COPYRIGHT 2017,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -38,8 +38,8 @@ extern "C" // Utility function to check parameters and get the Bad DQ bitmap //------------------------------------------------------------------------------ fapi2::ReturnCode dimmBadDqCheckParamGetBitmap( const fapi2::Target - - & i_fapiTrgt, + & i_fapiTrgt, const uint8_t i_port, const uint8_t i_dimm, const uint8_t i_rank, @@ -115,8 +115,8 @@ fapi2::ReturnCode dimmBadDqCheckParamGetBitmap( const fapi2::Target //------------------------------------------------------------------------------ fapi2::ReturnCode p9DimmGetBadDqBitmap( const fapi2::Target - - & i_fapiTrgt, + & i_fapiTrgt, const uint8_t i_dimm, const uint8_t i_rank, uint8_t (&o_data)[mss::BAD_DQ_BYTE_COUNT], @@ -151,8 +151,8 @@ fapi2::ReturnCode p9DimmGetBadDqBitmap( const fapi2::Target //------------------------------------------------------------------------------ fapi2::ReturnCode p9DimmSetBadDqBitmap( const fapi2::Target - - & i_fapiTrgt, + & i_fapiTrgt, const uint8_t i_dimm, const uint8_t i_rank, const uint8_t (&i_data)[mss::BAD_DQ_BYTE_COUNT], @@ -179,17 +179,8 @@ fapi2::ReturnCode p9DimmSetBadDqBitmap( const fapi2::Target // Add the rank bitmap to the DIMM bitmap and write the bitmap. memcpy( l_dqBitmap[i_rank], i_data, mss::BAD_DQ_BYTE_COUNT ); - errlHndl_t l_errl = nullptr; - TARGETING::TargetHandle_t l_trgt = nullptr; - l_errl = fapi2::platAttrSvc::getTargetingTarget(i_fapiTrgt, l_trgt); - if ( l_errl ) - { - FAPI_ERR( "p9DimmSetBadDqBitmap: Error from getTargetingTarget" ); - break; - } - l_rc = FAPI_ATTR_SET( fapi2::ATTR_BAD_DQ_BITMAP, l_dimmTrgt, - l_dqBitmap ); + l_dqBitmap ); if ( l_rc ) { -- cgit v1.2.1