From f6fd3222a3d744cda9c4303f05b5a17ce9eb61ba Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 18 Mar 2016 15:35:02 -0500 Subject: fapi2: Update hw_access functions to honor platform value type. Added associated ecmd release ver-14-4-3-ekbonly for testing Change-Id: Ibdb3f981d5340bc507427fc4558be9f1ccac0663 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/22257 Tested-by: Jenkins Server Tested-by: PPE CI Tested-by: Hostboot CI Reviewed-by: Santosh S. Puranik Reviewed-by: Brian R. Silver Reviewed-by: Jennifer A. Stofer Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/27052 Tested-by: FSP CI Jenkins Reviewed-by: Daniel M. Crowell --- src/import/hwpf/fapi2/include/fapi2_hw_access.H | 72 ++++++++++++------------- 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'src/import/hwpf/fapi2') diff --git a/src/import/hwpf/fapi2/include/fapi2_hw_access.H b/src/import/hwpf/fapi2/include/fapi2_hw_access.H index 2bc28a262..f011d64eb 100644 --- a/src/import/hwpf/fapi2/include/fapi2_hw_access.H +++ b/src/import/hwpf/fapi2/include/fapi2_hw_access.H @@ -80,8 +80,8 @@ inline OpModes getOpMode(void); /// @param[in] i_address SCOM register address to read from. /// @param[out] o_data Buffer that holds data read from HW target. /// @return fapi2::ReturnCode. FAPI2_RC_SUCCESS if success, else error code. -template< TargetType K > -inline ReturnCode getScom(const Target& i_target, const uint64_t i_address, +template< TargetType K, typename V > +inline ReturnCode getScom(const Target& i_target, const uint64_t i_address, buffer& o_data); /// @brief Writes a SCOM register on a chip. @@ -90,8 +90,8 @@ inline ReturnCode getScom(const Target& i_target, const uint64_t i_address, /// @param[in] i_address SCOM register address to write to. /// @param[in] i_data Buffer that holds data to write into address. /// @return fapi2::ReturnCode. FAPI2_RC_SUCCESS if success, else error code. -template< TargetType K > -inline ReturnCode putScom(const Target& i_target, const uint64_t i_address, +template< TargetType K, typename V > +inline ReturnCode putScom(const Target& i_target, const uint64_t i_address, const buffer i_data); /// @brief Writes a SCOM register under mask on a chip @@ -101,8 +101,8 @@ inline ReturnCode putScom(const Target& i_target, const uint64_t i_address, /// @param[in] i_data Buffer that holds data to write into address. /// @param[in] i_mask Buffer that holds the mask value. /// @return fapi2::ReturnCode. FAPI2_RC_SUCCESS if success, else error code. -template< TargetType K > -inline ReturnCode putScomUnderMask(const Target& i_target, +template< TargetType K, typename V > +inline ReturnCode putScomUnderMask(const Target& i_target, const uint64_t i_address, const buffer i_data, const buffer i_mask); @@ -114,8 +114,8 @@ inline ReturnCode putScomUnderMask(const Target& i_target, /// @param[in] i_address CFAM register address to read from. /// @param[out] o_data Buffer that holds data read from HW target. /// @return fapi2::ReturnCode. FAPI2_RC_SUCCESS if success, else error code. -template< TargetType K > -inline ReturnCode getCfamRegister(const Target& i_target, +template< TargetType K, typename V > +inline ReturnCode getCfamRegister(const Target& i_target, const uint32_t i_address, buffer& o_data); @@ -126,8 +126,8 @@ inline ReturnCode getCfamRegister(const Target& i_target, /// @param[in] i_address CFAM register address to write to. /// @param[in] i_data Buffer that holds data to write into address. /// @return fapi2::ReturnCode. FAPI2_RC_SUCCESS if success, else error code. -template< TargetType K > -inline ReturnCode putCfamRegister(const Target& i_target, +template< TargetType K, typename V > +inline ReturnCode putCfamRegister(const Target& i_target, const uint32_t i_address, const buffer i_data); @@ -139,8 +139,8 @@ inline ReturnCode putCfamRegister(const Target& i_target, /// @param[in] i_data Buffer that holds data to be modified. /// @param[in] i_modifyMode The modify mode (or/and/xor). /// @return fapi2::ReturnCode. FAPI2_RC_SUCCESS if success, else error code. -template< TargetType K > -inline ReturnCode modifyCfamRegister(const Target& i_target, +template< TargetType K, typename V > +inline ReturnCode modifyCfamRegister(const Target& i_target, const uint32_t i_address, const buffer i_data, const ChipOpModifyMode i_modifyMode); @@ -151,8 +151,8 @@ inline ReturnCode modifyCfamRegister(const Target& i_target, /// @param[in] i_ringID Ring ID that will identify the Ring in the image. /// @param[in] i_ringMode Ring operation mode. /// @return fapi2::ReturnCode. FAPI2_RC_SUCCESS if success, else error code. -template< TargetType K > -ReturnCode putRing(const Target& i_target, +template< TargetType K, typename V > +ReturnCode putRing(const Target& i_target, const RingID i_ringID, const RingMode i_ringMode = RING_MODE_HEADER_CHECK); @@ -165,8 +165,8 @@ ReturnCode putRing(const Target& i_target, /// @param[out] o_data Buffer that holds data read from HW target. /// @param[in] i_ringMode Ring operation mode. /// @return fapi2::ReturnCode. FAPI2_RC_SUCCESS if success, else error code. -template< TargetType K > -inline ReturnCode getRing(const Target& i_target, +template< TargetType K, typename V > +inline ReturnCode getRing(const Target& i_target, const scanRingId_t i_address, variable_buffer& o_data, const RingMode i_ringMode = 0); @@ -180,8 +180,8 @@ inline ReturnCode getRing(const Target& i_target, /// @param[in] i_modifyMode The modify mode (or/and/xor) /// @param[in] i_ringMode Ring operation mode. /// @return fapi2::ReturnCode. FAPI2_RC_SUCCESS if success, else error code. -template< TargetType K > -inline ReturnCode modifyRing(const Target& i_target, +template< TargetType K, typename V > +inline ReturnCode modifyRing(const Target& i_target, const scanRingId_t i_address, const variable_buffer& i_data, const ChipOpModifyMode i_modifyMode, @@ -237,8 +237,8 @@ inline ReturnCode modifyRing(const Target& i_target, #define FAPI_GET_SPY(TARGET, ID, DATA) fapi2::getSpy(TARGET, FAPI_SPY_NAMES::ID.value, DATA) -template< TargetType K > -inline ReturnCode getSpy(const Target& i_target, +template< TargetType K, typename V > +inline ReturnCode getSpy(const Target& i_target, const spyId_t i_spyId, variable_buffer& o_data); @@ -253,8 +253,8 @@ inline ReturnCode getSpy(const Target& i_target, #define FAPI_GET_SPY(TARGET, ID, DATA) fapi2::getSpy(TARGET, #ID, DATA) -template< TargetType K > -inline ReturnCode getSpy(const Target& i_target, +template< TargetType K, typename V > +inline ReturnCode getSpy(const Target& i_target, const char* const i_spyId, variable_buffer& o_data); @@ -308,8 +308,8 @@ inline ReturnCode getSpy(const Target& i_target, #define FAPI_PUT_SPY(TARGET, ID, DATA) fapi2::putSpy(TARGET, FAPI_SPY_NAMES::ID.value, DATA) -template< TargetType K > -inline ReturnCode putSpy(const Target& i_target, +template< TargetType K, typename V > +inline ReturnCode putSpy(const Target& i_target, const spyId_t i_spyId, const variable_buffer& i_data); #endif @@ -318,13 +318,13 @@ inline ReturnCode putSpy(const Target& i_target, #define FAPI_PUT_SPY(TARGET, ID, DATA) fapi2::putSpy(TARGET, #ID, DATA) -template< TargetType K > -inline ReturnCode putSpy(const Target& i_target, +template< TargetType K, typename V > +inline ReturnCode putSpy(const Target& i_target, const char* const i_spyId, const variable_buffer& i_data); -template< TargetType K > -inline ReturnCode putSpy(const Target& i_target, +template< TargetType K, typename V > +inline ReturnCode putSpy(const Target& i_target, const char* const i_spyId, const char* i_enum); #endif @@ -355,8 +355,8 @@ inline ReturnCode putSpy(const Target& i_target, fapi2::putSpyImage(TARGET, FAPI_SPY_NAMES::ID.value, \ DATA1, DATA2) -template< TargetType K > -inline ReturnCode putSpyImage(const Target& i_target, +template< TargetType K, typename V > +inline ReturnCode putSpyImage(const Target& i_target, const spyId_t i_spyId, const variable_buffer& i_data, variable_buffer& o_imageData); @@ -367,8 +367,8 @@ inline ReturnCode putSpyImage(const Target& i_target, #define FAPI_PUT_SPY_IMAGE(TARGET, ID, DATA1, DATA2) \ fapi2::putSpyImage(TARGET, #ID, DATA1,DATA2) -template< TargetType K > -inline ReturnCode putSpyImage(const Target& i_target, +template< TargetType K, typename V > +inline ReturnCode putSpyImage(const Target& i_target, const char* const i_spyId, const variable_buffer& i_data, variable_buffer& o_imageData); @@ -397,8 +397,8 @@ inline ReturnCode putSpyImage(const Target& i_target, fapi2:getSpyImage(TARGET, FAPI_SPY_NAMES::ID.value, \ DATA1, DATA2) -template< TargetType K > -inline ReturnCode getSpyImage(const Target& i_target, +template< TargetType K, typename V > +inline ReturnCode getSpyImage(const Target& i_target, const spyId_t i_spyId, variable_buffer& o_data, const variable_buffer& i_imageData); @@ -409,8 +409,8 @@ inline ReturnCode getSpyImage(const Target& i_target, #define FAPI_GET_SPY_IMAGE(TARGET, ID, DATA1, DATA2) \ fapi2::getSpyImage(TARGET, #ID, DATA1,DATA2) -template< TargetType K > -inline ReturnCode getSpyImage(const Target& i_target, +template< TargetType K, typename V > +inline ReturnCode getSpyImage(const Target& i_target, const char* const i_spyId, variable_buffer& o_data, const variable_buffer& i_imageData); -- cgit v1.2.1