From d669849620b26c55f8b616e2930164fd3e8d5f69 Mon Sep 17 00:00:00 2001 From: "Andre A. Marin" Date: Tue, 3 Mar 2020 00:29:23 -0600 Subject: [PATCH] Clean up PPE character format and target Removed duplicated code and abstracted out the character target and format specifier into reusable MACROS instead of a hacked redefine. Change-Id: Id4b318b4a040aa5e366d0bdafdcaf55ceb73feef Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/92714 Tested-by: FSP CI Jenkins Tested-by: Jenkins Server Reviewed-by: STEPHEN GLANCY Dev-Ready: ANDRE A MARIN Reviewed-by: Louis Stermole Tested-by: PPE CI Tested-by: Hostboot CI Reviewed-by: Jennifer A Stofer Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/92723 Reviewed-by: RAJA DAS --- .../procedures/hwp/memory/lib/i2c/exp_i2c.H | 35 ++++++++----------- .../generic/memory/lib/utils/mss_field.H | 19 ++++------ .../memory/lib/utils/mss_generic_check.H | 31 ++++++++-------- 3 files changed, 35 insertions(+), 50 deletions(-) diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/i2c/exp_i2c.H b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/i2c/exp_i2c.H index e4cdec0a2..c1d8dec46 100644 --- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/i2c/exp_i2c.H +++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/i2c/exp_i2c.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER sbe Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2018,2019 */ +/* Contributors Listed Below - COPYRIGHT 2018,2020 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -40,24 +40,19 @@ #include #include +// reused TARGTIDFORMAT defined in generic/memory/lib/utils/mss_generic_check.H #ifdef __PPE__ #include #include + //Macro + #define MSSTARGID i_target.get #else #include #include #include #include -#endif - - -//Macro -#ifdef __PPE__ - #define TARGIDFORMAT "0x%08X" - #define TARGID i_target.get() -#else - #define TARGIDFORMAT "%s" - #define TARGID mss::c_str(i_target) + //Macro + #define MSSTARGID mss::c_str(i_target) #endif namespace mss @@ -104,8 +99,8 @@ inline fapi2::ReturnCode status_code( const fapi2::Target #endif -//Macro -#ifdef __PPE__ - #define TARGIDFORMAT "0x%08X" - #define TARGTID i_target.get() -#else - #define TARGIDFORMAT "%s" - #define TARGTID spd::c_str(i_target) -#endif +// reused TARGTID & TARGTIDFORMAT macro defined in generic/memory/lib/utils/mss_generic_check.H namespace mss { @@ -203,7 +196,7 @@ inline fapi2::ReturnCode get_field(const fapi2::Target& i_target, .set_LIST_SIZE(i_data.size()) .set_FUNCTION(i_ffdc_codes) .set_TARGET(i_target), - "Out of bounds indexing (with %d) on a list of size %d for " TARGIDFORMAT, + "Out of bounds indexing (with %d) on a list of size %d for " TARGTIDFORMAT, BYTE, i_data.size(), TARGTID); @@ -213,7 +206,7 @@ inline fapi2::ReturnCode get_field(const fapi2::Target& i_target, const fapi2::buffer l_buffer(i_data[BYTE]); l_buffer.template extractToRight(o_value); - FAPI_DBG(TARGIDFORMAT " data[%d] = 0x%02x. Field with start bit %d, bit len %d, has data 0x%02x.", + FAPI_DBG(TARGTIDFORMAT " data[%d] = 0x%02x. Field with start bit %d, bit len %d, has data 0x%02x.", TARGTID, BYTE, i_data[BYTE], @@ -318,7 +311,7 @@ inline fapi2::ReturnCode get_field( const fapi2::Target& i_target, { IT l_temp = 0; FAPI_TRY( (get_field(i_target, i_data, i_ffdc_codes, l_temp)), - "Failed get_field() for " TARGIDFORMAT, TARGTID ); + "Failed get_field() for " TARGTIDFORMAT, TARGTID ); // Test if retrieved data seems valid FAPI_TRY( check::invalid_value(i_target, @@ -340,7 +333,7 @@ inline fapi2::ReturnCode get_field( const fapi2::Target& i_target, .set_CONVERTED_VAL(o_value) .set_TARGET(i_target) .set_FUNCTION(i_ffdc_codes), - "Conversion error between original %d to converted %d value for " TARGIDFORMAT, + "Conversion error between original %d to converted %d value for " TARGTIDFORMAT, l_temp, o_value, TARGTID); FAPI_DBG("%s: 0x%02x for %s", diff --git a/src/import/generic/memory/lib/utils/mss_generic_check.H b/src/import/generic/memory/lib/utils/mss_generic_check.H index d6bb90cdf..9f4088754 100644 --- a/src/import/generic/memory/lib/utils/mss_generic_check.H +++ b/src/import/generic/memory/lib/utils/mss_generic_check.H @@ -38,10 +38,20 @@ #include -#ifndef __PPE__ +#ifdef __PPE__ + //Macro -- PPE doesn't want to include generic_consts.H + // so we'll define it here directly + #define TARGTIDFORMAT "0x%08X" + #define TARGTID i_target.get() + +#else #include #include #include + //Macro -- PPE doesn't want to include generic_consts.H + // so we'll define it here directly + #define TARGTIDFORMAT "%s" + #define TARGTID spd::c_str(i_target) #endif namespace mss @@ -220,31 +230,18 @@ inline fapi2::ReturnCode invalid_value(const fapi2::Target& i_target, const FFDC i_ffdc_codes, const char* i_err_str = "") { -#ifdef __PPE__ FAPI_ASSERT(i_conditional, fapi2::MSS_FAILED_DATA_INTEGRITY_CHECK(). set_VALUE(i_data). set_BYTE(i_byte_index). set_TARGET(i_target). set_FFDC_CODE(i_ffdc_codes), - "%s Byte %d, Data returned: %d.", + "%s Byte %d, Data returned: %d for " TARGTIDFORMAT, i_err_str, i_byte_index, - i_data); -#else - FAPI_ASSERT(i_conditional, - fapi2::MSS_FAILED_DATA_INTEGRITY_CHECK(). - set_VALUE(i_data). - set_BYTE(i_byte_index). - set_TARGET(i_target). - set_FFDC_CODE(i_ffdc_codes), - "%s %s Byte %d, Data returned: %d.", - spd::c_str(i_target), - i_err_str, - i_byte_index, - i_data); + i_data, + TARGTID); -#endif return fapi2::FAPI2_RC_SUCCESS; fapi_try_exit: