From c6d037412427d74339b6992bc36684ca62db27ab Mon Sep 17 00:00:00 2001 From: Brian Stegmiller Date: Fri, 25 Aug 2017 14:45:32 -0500 Subject: [PATCH] EKB: HWP Fail Isolation Fapi Hooks Change-Id: I67a30a6a5bf0af4db40d85ec6406481dd286bb75 RTC: 178331 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/45165 Tested-by: FSP CI Jenkins Reviewed-by: ANDRE A. MARIN Tested-by: Jenkins Server Reviewed-by: Matt K. Light Tested-by: PPE CI Tested-by: Hostboot CI Reviewed-by: Daniel M. Crowell Reviewed-by: Jennifer A. Stofer Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/45184 Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW --- src/import/hwpf/fapi2/include/utils.H | 21 ++++++++++++++++++++- src/usr/fapi2/test/fapi2VerifyPrdAttrTest.C | 21 --------------------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/import/hwpf/fapi2/include/utils.H b/src/import/hwpf/fapi2/include/utils.H index d41b7de5063..cd6a277177a 100644 --- a/src/import/hwpf/fapi2/include/utils.H +++ b/src/import/hwpf/fapi2/include/utils.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -128,7 +128,26 @@ void createPlatLog( fapi2::ReturnCode& io_rc, fapi2::errlSeverity_t i_sev = fapi2::FAPI2_ERRL_SEV_UNRECOVERABLE ); + +/// +/// @brief Associate an error to PRD PLID +/// +/// @param[in] i_target Reference to target +/// @param[in,out] io_rc Reference to ReturnCode +/// @param[in] i_sev Fapi error log severity defaulted to unrecoverable +/// @param[in] i_unitTestError - flag to log error which does not cause a unit +/// test to fail. +/// +/// @note Implemented by platform code +/// +void log_related_error( + const Target& i_target, + fapi2::ReturnCode& io_rc, + const fapi2::errlSeverity_t i_sev = fapi2::FAPI2_ERRL_SEV_UNRECOVERABLE, + const bool i_unitTestError = false ); + #endif // __PPE__ + /// /// @brief Delay this thread. Hostboot will use the nanoseconds parameter /// and make a syscall to nanosleep. While in the syscall, the hostboot diff --git a/src/usr/fapi2/test/fapi2VerifyPrdAttrTest.C b/src/usr/fapi2/test/fapi2VerifyPrdAttrTest.C index 1a0ccac50fc..4c62d2f03e7 100644 --- a/src/usr/fapi2/test/fapi2VerifyPrdAttrTest.C +++ b/src/usr/fapi2/test/fapi2VerifyPrdAttrTest.C @@ -32,27 +32,6 @@ #include "fapi2TestUtils.H" #include -// NOTE: This testcase does run successfully -// when enabling fapi test library. -// -// However, log_related_error(..) has to have -// a prototype defined for this to compile.. -// That will eventually be true when -// the EKB changes show up in utils.H -#if 1 -namespace fapi2 -{ -void log_related_error( - const Target& i_target, - fapi2::ReturnCode& io_rc, - const fapi2::errlSeverity_t i_sev = fapi2::FAPI2_ERRL_SEV_UNRECOVERABLE, - const bool i_unitTestError = false ); -} -#else -#include -#endif - - // Used to generate a FAPI RC -- don't care how or why fapi2::ReturnCode verifyPrd_get_fapi2_error(void)