diff options
author | Yue Du <daviddu@us.ibm.com> | 2017-02-01 16:27:57 -0600 |
---|---|---|
committer | Sachin Gupta <sgupta2m@in.ibm.com> | 2017-02-06 22:28:37 -0500 |
commit | 0a17ea99013750cf8fe7a557d60475500a5aaed8 (patch) | |
tree | c06efb75b01371355e128df10acffc6663b2bfdb /src/import/chips/p9/procedures/hwp/core | |
parent | 2a0b3c8377ea80be2da740161bf411de6f18e953 (diff) | |
download | talos-sbe-0a17ea99013750cf8fe7a557d60475500a5aaed8.tar.gz talos-sbe-0a17ea99013750cf8fe7a557d60475500a5aaed8.zip |
Hcode: Drop chiplet fence after scominit and scomcust hwp.
Change-Id: I88e9f9087e9877b63cb9eadeda99ad6cc286485c
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35758
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Reviewed-by: AMIT KUMAR <akumar3@us.ibm.com>
Reviewed-by: JAMES DEZELLE <jdezelle@us.ibm.com>
Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35766
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Diffstat (limited to 'src/import/chips/p9/procedures/hwp/core')
3 files changed, 35 insertions, 46 deletions
diff --git a/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_scomcust.C b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_scomcust.C index 8c199de8..96cbb041 100644 --- a/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_scomcust.C +++ b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_scomcust.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER sbe Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -26,12 +26,6 @@ /// @file p9_hcd_core_scomcust.C /// @brief Core Customization SCOMs /// -/// *HWP HWP Owner : David Du <daviddu@us.ibm.com> -/// *HWP FW Owner : Reshmi Nair <resnair5@in.ibm.com> -/// *HWP Team : PM -/// *HWP Consumed by : SBE:CME -/// *HWP Level : 1 -/// /// Procedure Summary: /// Dynamically built (and installed) routine that is inserted by the .XIP /// Customization. process. (New for P9) (TODO: this part of the process is @@ -40,44 +34,41 @@ /// If NULL (a potential early value); return /// Else call the function at the pointer; /// pointer is filled in by XIP Customization -/// + +// *HWP HWP Owner : David Du <daviddu@us.ibm.com> +// *HWP Backup HWP Owner : Greg Still <stillgs@us.ibm.com> +// *HWP FW Owner : Sangeetha T S <sangeet2@in.ibm.com> +// *HWP Team : PM +// *HWP Consumed by : SBE:CME +// *HWP Level : 2 //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- -#include <fapi2.H> -//#include <common_scom_addresses.H> -//will be replaced with real scom address header file + +#include <p9_quad_scom_addresses.H> +#include <p9_hcd_common.H> #include "p9_hcd_core_scomcust.H" //----------------------------------------------------------------------------- // Constant Definitions: Core Customization SCOMs //----------------------------------------------------------------------------- -extern "C" +fapi2::ReturnCode +p9_hcd_core_scomcust( + const fapi2::Target<fapi2::TARGET_TYPE_CORE>& i_target) { + FAPI_INF(">>p9_hcd_core_scomcust"); + fapi2::buffer<uint64_t> l_data64; - fapi2::ReturnCode - p9_hcd_core_scomcust( - const fapi2::Target<fapi2::TARGET_TYPE_CORE>& i_target) - { - -#if 0 - - fapi2::buffer<uint64_t> data; - - return fapi2::FAPI2_RC_SUCCESS; - - FAPI_CLEANUP(); - return fapi2::FAPI2_RC_PLAT_ERR_SEE_DATA; - -#endif - - return fapi2::FAPI2_RC_SUCCESS; + FAPI_DBG("Drop chiplet fence via NET_CTRL0[18]"); + FAPI_TRY(putScom(i_target, C_NET_CTRL0_WAND, MASK_UNSET(18))); - } // Procedure +fapi_try_exit: + FAPI_INF("<<p9_hcd_core_scomcust"); + return fapi2::current_err; +} -} // extern C diff --git a/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_scomcust.H b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_scomcust.H index 79a74c7f..6f7d2169 100644 --- a/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_scomcust.H +++ b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_scomcust.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER sbe Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -26,25 +26,26 @@ /// @file p9_hcd_core_scomcust.H /// @brief Core Customization SCOMs /// -/// *HWP HWP Owner : David Du <daviddu@us.ibm.com> -/// *HWP FW Owner : Reshmi Nair <resnair5@in.ibm.com> -/// *HWP Team : PM -/// *HWP Consumed by : SBE:CME -/// *HWP Level : 1 -/// +// *HWP HWP Owner : David Du <daviddu@us.ibm.com> +// *HWP Backup HWP Owner : Greg Still <stillgs@us.ibm.com> +// *HWP FW Owner : Sangeetha T S <sangeet2@in.ibm.com> +// *HWP Team : PM +// *HWP Consumed by : SBE:CME +// *HWP Level : 2 #ifndef __P9_HCD_CORE_SCOMCUST_H__ #define __P9_HCD_CORE_SCOMCUST_H__ -extern "C" -{ +#include <fapi2.H> /// @typedef p9_hcd_core_scomcust_FP_t /// function pointer typedef definition for HWP call support - typedef fapi2::ReturnCode (*p9_hcd_core_scomcust_FP_t) ( - const fapi2::Target<fapi2::TARGET_TYPE_CORE>&); +typedef fapi2::ReturnCode (*p9_hcd_core_scomcust_FP_t) ( + const fapi2::Target<fapi2::TARGET_TYPE_CORE>&); +extern "C" +{ /// @brief Core Customization SCOMs /// @@ -58,6 +59,6 @@ extern "C" p9_hcd_core_scomcust( const fapi2::Target<fapi2::TARGET_TYPE_CORE>& i_target); -} // extern C +} #endif // __P9_HCD_CORE_SCOMCUST_H__ diff --git a/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_startclocks.C b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_startclocks.C index d26fb42c..3aa5d1ba 100644 --- a/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_startclocks.C +++ b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_startclocks.C @@ -273,9 +273,6 @@ p9_hcd_core_startclocks( // Cleaning up // ------------------------------- - FAPI_DBG("Drop chiplet fence via NET_CTRL0[18]"); - FAPI_TRY(putScom(i_target, C_NET_CTRL0_WAND, MASK_UNSET(18))); - /// @todo RTC158181 ignore xstop checkstop in sim, review for lab /* FAPI_DBG("Check the Global Checkstop FIR"); |