From 750d31bd1b1ac15c3fb0938dd296753f586ac86f Mon Sep 17 00:00:00 2001 From: Joe McGill Date: Fri, 26 May 2017 10:19:06 -0500 Subject: [PATCH] L3 update -- p9_psi_scominit Change-Id: I955bcb7d9cf03bdd21660183e377d0428e75fc84 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41036 Reviewed-by: Thi N. Tran Tested-by: Jenkins Server Tested-by: Hostboot CI Reviewed-by: Benjamin Gass Reviewed-by: Peng Fei Gou Reviewed-by: Jennifer A. Stofer Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41048 Reviewed-by: Hostboot Team Tested-by: FSP CI Jenkins Reviewed-by: Daniel M. Crowell --- .../p9/procedures/hwp/nest/p9_psi_scominit.C | 65 ++++++++----------- .../p9/procedures/hwp/nest/p9_psi_scominit.H | 37 +++++------ 2 files changed, 46 insertions(+), 56 deletions(-) diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_psi_scominit.C b/src/import/chips/p9/procedures/hwp/nest/p9_psi_scominit.C index 642c31a84e6..b83f9310c77 100644 --- a/src/import/chips/p9/procedures/hwp/nest/p9_psi_scominit.C +++ b/src/import/chips/p9/procedures/hwp/nest/p9_psi_scominit.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -22,49 +22,40 @@ /* permissions and limitations under the License. */ /* */ /* IBM_PROLOG_END_TAG */ -/// ---------------------------------------------------------------------------- -/// @file p9_psi_scominit.H /// -/// Initializes PSI SCOM of the target proc. +/// @file p9_psi_scominit.C +/// @brief Perform PSI SCOM initialization (FAPI2) /// -/// ---------------------------------------------------------------------------- -/// *HWP HWP Owner : Joe McGill -/// *HWP FW Owner : Thi Tran -/// *HWP Team : Nest -/// *HWP Level : 1 -/// *HWP Consumed by : HB -/// ---------------------------------------------------------------------------- +/// @author Joe McGill +/// + +// +// *HWP HWP Owner : Joe McGill +// *HWP FW Owner : Thi Tran +// *HWP Team : Nest +// *HWP Level : 3 +// *HWP Consumed by : HB +// //------------------------------------------------------------------------------ // Includes //------------------------------------------------------------------------------ #include -#include "p9_psi_scom.H" -///---------------------------------------------------------------------------- -/// Constant definitions -///---------------------------------------------------------------------------- +#include -extern "C" { -///---------------------------------------------------------------------------- +///----------------------------------------------------------------------------- /// Function definitions -///---------------------------------------------------------------------------- - -/// -/// @brief p9_psi_scominit procedure entry point -/// See doxygen in p9_psi_scominit.H -/// - fapi2::ReturnCode p9_psi_scominit( - const fapi2::Target& i_target) - { - FAPI_DBG("Entering p9_psi_scominit"); - fapi2::ReturnCode rc; - - FAPI_EXEC_HWP(rc, p9_psi_scom, i_target); - - FAPI_DBG("Exiting p9_psi_scominit"); - - return rc; - } - -} // extern "C" +///----------------------------------------------------------------------------- + +fapi2::ReturnCode +p9_psi_scominit( + const fapi2::Target& i_target) +{ + fapi2::ReturnCode l_rc; + + FAPI_DBG("Start"); + FAPI_EXEC_HWP(l_rc, p9_psi_scom, i_target); + FAPI_DBG("End"); + return l_rc; +} diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_psi_scominit.H b/src/import/chips/p9/procedures/hwp/nest/p9_psi_scominit.H index 805018c3329..fe866740b5f 100644 --- a/src/import/chips/p9/procedures/hwp/nest/p9_psi_scominit.H +++ b/src/import/chips/p9/procedures/hwp/nest/p9_psi_scominit.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -22,20 +22,20 @@ /* permissions and limitations under the License. */ /* */ /* IBM_PROLOG_END_TAG */ -/// ---------------------------------------------------------------------------- -/// @file p9_psi_scominit.H /// -/// @brief p9_psi_scominit HWP +/// @file p9_psi_scominit.H +/// @brief Perform PSI SCOM initialization (FAPI2) /// -/// Initializes PSI SCOM of the target proc. +/// @author Joe McGill /// -/// ---------------------------------------------------------------------------- -/// *HWP HWP Owner : Joe McGill -/// *HWP FW Owner : Thi Tran -/// *HWP Team : Nest -/// *HWP Level : 1 -/// *HWP Consumed by : HB -/// ---------------------------------------------------------------------------- + +// +// *HWP HWP Owner : Joe McGill +// *HWP FW Owner : Thi Tran +// *HWP Team : Nest +// *HWP Level : 3 +// *HWP Consumed by : HB +// #ifndef _P9_PSI_SCOMINIT_H_ #define _P9_PSI_SCOMINIT_H_ @@ -45,13 +45,13 @@ //------------------------------------------------------------------------------ #include -// Function pointer typedef definition for HWP call support -typedef fapi2::ReturnCode (*p9_psi_scominit_FP_t)( - const fapi2::Target&); //---------------------------------------------------------------------------- -// Constant definitions +// Structure definitions //---------------------------------------------------------------------------- +// Function pointer typedef definition for HWP call support +typedef fapi2::ReturnCode (*p9_psi_scominit_FP_t)( + const fapi2::Target&); //------------------------------------------------------------------------------ @@ -64,10 +64,9 @@ extern "C" /// /// @brief p9_psi_scominit procedure /// -/// Initializes PSI SCOM of the target proc. -/// -/// @param[in] i_target Reference to TARGET_TYPE_PROC_CHIP target +/// Initializes PSI unit SCOM registers of the target processor /// +/// @param[in] i_target Reference to TARGET_TYPE_PROC_CHIP target /// @return FAPI2_RC_SUCCESS if success, else error code. ///