PRD: Add Wrapper to HWP calls

Change-Id: Ie6d6622fa709d90c78a8a7f9c20ff25780885931 CQ: SW381290 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36972 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com> Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com> Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/37264 Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
open-power · Mar 1, 2017 · 1479068 · 1479068
1 parent daaa27c
commit 1479068
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/src/usr/diag/prdf/plat/prdfPlatServices.C b/src/usr/diag/prdf/plat/prdfPlatServices.C
@@ -347,11 +347,10 @@ uint32_t startBgScrub<TYPE_MCA>( ExtensibleChip * i_mcaChip,
         }
 
         // Start the background scrub command.
-        fapi2::ReturnCode fapi_rc = memdiags::background_scrub( fapiTrgt,
-                                                                stopCond,
-                                                                scrubSpeed,
-                                                                saddr );
-        errlHndl_t errl = fapi2::rcToErrl( fapi_rc );
+        errlHndl_t errl = nullptr;
+        FAPI_INVOKE_HWP( errl, memdiags::background_scrub, fapiTrgt, stopCond,
+                         scrubSpeed, saddr );
+
         if ( nullptr != errl )
         {
             PRDF_ERR( PRDF_FUNC "memdiags::background_scrub(0x%08x,%d) failed",
@@ -408,10 +407,10 @@ uint32_t __startTdScrub_mca( ExtensibleChip * i_mcaChip,
         }
 
         // Start the super fast read command.
-        fapi2::ReturnCode fapi_rc = memdiags::targeted_scrub( fapiTrgt,
-                                                i_stopCond, i_saddr, i_eaddr,
-                                                mss::mcbist::NONE );
-        errlHndl_t errl = fapi2::rcToErrl( fapi_rc );
+        errlHndl_t errl;
+        FAPI_INVOKE_HWP( errl, memdiags::targeted_scrub, fapiTrgt, i_stopCond,
+                         i_saddr, i_eaddr, mss::mcbist::NONE );
+
         if ( nullptr != errl )
         {
             PRDF_ERR( PRDF_FUNC "memdiags::targeted_scrub(0x%08x) failed",

diff --git a/src/usr/diag/prdf/plat/prdfPlatServices_ipl.C b/src/usr/diag/prdf/plat/prdfPlatServices_ipl.C
@@ -220,9 +220,9 @@ uint32_t startSfRead<TYPE_MCA>( ExtensibleChip * i_mcaChip,
         }
 
         // Start the super fast read command.
-        fapi2::ReturnCode fapi_rc = memdiags::sf_read( fapiTrgt, stopCond,
-                                                       saddr );
-        errlHndl_t errl = fapi2::rcToErrl( fapi_rc );
+        errlHndl_t errl;
+        FAPI_INVOKE_HWP( errl, memdiags::sf_read, fapiTrgt, stopCond, saddr );
+
         if ( nullptr != errl )
         {
             PRDF_ERR( PRDF_FUNC "memdiags::sf_read(0x%08x,%d) failed",

diff --git a/src/usr/diag/prdf/plat/prdfPlatServices_rt.C b/src/usr/diag/prdf/plat/prdfPlatServices_rt.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016                             */
+/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -129,9 +129,9 @@ uint32_t stopBgScrub<TYPE_MCBIST>( ExtensibleChip * i_chip )
 
     fapi2::Target<fapi2::TARGET_TYPE_MCBIST> fapiTrgt ( i_chip->getTrgt() );
 
-    fapi2::ReturnCode fapi_rc = memdiags::stop( fapiTrgt );
+    errlHndl_t errl;
+    FAPI_INVOKE_HWP( errl, memdiags::stop, fapiTrgt );
 
-    errlHndl_t errl = fapi2::rcToErrl( fapi_rc );
     if ( nullptr != errl )
     {
         PRDF_ERR( PRDF_FUNC "memdiags::stop(0x%08x) failed", i_chip->getHuid());