From 59e501ebede88684938b75cb8dbd00275099979f Mon Sep 17 00:00:00 2001 From: Thi Tran Date: Wed, 7 Jun 2017 13:50:51 -0500 Subject: L3 update -- p9_htm_setup/pause/start/stop HWPs Change-Id: Ib08d967d8d70a8ec8ba9c1c53adb3291d1d2135c RTC:139541 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41498 Tested-by: Jenkins Server Tested-by: Hostboot CI Reviewed-by: Joseph J. McGill Reviewed-by: Benjamin Gass Reviewed-by: Jennifer A. Stofer Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41509 Reviewed-by: Hostboot Team Tested-by: Jenkins OP Build CI Tested-by: FSP CI Jenkins Reviewed-by: Daniel M. Crowell --- .../chips/p9/procedures/hwp/nest/p9_htm_adu_ctrl.C | 25 +++++++++------------- 1 file changed, 10 insertions(+), 15 deletions(-) (limited to 'src/import/chips/p9/procedures/hwp/nest/p9_htm_adu_ctrl.C') diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_htm_adu_ctrl.C b/src/import/chips/p9/procedures/hwp/nest/p9_htm_adu_ctrl.C index af6d69e7a..6db4baf70 100644 --- a/src/import/chips/p9/procedures/hwp/nest/p9_htm_adu_ctrl.C +++ b/src/import/chips/p9/procedures/hwp/nest/p9_htm_adu_ctrl.C @@ -31,7 +31,7 @@ /// *HWP HWP Owner : Joe McGill /// *HWP FW Owner : Thi Tran /// *HWP Team : Nest -/// *HWP Level : 2 +/// *HWP Level : 3 /// *HWP Consumed by : HB ///---------------------------------------------------------------------------- @@ -70,21 +70,16 @@ fapi2::ReturnCode aduNHTMControl( l_adu_oper_flag.setTransactionSize(p9_ADU_oper_flag::TSIZE_2); // Acquire ADU lock - l_rc = p9_adu_coherent_manage_lock( i_target, - false, - true, // Acquire lock - l_num_attempts); - - if (l_rc) - { - FAPI_ERR("Error from p9_adu_coherent_manage_lock (acquire all)"); - goto fapi_try_exit; - } + FAPI_TRY(p9_adu_coherent_manage_lock( i_target, + false, + true, // Acquire lock + l_num_attempts), + "Error from p9_adu_coherent_manage_lock (acquire all)"); // NOTE: lock is now held, if an operation fails from this point - // to the end of the procedure. - // Reset lock + // to the end of the procedure, need to reset and unlock. l_adu_is_dirty = true; + // Reset ADU l_rc = p9_adu_coherent_utils_reset_adu(i_target); @@ -94,7 +89,7 @@ fapi2::ReturnCode aduNHTMControl( goto adu_reset_unlock; } - // issue operation + // Issue operation l_rc = p9_adu_coherent_setup_adu(i_target, i_addr, false, // write @@ -156,7 +151,7 @@ fapi2::ReturnCode aduNHTMControl( } FAPI_DBG("All ADU locks released"); - // no error for entire operation + // No error for entire operation l_adu_is_dirty = false; adu_reset_unlock: -- cgit v1.2.1