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 <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Santosh S. Puranik <santosh.puranik@in.ibm.com>
Reviewed-by: Brian R. Silver <bsilver@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/27050
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>

2 files changed, 72 insertions, 72 deletions

diff --git a/import/hwpf/fapi2/include/fapi2_hw_access.H b/import/hwpf/fapi2/include/fapi2_hw_access.H
index 2bc28a26..f011d64e 100644
--- a/import/hwpf/fapi2/include/fapi2_hw_access.H
+++ b/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<K>& i_target, const uint64_t i_address,
+template< TargetType K, typename V >
+inline ReturnCode getScom(const Target<K, V>& i_target, const uint64_t i_address,
                           buffer<uint64_t>& o_data);
 
 /// @brief Writes a SCOM register on a chip.
@@ -90,8 +90,8 @@ inline ReturnCode getScom(const Target<K>& 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<K>& i_target, const uint64_t i_address,
+template< TargetType K, typename V >
+inline ReturnCode putScom(const Target<K, V>& i_target, const uint64_t i_address,
                           const buffer<uint64_t> i_data);
 
 /// @brief Writes a SCOM register under mask on a chip
@@ -101,8 +101,8 @@ inline ReturnCode putScom(const Target<K>& 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<K>& i_target,
+template< TargetType K, typename V >
+inline ReturnCode putScomUnderMask(const Target<K, V>& i_target,
                                    const uint64_t i_address,
                                    const buffer<uint64_t> i_data,
                                    const buffer<uint64_t> i_mask);
@@ -114,8 +114,8 @@ inline ReturnCode putScomUnderMask(const Target<K>& 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<K>& i_target,
+template< TargetType K, typename V >
+inline ReturnCode getCfamRegister(const Target<K, V>& i_target,
                                   const uint32_t i_address,
                                   buffer<uint32_t>& o_data);
 
@@ -126,8 +126,8 @@ inline ReturnCode getCfamRegister(const Target<K>& 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<K>& i_target,
+template< TargetType K, typename V >
+inline ReturnCode putCfamRegister(const Target<K, V>& i_target,
                                   const uint32_t i_address,
                                   const buffer<uint32_t> i_data);
 
@@ -139,8 +139,8 @@ inline ReturnCode putCfamRegister(const Target<K>& 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<K>& i_target,
+template< TargetType K, typename V >
+inline ReturnCode modifyCfamRegister(const Target<K, V>& i_target,
                                      const uint32_t i_address,
                                      const buffer<uint32_t> i_data,
                                      const ChipOpModifyMode i_modifyMode);
@@ -151,8 +151,8 @@ inline ReturnCode modifyCfamRegister(const Target<K>& 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<K>& i_target,
+template< TargetType K, typename V >
+ReturnCode putRing(const Target<K, V>& i_target,
                    const RingID i_ringID,
                    const RingMode i_ringMode = RING_MODE_HEADER_CHECK);
 
@@ -165,8 +165,8 @@ ReturnCode putRing(const Target<K>& 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<K>& i_target,
+template< TargetType K, typename V >
+inline ReturnCode getRing(const Target<K, V>& 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<K>& 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<K>& i_target,
+template< TargetType K, typename V >
+inline ReturnCode modifyRing(const Target<K, V>& 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<K>& 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<K>& i_target,
+template< TargetType K, typename V >
+inline ReturnCode getSpy(const Target<K, V>& i_target,
                          const spyId_t i_spyId,
                          variable_buffer& o_data);
 
@@ -253,8 +253,8 @@ inline ReturnCode getSpy(const Target<K>& i_target,
 
 #define FAPI_GET_SPY(TARGET, ID, DATA) fapi2::getSpy(TARGET, #ID, DATA)
 
-template< TargetType K >
-inline ReturnCode getSpy(const Target<K>& i_target,
+template< TargetType K, typename V >
+inline ReturnCode getSpy(const Target<K, V>& i_target,
                          const char* const i_spyId,
                          variable_buffer& o_data);
 
@@ -308,8 +308,8 @@ inline ReturnCode getSpy(const Target<K>& 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<K>& i_target,
+template< TargetType K, typename V >
+inline ReturnCode putSpy(const Target<K, V>& i_target,
                          const spyId_t i_spyId,
                          const variable_buffer& i_data);
 #endif
@@ -318,13 +318,13 @@ inline ReturnCode putSpy(const Target<K>& i_target,
 
 #define FAPI_PUT_SPY(TARGET, ID, DATA) fapi2::putSpy(TARGET, #ID, DATA)
 
-template< TargetType K >
-inline ReturnCode putSpy(const Target<K>& i_target,
+template< TargetType K, typename V >
+inline ReturnCode putSpy(const Target<K, V>& i_target,
                          const char* const i_spyId,
                          const variable_buffer& i_data);
 
-template< TargetType K >
-inline ReturnCode putSpy(const Target<K>& i_target,
+template< TargetType K, typename V >
+inline ReturnCode putSpy(const Target<K, V>& i_target,
                          const char* const i_spyId,
                          const char* i_enum);
 #endif
@@ -355,8 +355,8 @@ inline ReturnCode putSpy(const Target<K>& i_target,
     fapi2::putSpyImage(TARGET, FAPI_SPY_NAMES::ID.value,                \
                        DATA1, DATA2)
 
-template< TargetType K >
-inline ReturnCode putSpyImage(const Target<K>& i_target,
+template< TargetType K, typename V >
+inline ReturnCode putSpyImage(const Target<K, V>& 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<K>& 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<K>& i_target,
+template< TargetType K, typename V >
+inline ReturnCode putSpyImage(const Target<K, V>& 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<K>& i_target,
     fapi2:getSpyImage(TARGET, FAPI_SPY_NAMES::ID.value, \
                       DATA1, DATA2)
 
-template< TargetType K >
-inline ReturnCode getSpyImage(const Target<K>& i_target,
+template< TargetType K, typename V >
+inline ReturnCode getSpyImage(const Target<K, V>& 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<K>& 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<K>& i_target,
+template< TargetType K, typename V >
+inline ReturnCode getSpyImage(const Target<K, V>& i_target,
                               const char* const i_spyId,
                               variable_buffer& o_data,
                               const variable_buffer& i_imageData);
diff --git a/import/hwpf/fapi2/include/plat/hw_access.H b/import/hwpf/fapi2/include/plat/hw_access.H
index f970becd..8f2a6b46 100644
--- a/import/hwpf/fapi2/include/plat/hw_access.H
+++ b/import/hwpf/fapi2/include/plat/hw_access.H
@@ -96,8 +96,8 @@ inline OpModes getOpMode(void)
 /// @param[out] o_data     Buffer that holds data read from HW target.
 /// @return fapi::ReturnCode. FAPI2_RC_SUCCESS if success, else error code.
 ///
-template< TargetType K >
-inline ReturnCode getScom(const Target<K>& i_target,
+template< TargetType K, typename V >
+inline ReturnCode getScom(const Target<K, V>& i_target,
                           const uint64_t i_address,
                           buffer<uint64_t>& o_data)
 {
@@ -118,8 +118,8 @@ inline ReturnCode getScom(const Target<K>& i_target,
 /// @param[in] i_address    SCOM register address to write to.
 /// @param[in] i_data       Buffer that holds data to write into address.
 /// @return fapi::ReturnCode. FAPI2_RC_SUCCESS if success, else error code.
-template< TargetType K >
-inline ReturnCode putScom(const Target<K>& i_target,
+template< TargetType K, typename V >
+inline ReturnCode putScom(const Target<K, V>& i_target,
                           const uint64_t i_address,
                           const buffer<uint64_t> i_data)
 {
@@ -139,8 +139,8 @@ inline ReturnCode putScom(const Target<K>& i_target,
 /// @param[in] i_data       Buffer that holds data to write into address.
 /// @param[in] i_mask       Buffer that holds the mask value.
 /// @return fapi::ReturnCode. FAPI2_RC_SUCCESS if success, else error code.
-template< TargetType K >
-inline ReturnCode putScomUnderMask(const Target<K>& i_target,
+template< TargetType K, typename V >
+inline ReturnCode putScomUnderMask(const Target<K, V>& i_target,
                                    const uint64_t i_address,
                                    const buffer<uint64_t> i_data,
                                    const buffer<uint64_t> i_mask)
@@ -164,8 +164,8 @@ inline ReturnCode putScomUnderMask(const Target<K>& i_target,
 /// @param[out] o_data     32-bit buffer that holds data read from HW target.
 /// @return fapi::ReturnCode. FAPI2_RC_SUCCESS if success, else error code.
 ///
-template< TargetType K >
-inline ReturnCode getCfamRegister(const Target<K>& i_target,
+template< TargetType K, typename V >
+inline ReturnCode getCfamRegister(const Target<K, V>& i_target,
                                   const uint32_t i_address,
                                   buffer<uint32_t>& o_data)
 {
@@ -188,8 +188,8 @@ inline ReturnCode getCfamRegister(const Target<K>& i_target,
 /// @param[out] i_data     32-bit buffer that holds data to write into address.
 /// @return fapi::ReturnCode. FAPI2_RC_SUCCESS if success, else error code.
 ///
-template< TargetType K >
-inline ReturnCode putCfamRegister(const Target<K>& i_target,
+template< TargetType K, typename V >
+inline ReturnCode putCfamRegister(const Target<K, V>& i_target,
                                   const uint32_t i_address,
                                   const buffer<uint32_t> i_data)
 {
@@ -213,8 +213,8 @@ inline ReturnCode putCfamRegister(const Target<K>& i_target,
 /// @param[in]  i_modifyMode The modify mode (or/and/xor).
 /// @return fapi::ReturnCode. FAPI2_RC_SUCCESS if success, else error code.
 ///
-template< TargetType K >
-inline ReturnCode modifyCfamRegister(const Target<K>& i_target,
+template< TargetType K, typename V >
+inline ReturnCode modifyCfamRegister(const Target<K, V>& i_target,
                                      const uint32_t i_address,
                                      const buffer<uint32_t> i_data,
                                      const fapi2::ChipOpModifyMode i_modifyMode)
@@ -236,8 +236,8 @@ inline ReturnCode modifyCfamRegister(const Target<K>& i_target,
 /// @param[in] i_ringID   Ring ID that will identify the Ring in the image.
 /// @param[in] i_ringMode Ring operation mode.
 /// @return fapi::ReturnCode. FAPI2_RC_SUCCESS if success, else error code.
-template< TargetType K >
-ReturnCode putRing(const Target<K>& i_target,
+template< TargetType K, typename V >
+ReturnCode putRing(const Target<K, V>& i_target,
                    const RingID i_ringID,
                    const RingMode i_ringMode)
 {
@@ -263,8 +263,8 @@ ReturnCode putRing(const Target<K>& i_target,
 /// @param[in]  i_ringMode Ring operation mode.
 /// @return fapi::ReturnCode. FAPI2_RC_SUCCESS if success, else error code.
 ///
-template< TargetType K >
-inline ReturnCode getRing(const Target<K>& i_target,
+template< TargetType K, typename V >
+inline ReturnCode getRing(const Target<K, V>& i_target,
                           const scanRingId_t i_address,
                           variable_buffer& o_data,
                           const RingMode i_ringMode)
@@ -291,8 +291,8 @@ inline ReturnCode getRing(const Target<K>& i_target,
 /// @param[in] i_modifyMode The modify mode (or/and/xor)
 /// @param[in] i_ringMode   Ring operation mode.
 /// @return fapi::ReturnCode. FAPI2_RC_SUCCESS if success, else error code.
-template< TargetType K >
-inline ReturnCode modifyRing(const Target<K>& i_target,
+template< TargetType K, typename V >
+inline ReturnCode modifyRing(const Target<K, V>& i_target,
                              const scanRingId_t i_address,
                              const variable_buffer& i_data,
                              const ChipOpModifyMode i_modifyMode,
@@ -358,8 +358,8 @@ inline ReturnCode modifyRing(const Target<K>& i_target,
 ///       the quotes for the cronus environment
 ///
 #ifdef FAPI_SUPPORT_SPY_AS_ENUM
-template< TargetType K >
-inline ReturnCode getSpy(const Target<K>& i_target,
+template< TargetType K, typename V >
+inline ReturnCode getSpy(const Target<K, V>& i_target,
                          const spyId_t i_spyId,
                          variable_buffer& o_data)
 {
@@ -378,8 +378,8 @@ inline ReturnCode getSpy(const Target<K>& i_target,
 }
 #endif
 #ifdef FAPI_SUPPORT_SPY_AS_STRING
-template< TargetType K >
-inline ReturnCode getSpy(const Target<K>& i_target,
+template< TargetType K, typename V >
+inline ReturnCode getSpy(const Target<K, V>& i_target,
                          const char* const i_spyId,
                          variable_buffer& o_data)
 {
@@ -437,8 +437,8 @@ inline ReturnCode getSpy(const Target<K>& i_target,
 ///         the quotes for the cronus environment
 ///
 #ifdef FAPI_SUPPORT_SPY_AS_ENUM
-template< TargetType K >
-inline ReturnCode putSpy(const Target<K>& i_target,
+template< TargetType K, typename V >
+inline ReturnCode putSpy(const Target<K, V>& i_target,
                          const spyId_t i_spyId,
                          const variable_buffer& i_data)
 {
@@ -447,8 +447,8 @@ inline ReturnCode putSpy(const Target<K>& i_target,
 }
 #endif
 #ifdef FAPI_SUPPORT_SPY_AS_STRING
-template< TargetType K >
-inline ReturnCode putSpy(const Target<K>& i_target,
+template< TargetType K, typename V >
+inline ReturnCode putSpy(const Target<K, V>& i_target,
                          const char* const i_spyId,
                          const variable_buffer& i_data)
 {
@@ -456,8 +456,8 @@ inline ReturnCode putSpy(const Target<K>& i_target,
     return ~FAPI2_RC_SUCCESS;
 }
 
-template< TargetType K >
-inline ReturnCode putSpy(const Target<K>& i_target,
+template< TargetType K, typename V >
+inline ReturnCode putSpy(const Target<K, V>& i_target,
                          const char* const i_spyId,
                          const char* i_enum)
 {
@@ -486,8 +486,8 @@ inline ReturnCode putSpy(const Target<K>& i_target,
 ///         See fapiPutSpy for details on spy id specifics.
 ///
 #ifdef FAPI_SUPPORT_SPY_AS_ENUM
-template< TargetType K >
-inline ReturnCode putSpyImage(const Target<K>& i_target,
+template< TargetType K, typename V >
+inline ReturnCode putSpyImage(const Target<K, V>& i_target,
                               const spyId_t i_spyId,
                               const variable_buffer& i_data,
                               variable_buffer& o_imageData)
@@ -497,8 +497,8 @@ inline ReturnCode putSpyImage(const Target<K>& i_target,
 }
 #endif
 #ifdef FAPI_SUPPORT_SPY_AS_STRING
-template< TargetType K >
-inline ReturnCode putSpyImage(const Target<K>& i_target,
+template< TargetType K, typename V >
+inline ReturnCode putSpyImage(const Target<K, V>& i_target,
                               const char* const i_spyId,
                               const variable_buffer& i_data,
                               variable_buffer& o_imageData)
@@ -525,8 +525,8 @@ inline ReturnCode putSpyImage(const Target<K>& i_target,
 ///         See fapiPutSpy for details on spy id specifics.
 ///
 #ifdef FAPI_SUPPORT_SPY_AS_ENUM
-template< TargetType K >
-inline ReturnCode getSpyImage(const Target<K>& i_target,
+template< TargetType K, typename V >
+inline ReturnCode getSpyImage(const Target<K, V>& i_target,
                               const spyId_t i_spyId,
                               variable_buffer& o_data,
                               const variable_buffer& i_imageData)
@@ -536,8 +536,8 @@ inline ReturnCode getSpyImage(const Target<K>& i_target,
 }
 #endif
 #ifdef FAPI_SUPPORT_SPY_AS_STRING
-template< TargetType K >
-inline ReturnCode getSpyImage(const Target<K>& i_target,
+template< TargetType K, typename V >
+inline ReturnCode getSpyImage(const Target<K, V>& i_target,
                               const char* const i_spyId,
                               variable_buffer& o_data,
                               const variable_buffer& i_imageData)