diff options
| author | Caleb Palmer <cnpalmer@us.ibm.com> | 2017-02-23 15:33:59 -0600 |
|---|---|---|
| committer | Zane C. Shelley <zshelle@us.ibm.com> | 2017-03-01 13:17:48 -0500 |
| commit | 1479068a50dcbf64aff61074287130afd3d3be70 (patch) | |
| tree | 9af67f1ae811e38d71183f4c156f308045285648 | |
| parent | daaa27c1edfd3ffbe04008ac86c3c1e10d3be88e (diff) | |
| download | talos-hostboot-1479068a50dcbf64aff61074287130afd3d3be70.tar.gz talos-hostboot-1479068a50dcbf64aff61074287130afd3d3be70.zip | |
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>
| -rw-r--r-- | src/usr/diag/prdf/plat/prdfPlatServices.C | 17 | ||||
| -rw-r--r-- | src/usr/diag/prdf/plat/prdfPlatServices_ipl.C | 6 | ||||
| -rw-r--r-- | src/usr/diag/prdf/plat/prdfPlatServices_rt.C | 6 |
3 files changed, 14 insertions, 15 deletions
diff --git a/src/usr/diag/prdf/plat/prdfPlatServices.C b/src/usr/diag/prdf/plat/prdfPlatServices.C index a51c92268..08c1fba46 100644 --- 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 index 67e1d6dae..157502d72 100644 --- 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 index a30dd3d76..5a99e7ed5 100644 --- 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()); |
