Added putScomUnderMask/get/put/modifyCfamRegister interfaces

Updated with review comments from set 1

Updated with review comments from set 3

Change-Id: Iaea4c37fe130cb04e99ebdea872ff4c690156f4d
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/424
Tested-by: Jenkins Server
Reviewed-by: MIKE J. JONES <mjjones@us.ibm.com>

4 files changed, 29 insertions, 7 deletions

diff --git a/src/include/usr/devicefw/driverif.H b/src/include/usr/devicefw/driverif.H
index a7139db19..dd8cd8ae8 100644
--- a/src/include/usr/devicefw/driverif.H
+++ b/src/include/usr/devicefw/driverif.H
@@ -83,13 +83,6 @@ namespace DeviceFW
     #define DEVICE_I2C_ADDRESS( i_address )\
         DeviceFW::I2C, static_cast<uint64_t>(( i_address ))
 
-    /** Construct the device addressing parameters for FSI device ops.
-     *  @param[in] i_address - FSI address to operate on.
-     */
-    #define DEVICE_FSI_ADDRESS(i_address) \
-        DeviceFW::FSI, static_cast<uint64_t>((i_address))
-
-
     /** @class InvalidParameterType
      *  @brief Unused type to cause compiler fails for invalid template types.
      *
diff --git a/src/include/usr/devicefw/userif.H b/src/include/usr/devicefw/userif.H
index adb46a418..0e9955898 100644
--- a/src/include/usr/devicefw/userif.H
+++ b/src/include/usr/devicefw/userif.H
@@ -62,6 +62,12 @@ namespace DeviceFW
     #define DEVICE_PRESENT_ADDRESS() \
         DeviceFW::PRESENT
 
+    /** Construct the device addressing parameters for FSI device ops.
+     *  @param[in] i_address - FSI address to operate on.
+     */
+    #define DEVICE_FSI_ADDRESS(i_address) \
+        DeviceFW::FSI, static_cast<uint64_t>((i_address))
+
     /**
      * Construct a PNOR DD address
      *    address = 0000_0000_0000_000c_aaaa_aaaa_aaaa_aaaa
diff --git a/src/include/usr/ecmddatabuffer/ecmdDataBuffer.H b/src/include/usr/ecmddatabuffer/ecmdDataBuffer.H
index 203a966cc..1b65e643e 100644
--- a/src/include/usr/ecmddatabuffer/ecmdDataBuffer.H
+++ b/src/include/usr/ecmddatabuffer/ecmdDataBuffer.H
@@ -130,6 +130,25 @@ public:
    */
   uint32_t flushTo0();
 
+  /**
+   * @brief Set a word of data in buffer
+   * @param i_wordoffset Offset of word to set
+   * @param i_value 32 bits of data to put into word
+   * @retval ECMD_DBUF_SUCCESS on success
+   * @retval ECMD_DBUF_BUFFER_OVERFLOW i_wordoffset is not contained in the size of this buffer
+   *
+   * NOTE : If the buffer length != word boundary, when setting the last word
+   *        data in i_value past the buffer length is cleared before being stored in the buffer
+   */
+  uint32_t setWord(uint32_t i_wordoffset, uint32_t i_value);
+
+  /**
+   * @brief Fetch a word from ecmdDataBuffer
+   * @param i_wordoffset Offset of word to fetch
+   * @retval Value of word requested
+   */
+  uint32_t getWord(uint32_t i_wordoffset) const;
+
 protected:
   uint32_t iv_Capacity;         ///< Actual buffer capacity - always >= getNumWords()
   uint32_t iv_NumBits;          ///< Specified buffer size in bits
diff --git a/src/include/usr/hwpf/plat/fapiPlatReasonCodes.H b/src/include/usr/hwpf/plat/fapiPlatReasonCodes.H
index 25ba997bc..d5fe9faf1 100644
--- a/src/include/usr/hwpf/plat/fapiPlatReasonCodes.H
+++ b/src/include/usr/hwpf/plat/fapiPlatReasonCodes.H
@@ -33,6 +33,8 @@ namespace fapi
         MOD_FAPI_GET_CHILD_CHIPLETS                = 0x02,
         MOD_FAPI_GET_PARENT_CHIP                   = 0x03,
         MOD_PLAT_ATTR_SVC_CREATE_ATTR_ACCESS_ERROR = 0x04,
+        MOD_HANDLE_ECMD_BUF_RC                     = 0x05,
+        MOD_VERIFY_CFAM_ACCESS_TARGET              = 0x06,
     };
 
     enum hwpfReasonCode
@@ -43,6 +45,8 @@ namespace fapi
         RC_UNSUPPORTED_REQUEST        = HWPF_COMP_ID | 0x04,
         RC_NO_SINGLE_PARENT           = HWPF_COMP_ID | 0x05,
         RC_FAILED_TO_ACCESS_ATTRIBUTE = HWPF_COMP_ID | 0x06,
+        RC_ECMD_OPERATION_FAILURE     = HWPF_COMP_ID | 0x07,
+        RC_CFAM_ACCESS_ON_PROC_ERR    = HWPF_COMP_ID | 0x08,
     };
 };