Wrappers for SCOM functions

Change-Id: Ie0db2bfb88ce4c3ddef4b0f30b872c397412640a
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/28141
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>
Reviewed-by: Santosh S. Puranik <santosh.puranik@in.ibm.com>

2 files changed, 45 insertions, 3 deletions

diff --git a/sbe/hwpf/include/plat/plat_hw_access.H b/sbe/hwpf/include/plat/plat_hw_access.H
index 6c42e13d..b0f95fe2 100644
--- a/sbe/hwpf/include/plat/plat_hw_access.H
+++ b/sbe/hwpf/include/plat/plat_hw_access.H
@@ -33,6 +33,8 @@
 
 #include <plat_includes.H>
 #include "hw_access_def.H"
+#include <return_code.H>
+
 
 /// PIB Error Mask
 
@@ -70,11 +72,11 @@ asm volatile \
 
 /// GetScom
 #define PLAT_GETSCOM(_m_rc, _m_base, _m_offset, _m_data) \
-    _m_rc = getscom_abs(getEffectiveAddress(_m_base, _m_offset), _m_data)
+    _m_rc = fapi2::getscom_abs_wrap(getEffectiveAddress(_m_base, _m_offset), _m_data)
 
 /// PutScom
 #define PLAT_PUTSCOM(_m_rc, _m_base, _m_offset, _m_data) \
-    _m_rc = putscom_abs(getEffectiveAddress(_m_base, _m_offset), _m_data)
+    _m_rc = fapi2::putscom_abs_wrap(getEffectiveAddress(_m_base, _m_offset), _m_data)
 
 /// GetCFAM
 #define PLAT_GETCFAM(_m_base, _m_offset, _m_data) \
@@ -91,7 +93,7 @@ asm volatile \
      static_assert( K == TARGET_TYPE_NONE, \
                   "modifyCfamRegister is not supported by PPE platforms")
 
-namespace fapi2 
+namespace fapi2
 {
     // This function loads the scan region data for the given ring address and
     // updates the check word data
@@ -120,6 +122,26 @@ namespace fapi2
     // @return fapi::ReturnCode. FAPI2_RC_SUCCESS if success, else error code.
     fapi2::ReturnCode getRing_verifyAndcleanup(const uint32_t i_ringAddress,
                                         const fapi2::RingMode i_ringMode);
+
+    ///
+    /// @brief Platform wrapper over PK getscom_abs
+    ///
+    /// @param [in] i_addr The SCOM address
+    /// @param [out] o_data The data read
+    ///
+    /// @return PCB-PIB return code
+    ///
+    uint32_t getscom_abs_wrap(const uint32_t i_addr, uint64_t *o_data);
+
+    ///
+    /// @brief Platform wrapper over PK putscom_abs
+    ///
+    /// @param [in] i_addr The SCOM address
+    /// @param [in] i_data The data read
+    ///
+    /// @return PCB-PIB return code
+    ///
+    uint32_t putscom_abs_wrap(const uint32_t i_addr, uint64_t i_data);
 }
 
 
diff --git a/sbe/hwpf/src/plat/plat_hw_access.C b/sbe/hwpf/src/plat/plat_hw_access.C
index adc02fc1..0b7d2ad4 100644
--- a/sbe/hwpf/src/plat/plat_hw_access.C
+++ b/sbe/hwpf/src/plat/plat_hw_access.C
@@ -49,5 +49,25 @@ namespace fapi2
         return FAPI2_RC_SUCCESS;
     }
 
+    uint32_t getscom_abs_wrap(const uint32_t i_addr, uint64_t *o_data)
+    {
+        uint32_t l_rc = 0;
+        FAPI_INF("getScom: address: 0x%08X", i_addr);
+        l_rc = getscom_abs(i_addr, o_data);
+        FAPI_INF("getScom: returned rc: 0x%08X, data HI: 0x%08X, "
+                 "data LO: 0x%08X", l_rc, (*o_data >> 32),
+                 static_cast<uint32_t>(*o_data & 0xFFFFFFFF));
+        return l_rc;
+    }
 
+    uint32_t putscom_abs_wrap(const uint32_t i_addr, uint64_t i_data)
+    {
+        uint32_t l_rc = 0;
+        FAPI_INF("putScom: address: 0x%08X, data HI: 0x%08X, data LO: 0x%08X",
+                 i_addr, (i_data >> 32),
+                 static_cast<uint32_t>(i_data & 0xFFFFFFFF));
+        l_rc = putscom_abs(i_addr, i_data);
+        FAPI_INF("putScom: returned rc: 0x%08X", l_rc);
+        return l_rc;
+    }
 };