PRD: Restore fapiRcToErrl interface

Change-Id: I3c6a70bf10b07745ca4954abd78540b22f0f7387
RTC: 144699
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/21524
Tested-by: Jenkins Server
Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/21930
Tested-by: FSP CI Jenkins
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

6 files changed, 58 insertions, 68 deletions

diff --git a/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.C b/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.C
index 1cf85b55e..7734218c3 100755
--- a/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.C
+++ b/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.C
@@ -113,10 +113,10 @@ int32_t readErepair(TargetHandle_t i_rxBusTgt,
     int32_t o_rc = SUCCESS;
     errlHndl_t err = NULL;
 
-    PRD_FAPI_TO_ERRL(err,
-                     io_read_erepair,
-                     getFapiTarget(i_rxBusTgt),
-                     o_rxFailLanes);
+    FAPI_INVOKE_HWP(err,
+                    io_read_erepair,
+                    getFapiTarget(i_rxBusTgt),
+                    o_rxFailLanes);
 
     if(NULL != err)
     {
@@ -134,9 +134,9 @@ int32_t clearIOFirs(TargetHandle_t i_rxBusTgt)
     int32_t o_rc = SUCCESS;
     errlHndl_t err = NULL;
 
-    PRD_FAPI_TO_ERRL(err,
-                     io_clear_firs,
-                     getFapiTarget(i_rxBusTgt));
+    FAPI_INVOKE_HWP(err,
+                    io_clear_firs,
+                    getFapiTarget(i_rxBusTgt));
 
     if(NULL != err)
     {
@@ -156,11 +156,11 @@ int32_t powerDownLanes(TargetHandle_t i_rxBusTgt,
     int32_t o_rc = SUCCESS;
     errlHndl_t err = NULL;
 
-    PRD_FAPI_TO_ERRL(err,
-                     io_power_down_lanes,
-                     getFapiTarget(i_rxBusTgt),
-                     i_txFailLanes,
-                     i_rxFailLanes);
+    FAPI_INVOKE_HWP(err,
+                    io_power_down_lanes,
+                    getFapiTarget(i_rxBusTgt),
+                    i_txFailLanes,
+                    i_rxFailLanes);
 
     if(NULL != err)
     {
@@ -195,11 +195,11 @@ int32_t getVpdFailedLanes(TargetHandle_t i_rxBusTgt,
 #endif
 
         errlHndl_t err = NULL;
-        PRD_FAPI_TO_ERRL(err,
-                         erepairGetFailedLanes,
-                         getFapiTarget(i_rxBusTgt),
-                         o_txFailLanes,
-                         o_rxFailLanes);
+        FAPI_INVOKE_HWP(err,
+                        erepairGetFailedLanes,
+                        getFapiTarget(i_rxBusTgt),
+                        o_txFailLanes,
+                        o_rxFailLanes);
 
         if(NULL != err)
         {
@@ -239,12 +239,12 @@ int32_t setVpdFailedLanes(TargetHandle_t i_rxBusTgt,
 #endif
 
         errlHndl_t err = NULL;
-        PRD_FAPI_TO_ERRL(err,
-                         erepairSetFailedLanes,
-                         getFapiTarget(i_txBusTgt),
-                         getFapiTarget(i_rxBusTgt),
-                         i_rxFailLanes,
-                         o_thrExceeded);
+        FAPI_INVOKE_HWP(err,
+                        erepairSetFailedLanes,
+                        getFapiTarget(i_txBusTgt),
+                        getFapiTarget(i_rxBusTgt),
+                        i_rxFailLanes,
+                        o_thrExceeded);
         if(NULL != err)
         {
             PRDF_ERR( "[PlatServices::setVpdFailedLanes] rxHUID: 0x%08x "
@@ -265,7 +265,7 @@ int32_t erepairFirIsolation(TargetHandle_t i_rxBusTgt)
 
     errlHndl_t err = NULL;
 
-    PRD_FAPI_TO_ERRL(err, io_fir_isolation, getFapiTarget(i_rxBusTgt));
+    FAPI_INVOKE_HWP(err, io_fir_isolation, getFapiTarget(i_rxBusTgt));
 
     if(NULL != err)
     {
@@ -351,14 +351,14 @@ int32_t getMemAddrRange( TargetHandle_t i_mba, uint8_t i_mrank,
 
         if ( i_slaveOnly )
         {
-            PRD_FAPI_TO_ERRL( errl, mss_get_slave_address_range,
-                              getFapiTarget(i_mba),
-                              i_mrank, i_srank, o_startAddr, o_endAddr );
+            FAPI_INVOKE_HWP( errl, mss_get_slave_address_range,
+                             getFapiTarget(i_mba),
+                             i_mrank, i_srank, o_startAddr, o_endAddr );
         }
         else
         {
-            PRD_FAPI_TO_ERRL( errl, mss_get_address_range, getFapiTarget(i_mba),
-                              i_mrank, o_startAddr, o_endAddr );
+            FAPI_INVOKE_HWP( errl, mss_get_address_range, getFapiTarget(i_mba),
+                             i_mrank, o_startAddr, o_endAddr );
         }
 
         if ( NULL != errl )
@@ -458,9 +458,9 @@ int32_t setBadDqBitmap( TargetHandle_t i_mba, const CenRank & i_rank,
         for ( int32_t ps = 0; ps < PORT_SLCT_PER_MBA; ps++ )
         {
             errlHndl_t errl = NULL;
-            PRD_FAPI_TO_ERRL( errl, dimmSetBadDqBitmap, getFapiTarget(i_mba),
-                              ps, i_rank.getDimmSlct(), i_rank.getRankSlct(),
-                              data[ps] );
+            FAPI_INVOKE_HWP( errl, dimmSetBadDqBitmap, getFapiTarget(i_mba),
+                             ps, i_rank.getDimmSlct(), i_rank.getRankSlct(),
+                             data[ps] );
             if ( NULL != errl )
             {
                 PRDF_ERR( PRDF_FUNC "dimmSetBadDqBitmap() failed: MBA=0x%08x "
@@ -492,8 +492,8 @@ int32_t mssGetMarkStore( TargetHandle_t i_mba, const CenRank & i_rank,
     {
         errlHndl_t errl = NULL;
         uint8_t symbolMark, chipMark;
-        PRD_FAPI_TO_ERRL( errl, mss_get_mark_store, getFapiTarget(i_mba),
-                          i_rank.getMaster(), symbolMark, chipMark );
+        FAPI_INVOKE_HWP( errl, mss_get_mark_store, getFapiTarget(i_mba),
+                         i_rank.getMaster(), symbolMark, chipMark );
 
         if ( NULL != errl )
         {
@@ -615,8 +615,8 @@ int32_t mssGetSteerMux( TargetHandle_t i_mba, const CenRank & i_rank,
     errlHndl_t errl = NULL;
 
     uint8_t port0Spare, port1Spare, eccSpare;
-    PRD_FAPI_TO_ERRL( errl, mss_check_steering, getFapiTarget(i_mba),
-                      i_rank.getMaster(), port0Spare, port1Spare, eccSpare );
+    FAPI_INVOKE_HWP( errl, mss_check_steering, getFapiTarget(i_mba),
+                     i_rank.getMaster(), port0Spare, port1Spare, eccSpare );
 
     if ( NULL != errl )
     {
@@ -647,9 +647,9 @@ int32_t mssSetSteerMux( TargetHandle_t i_mba, const CenRank & i_rank,
 
     errlHndl_t errl = NULL;
 
-    PRD_FAPI_TO_ERRL( errl, mss_do_steering, getFapiTarget(i_mba),
-                      i_rank.getMaster(), i_symbol.getDramSymbol(),
-                      i_x4EccSpare );
+    FAPI_INVOKE_HWP( errl, mss_do_steering, getFapiTarget(i_mba),
+                     i_rank.getMaster(), i_symbol.getDramSymbol(),
+                     i_x4EccSpare );
 
     if ( NULL != errl )
     {
@@ -861,10 +861,10 @@ int32_t getMemBufRawCardType( TargetHandle_t i_mba,
         fapi::Target fapiDimm = getFapiTarget( l_dimmList[0] );
         uint8_t l_cardType = WIRING_INVALID;
 
-        PRD_FAPI_TO_ERRL( errl,
-                          fapi::platAttrSvc::fapiPlatGetSpdModspecComRefRawCard,
-                          &fapiDimm,
-                          l_cardType );
+        FAPI_INVOKE_HWP( errl,
+                         fapi::platAttrSvc::fapiPlatGetSpdModspecComRefRawCard,
+                         &fapiDimm,
+                         l_cardType );
 
         if ( NULL != errl )
         {
diff --git a/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.H b/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.H
index 6d6b220f0..ed63df794 100755
--- a/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.H
+++ b/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.H
@@ -45,15 +45,7 @@
 
 //#include <dimmConsts.H>         // for DIMM_DQ_RANK_BITMAP_SIZE TODO RTC 136126
 
-/* TODO RTC 144699
-#include <fapiPlatHwpInvoker.H> // for fapi::fapiRcToErrl()
-
-#define PRD_FAPI_TO_ERRL(ERRHNDL, FUNC, _args_...) \
-    { \
-        fapi::ReturnCode l_rc = FUNC(_args_); \
-        ERRHNDL = fapi::fapiRcToErrl(l_rc);   \
-    }
-*/
+#include <plat_hwp_invoker.H>
 
 #include <errlentry.H>
 
diff --git a/src/usr/diag/prdf/framework/service/prdfPlatServices.C b/src/usr/diag/prdf/framework/service/prdfPlatServices.C
index 35c94b6e3..66e5ed23f 100644
--- a/src/usr/diag/prdf/framework/service/prdfPlatServices.C
+++ b/src/usr/diag/prdf/framework/service/prdfPlatServices.C
@@ -168,11 +168,11 @@ int32_t getCfam( ExtensibleChip * i_chip,
         errlHndl_t errH = NULL;
         ecmdDataBufferBase cfamData(32);
 
-        PRD_FAPI_TO_ERRL(errH,
-                         fapiGetCfamRegister,
-                         PlatServices::getFapiTarget(l_procTgt),
-                         i_addr,
-                         cfamData);
+        FAPI_INVOKE_HWP(errH,
+                        fapiGetCfamRegister,
+                        PlatServices::getFapiTarget(l_procTgt),
+                        i_addr,
+                        cfamData);
 
         if ( NULL == errH )
         {
diff --git a/src/usr/diag/prdf/framework/service/prdfPlatServices_ipl.C b/src/usr/diag/prdf/framework/service/prdfPlatServices_ipl.C
index 7e1d19604..614b24c9a 100644
--- a/src/usr/diag/prdf/framework/service/prdfPlatServices_ipl.C
+++ b/src/usr/diag/prdf/framework/service/prdfPlatServices_ipl.C
@@ -129,9 +129,9 @@ int32_t mssRestoreDramRepairs( TargetHandle_t i_mbaTarget,
 
     errlHndl_t errl = NULL;
 
-    PRD_FAPI_TO_ERRL( errl, mss_restore_DRAM_repairs,
-                      fapi::Target(fapi::TARGET_TYPE_MBA_CHIPLET, i_mbaTarget),
-                      o_repairedRankMask, o_badDimmMask );
+    FAPI_INVOKE_HWP( errl, mss_restore_DRAM_repairs,
+                     fapi::Target(fapi::TARGET_TYPE_MBA_CHIPLET, i_mbaTarget),
+                     o_repairedRankMask, o_badDimmMask );
 
     if ( NULL != errl )
     {
@@ -159,8 +159,8 @@ int32_t mssIplUeIsolation( TargetHandle_t i_mba, const CenRank & i_rank,
     uint8_t data[PORT_SLCT_PER_MBA][DIMM_DQ_RANK_BITMAP_SIZE];
 
     errlHndl_t errl = NULL;
-    PRD_FAPI_TO_ERRL( errl, mss_IPL_UE_isolation, getFapiTarget(i_mba),
-                      i_rank.getMaster(), data );
+    FAPI_INVOKE_HWP( errl, mss_IPL_UE_isolation, getFapiTarget(i_mba),
+                     i_rank.getMaster(), data );
     if ( NULL != errl )
     {
         PRDF_ERR( PRDF_FUNC "mss_IPL_UE_isolation() failed: MBA=0x%08x "
diff --git a/src/usr/diag/prdf/prdf_hb_only.mk b/src/usr/diag/prdf/prdf_hb_only.mk
index b4c44bd36..d9f4253dc 100644
--- a/src/usr/diag/prdf/prdf_hb_only.mk
+++ b/src/usr/diag/prdf/prdf_hb_only.mk
@@ -58,9 +58,8 @@ prd_incpath += ${PRD_SRC_PATH}/plat/pegasus
 # External header paths
 prd_incpath += ${ROOTPATH}/src/include/usr/ecmddatabuffer
 prd_incpath += ${ROOTPATH}/src/include/usr/errl
-#prd_incpath += ${ROOTPATH}/src/include/usr/hwpf/fapi
-#prd_incpath += ${ROOTPATH}/src/include/usr/hwpf/hwp
-#prd_incpath += ${ROOTPATH}/src/include/usr/hwpf/plat
+prd_incpath += ${ROOTPATH}/src/import/hwpf/fapi2/include
+prd_incpath += ${ROOTPATH}/src/include/usr/fapi2
 prd_incpath += ${ROOTPATH}/src/include/usr/ibscom
 prd_incpath += ${ROOTPATH}/src/include/usr/util
 #prd_incpath += ${ROOTPATH}/src/usr/hwpf/hwp/bus_training
diff --git a/src/usr/diag/prdf/test/prdf_hb_common_test.mk b/src/usr/diag/prdf/test/prdf_hb_common_test.mk
index 007201e74..5a48bc4fe 100755
--- a/src/usr/diag/prdf/test/prdf_hb_common_test.mk
+++ b/src/usr/diag/prdf/test/prdf_hb_common_test.mk
@@ -53,9 +53,8 @@ EXTRAINCDIR += ${PRD_USR_PATH}/test
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/ecmddatabuffer
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/errl
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/util
-#EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/fapi
-#EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/plat
-#EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp
+EXTRAINCDIR += ${ROOTPATH}/src/import/hwpf/fapi2/include
+EXTRAINCDIR += ${ROOTPATH}/src/include/usr/fapi2
 
 #------------------------------------------------------------------------------
 # objects