From bad96fc767bd52a3a83e22d67f801b1d35ce3914 Mon Sep 17 00:00:00 2001 From: Dan Crowell Date: Thu, 8 Sep 2016 14:57:06 -0500 Subject: Move some reset logic from INVOKE_HWP to EXEC_HWP There are a couple places where we call FAPI_EXEC_HWP directly and we don't want to miss these global variable resets in those cases. Change-Id: I227d392623df019a0943f9ab0f59fff5ab322527 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29390 Reviewed-by: Christian R. Geddes Reviewed-by: Martin Gloff Tested-by: Jenkins Server Tested-by: FSP CI Jenkins Reviewed-by: Richard J. Knight Reviewed-by: Daniel M. Crowell --- src/include/usr/fapi2/hwp_executor.H | 3 +++ src/include/usr/fapi2/plat_hwp_invoker.H | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/include/usr/fapi2') diff --git a/src/include/usr/fapi2/hwp_executor.H b/src/include/usr/fapi2/hwp_executor.H index 72f00a694..6c2049595 100644 --- a/src/include/usr/fapi2/hwp_executor.H +++ b/src/include/usr/fapi2/hwp_executor.H @@ -45,6 +45,9 @@ * Call the HWP directly. */ #define FAPI_PLAT_EXEC_HWP(RC, FUNC, _args_...) \ + fapi2::current_err = fapi2::FAPI2_RC_SUCCESS;\ + fapi2::opMode = fapi2::NORMAL;\ + fapi2::setPIBErrorMask(0);\ RC = FUNC(_args_) #endif // HWPEXECUTOR_H_ diff --git a/src/include/usr/fapi2/plat_hwp_invoker.H b/src/include/usr/fapi2/plat_hwp_invoker.H index 7deb017fd..211b3f0c6 100644 --- a/src/include/usr/fapi2/plat_hwp_invoker.H +++ b/src/include/usr/fapi2/plat_hwp_invoker.H @@ -60,9 +60,6 @@ #define FAPI_INVOKE_HWP(ERRHNDL, FUNC, _args_...) \ {\ fapi2::ReturnCode l_rc; \ - fapi2::current_err = fapi2::FAPI2_RC_SUCCESS;\ - fapi2::opMode = fapi2::NORMAL;\ - fapi2::setPIBErrorMask(0);\ FAPI_EXEC_HWP(l_rc, FUNC, ##_args_); \ ERRHNDL = fapi2::rcToErrl(l_rc);\ if( ERRHNDL ) {\ -- cgit v1.2.3