diff options
author | Amit Tendolkar <amit.tendolkar@in.ibm.com> | 2017-12-04 00:29:09 -0600 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-12-12 00:12:19 -0500 |
commit | 7067a4180ed6f0768c99132056394ec8700b90b7 (patch) | |
tree | 56423c60bb467f5fc50088e87a9386dde7b1a164 /src | |
parent | 4888af6221d73ff9255015b3e6d34fee9fb81885 (diff) | |
download | talos-hostboot-7067a4180ed6f0768c99132056394ec8700b90b7.tar.gz talos-hostboot-7067a4180ed6f0768c99132056394ec8700b90b7.zip |
Cache/Core stop clocks: add shut down of Power Management to remove contentions
Ported changes from https://ralgit01.raleigh.ibm.com/gerrit1/#/c/44781/25 to
simplify auto mirror conflicts and reuse existing SBE HWP files
- Halt SGPE, PGPE and CMEs assocatiated within the targeted EQ
- Clear the PCB atomic lock that may be in place by SGPE
- Add core stopclocks changes
- Fixed cache stop clocks XML callout
- Fix atomic lock library dependencies
- Only enable function on DD2
- Halt PPE only if not already in halt
- Enhance PPE Halt FFDC
Key_Cronus_Test=PM_REGRESS
Change-Id: Id6c11176d222213bf1a01b91cade41de989f04c6
RTC: 180317
CQ: SW406569
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/50415
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Tested-by: Cronus HW CI <cronushw-ci+hostboot@us.ibm.com>
Reviewed-by: RANGANATHPRASAD G. BRAHMASAMUDRA <prasadbgr@in.ibm.com>
Reviewed-by: Brian T. Vanderpool <vanderp@us.ibm.com>
Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/50421
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src')
10 files changed, 258 insertions, 47 deletions
diff --git a/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_stopclocks.C b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_stopclocks.C index d126020a6..c38454242 100644 --- a/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_stopclocks.C +++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_stopclocks.C @@ -40,11 +40,18 @@ //------------------------------------------------------------------------------ #include <p9_misc_scom_addresses.H> #include <p9_quad_scom_addresses.H> +#include <p9_quad_scom_addresses_fld.H> #include <p9_hcd_common.H> #include <p9_common_clk_ctrl_state.H> #include <p9_hcd_l2_stopclocks.H> #include <p9_hcd_cache_stopclocks.H> -#include <p9_quad_scom_addresses_fld.H> +#include <p9_eq_clear_atomic_lock.H> +#ifdef __PPE__ + #include <p9_sbe_ppe_utils.H> +#else + #include <p9_ppe_utils.H> +#endif +#include <p9_ppe_defs.H> //------------------------------------------------------------------------------ // Constant Definitions @@ -88,6 +95,9 @@ p9_hcd_cache_stopclocks( auto l_core_functional_vector = i_target.getChildren<fapi2::TARGET_TYPE_CORE> (fapi2::TARGET_STATE_FUNCTIONAL); + auto l_ex_vector = + i_target.getChildren<fapi2::TARGET_TYPE_EX> + (fapi2::TARGET_STATE_FUNCTIONAL); FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_IS_MPIPL, l_sys, l_is_mpipl)); @@ -163,6 +173,45 @@ p9_hcd_cache_stopclocks( if (!l_data64.getBit<EQ_PPM_GPMMR_RESET_STATE_INDICATOR>()) { FAPI_DBG("Gracefully turn off power management, if fail, continue anyways"); + +#ifdef DD2 + FAPI_DBG("Halting the PGPE ..."); + l_rc = ppe_halt(l_chip, PGPE_BASE_ADDRESS); + FAPI_ASSERT_NOEXIT(!l_rc, + fapi2::CACHE_STOPCLKS_PGPE_HALT_TIMEOUT() + .set_CHIP(l_chip), + "PSTATE GPE Halt timeout"); + + FAPI_DBG("Halting the SGPE ..."); + l_rc = ppe_halt(l_chip, SGPE_BASE_ADDRESS); + FAPI_ASSERT_NOEXIT(!l_rc, + fapi2::CACHE_STOPCLKS_SGPE_HALT_TIMEOUT() + .set_CHIP(l_chip), + "STOP GPE Halt timeout"); + + FAPI_DBG("Clear the atomic lock on EQ %d", l_attr_chip_unit_pos); + l_rc = p9_clear_atomic_lock(i_target); + FAPI_DBG("AFter the atomic lock %u", (uint32_t)l_rc); + FAPI_ASSERT_NOEXIT(!l_rc, + fapi2::CACHE_STOPCLKS_ATOMIC_LOCK_FAIL() + .set_EQ(i_target), + "EQ Atomic Halt timeout"); + + for ( auto& ex : l_ex_vector ) + { + fapi2::ATTR_CHIP_UNIT_POS_Type l_cme_id = 0; + FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CHIP_UNIT_POS, ex, l_cme_id)); + + FAPI_DBG("Halting CME %d", l_cme_id ); + uint64_t l_cme_base_address = getCmeBaseAddress (l_cme_id); + l_rc = ppe_halt(l_chip, l_cme_base_address); + FAPI_ASSERT_NOEXIT(!l_rc, + fapi2::CACHE_STOPCLKS_CME_HALT_TIMEOUT() + .set_EX(ex), + "CME Halt timeout"); + } + +#endif } FAPI_DBG("Check cache clock controller status"); @@ -302,19 +351,6 @@ p9_hcd_cache_stopclocks( FAPI_TRY(putScom(l_chip, l_scom_addr, DATA_SET(7))); } -// // ------------------------------- -// // Disable VDM -// // ------------------------------- -// -// if (l_attr_vdm_enabled == fapi2::ENUM_ATTR_VDM_ENABLED_TRUE) -// { -// FAPI_DBG("Clear Jump Protect Enable via DPLL_CTRL[1] (no need to poll DPLL_STAT)"); -// FAPI_TRY(putScom(i_target, EQ_QPPM_DPLL_CTRL_CLEAR, MASK_SET(1))); -// FAPI_DBG("Set VDM Disable via QPPM_VDMCR[1]"); -// FAPI_TRY(putScom(i_target, EQ_PPM_VDMCR_OR, MASK_SET(1))); -// FAPI_DBG("Drop VDM Poweron via QPPM_VDMCR[0]"); -// FAPI_TRY(putScom(i_target, EQ_PPM_VDMCR_CLEAR, MASK_SET(0))); -// } // ------------------------------- // Shutdown edram diff --git a/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_stopclocks.mk b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_stopclocks.mk index e6db13af5..82c575e6e 100644 --- a/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_stopclocks.mk +++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_stopclocks.mk @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2016 +# Contributors Listed Below - COPYRIGHT 2016,2017 # [+] International Business Machines Corp. # # @@ -24,6 +24,8 @@ # IBM_PROLOG_END_TAG PROCEDURE=p9_hcd_cache_stopclocks $(call ADD_MODULE_SRCDIR,$(PROCEDURE),$(ROOTPATH)/chips/p9/procedures/hwp/lib) -OBJS+=p9_hcd_cache_stopclocks.o -OBJS+=p9_hcd_l2_stopclocks.o +$(call ADD_MODULE_SRCDIR,$(PROCEDURE),$(ROOTPATH)/chips/p9/procedures/hwp/ffdc) +lib$(PROCEDURE)_DEPLIBS+=p9_hcd_l2_stopclocks +lib$(PROCEDURE)_DEPLIBS+=p9_ppe_utils +lib$(PROCEDURE)_DEPLIBS+=p9_eq_clear_atomic_lock $(call BUILD_PROCEDURE) diff --git a/src/import/chips/p9/procedures/hwp/cache/p9_hcd_l2_stopclocks.mk b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_l2_stopclocks.mk index a2a6a8c0a..d99c07afd 100644 --- a/src/import/chips/p9/procedures/hwp/cache/p9_hcd_l2_stopclocks.mk +++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_l2_stopclocks.mk @@ -24,5 +24,4 @@ # IBM_PROLOG_END_TAG PROCEDURE=p9_hcd_l2_stopclocks $(call ADD_MODULE_SRCDIR,$(PROCEDURE),$(ROOTPATH)/chips/p9/procedures/hwp/lib) -OBJS+=p9_hcd_l2_stopclocks.o $(call BUILD_PROCEDURE) diff --git a/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_stopclocks.C b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_stopclocks.C index d730e565d..4ced3eb62 100644 --- a/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_stopclocks.C +++ b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_stopclocks.C @@ -43,7 +43,15 @@ #include <p9_quad_scom_addresses.H> #include <p9_hcd_common.H> #include <p9_common_clk_ctrl_state.H> -#include "p9_hcd_core_stopclocks.H" +#include <p9_hcd_core_stopclocks.H> +#include <p9_hcd_cache_stopclocks.H> +#include <p9_eq_clear_atomic_lock.H> +#ifdef __PPE__ + #include <p9_sbe_ppe_utils.H> +#else + #include <p9_ppe_utils.H> +#endif +#include <p9_ppe_defs.H> //------------------------------------------------------------------------------ // Constant Definitions @@ -82,6 +90,9 @@ p9_hcd_core_stopclocks( auto l_perv = i_target.getParent<fapi2::TARGET_TYPE_PERV>(); auto l_chip = i_target.getParent<fapi2::TARGET_TYPE_PROC_CHIP>(); + auto l_ex_vector = l_quad.getChildren<fapi2::TARGET_TYPE_EX> + (fapi2::TARGET_STATE_FUNCTIONAL); + FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CHIP_EC_FEATURE_SDISN_SETUP, l_chip, l_attr_sdisn_setup)); @@ -132,8 +143,44 @@ p9_hcd_core_stopclocks( if (l_data64.getBit<4>() == 0 && l_temp64.getBit<4>() == 0) { - //halt cme(poll for halted, if timeout, print warnning keep going). +#ifdef DD2 + FAPI_DBG("Halting the PGPE ..."); + l_rc = ppe_halt(l_chip, PGPE_BASE_ADDRESS); + FAPI_ASSERT_NOEXIT(!l_rc, + fapi2::CORE_STOPCLKS_PGPE_HALT_TIMEOUT() + .set_CHIP(l_chip), + "PSTATE GPE Halt timeout"); + + FAPI_DBG("Halting the SGPE ..."); + l_rc = ppe_halt(l_chip, SGPE_BASE_ADDRESS); + FAPI_ASSERT_NOEXIT(!l_rc, + fapi2::CORE_STOPCLKS_SGPE_HALT_TIMEOUT() + .set_CHIP(l_chip), + "STOP GPE Halt timeout"); + + FAPI_DBG("Clear the atomic lock on EQ %d", l_attr_chip_unit_pos); + l_rc = p9_clear_atomic_lock(l_quad); + FAPI_ASSERT_NOEXIT(!l_rc, + fapi2::CORE_STOPCLKS_ATOMIC_LOCK_FAIL() + .set_EQ(l_quad), + "EQ Atomic Halt timeout"); + + for ( auto& ex : l_ex_vector ) + { + fapi2::ATTR_CHIP_UNIT_POS_Type l_cme_id = 0; + FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CHIP_UNIT_POS, ex, l_cme_id)); + + FAPI_DBG("Halting CME %d", l_cme_id ); + uint64_t l_cme_base_address = getCmeBaseAddress (l_cme_id); + l_rc = ppe_halt(l_chip, l_cme_base_address); + FAPI_ASSERT_NOEXIT(!l_rc, + fapi2::CACHE_STOPCLKS_CME_HALT_TIMEOUT() + .set_EX(ex), + "CME Halt timeout"); + } + +#endif FAPI_DBG("Assert Core-L2/CC Quiesces via CME_SCOM_SICR[6,8]/[7,9]"); FAPI_TRY(putScom(l_quad, (l_attr_chip_unit_pos < 2) ? diff --git a/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_stopclocks.mk b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_stopclocks.mk index 3578af488..0a0012ba0 100644 --- a/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_stopclocks.mk +++ b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_stopclocks.mk @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2016 +# Contributors Listed Below - COPYRIGHT 2016,2017 # [+] International Business Machines Corp. # # @@ -24,5 +24,9 @@ # IBM_PROLOG_END_TAG PROCEDURE=p9_hcd_core_stopclocks $(call ADD_MODULE_SRCDIR,$(PROCEDURE),$(ROOTPATH)/chips/p9/procedures/hwp/lib) -OBJS+=p9_hcd_core_stopclocks.o +$(call ADD_MODULE_SRCDIR,$(PROCEDURE),$(ROOTPATH)/chips/p9/procedures/hwp/cache) +$(call ADD_MODULE_SRCDIR,$(PROCEDURE),$(ROOTPATH)/chips/p9/procedures/hwp/ffdc) +lib$(PROCEDURE)_DEPLIBS=p9_hcd_cache_stopclocks +lib$(PROCEDURE)_DEPLIBS+=p9_ppe_utils +lib$(PROCEDURE)_DEPLIBS+=p9_eq_clear_atomic_lock $(call BUILD_PROCEDURE) diff --git a/src/import/chips/p9/procedures/hwp/lib/p9_ppe_utils.C b/src/import/chips/p9/procedures/hwp/lib/p9_ppe_utils.C index 8cbd018fa..42c6d1b17 100644 --- a/src/import/chips/p9/procedures/hwp/lib/p9_ppe_utils.C +++ b/src/import/chips/p9/procedures/hwp/lib/p9_ppe_utils.C @@ -28,10 +28,10 @@ /// /// *HWP HW Owner : Ashish More <ashish.more.@in.ibm.com> /// *HWP HW Backup Owner : Brian Vanderpool <vanderp@us.ibm.com> -/// *HWP FW Owner : Sangeetha T S <sangeet2@in.ibm.com> +/// *HWP FW Owner : Amit Tendolkar <amit.tendolkar@in.ibm.com> /// *HWP Team : PM -/// *HWP Level : 2 -/// *HWP Consumed by : SBE, Cronus +/// *HWP Level : 3 +/// *HWP Consumed by : Hostboot, FSP /// /// @verbatim /// @@ -43,12 +43,9 @@ #include <fapi2.H> #include <p9_ppe_utils.H> #include <p9_hcd_common.H> +#include <p9_misc_scom_addresses_fld.H> #include <map> - - - - //// Vector defining the special acceess egisters //const std::map<uint16_t, std::string> v_ppe_special_num_name = //{ @@ -198,13 +195,15 @@ fapi2::ReturnCode ppe_pollHaltState( { FAPI_TRY(getScom(i_target, i_base_address + PPE_XIRAMDBG, l_data64), "Error in GETSCOM"); } - while (! l_data64.getBit<0>() && + while (! l_data64.getBit<PU_PPE_XIRAMDBG_XSR_HS>() && --l_timeout_count != 0); - FAPI_ASSERT(l_data64.getBit<0>(), fapi2::P9_PPE_STATE_HALT_TIMEOUT_ERR(), - "PPE Halt Timeout"); - + FAPI_ASSERT ( l_data64.getBit<PU_PPE_XIRAMDBG_XSR_HS>(), + fapi2::PPE_STATE_HALT_TIMEOUT_ERR() + .set_TARGET(i_target) + .set_ADDRESS(i_base_address), + "PPE Halt Timeout" ); fapi_try_exit: return fapi2::current_err; @@ -218,12 +217,24 @@ fapi2::ReturnCode ppe_halt( { fapi2::buffer<uint64_t> l_data64; - FAPI_INF(" Send HALT command via XCR..."); - l_data64.flush<0>().insertFromRight(p9hcd::HALT, 1, 3); - - FAPI_TRY(putScom(i_target, i_base_address + PPE_XIXCR, l_data64), "Error in PUTSCOM in XCR to generate Halt condition"); + FAPI_TRY ( getScom ( i_target, + i_base_address + PPE_XIRAMDBG, + l_data64 ), + "Error reading PPE Halt State" ); - FAPI_TRY(ppe_pollHaltState(i_target, i_base_address)); + // Halt the PPE only if it is not already halted + if (! l_data64.getBit<PU_PPE_XIRAMDBG_XSR_HS>()) + { + FAPI_INF(" Send HALT command via XCR..."); + l_data64.flush<0>().insertFromRight(p9hcd::HALT, PU_PPE_XIXCR_XCR, + PU_PPE_XIXCR_XCR_LEN); + + FAPI_TRY ( putScom ( i_target, + i_base_address + PPE_XIXCR, + l_data64 ), + "Error in PUTSCOM in XCR to generate Halt condition" ); + FAPI_TRY(ppe_pollHaltState(i_target, i_base_address)); + } fapi_try_exit: return fapi2::current_err; @@ -236,13 +247,23 @@ fapi2::ReturnCode ppe_force_halt( { fapi2::buffer<uint64_t> l_data64; - FAPI_INF(" Send FORCE HALT command via XCR..."); - l_data64.flush<0>().insertFromRight(p9hcd::FORCE_HALT, 1, 3); + FAPI_TRY ( getScom ( i_target, + i_base_address + PPE_XIRAMDBG, + l_data64 ), + "Error reading PPE Halt State" ); - FAPI_TRY(putScom(i_target, i_base_address + PPE_XIXCR, l_data64), - "Error in PUTSCOM in XCR to generate Force Halt condition"); + // Force Halt PPE only is it is not already Halted + if (! l_data64.getBit<PU_PPE_XIRAMDBG_XSR_HS>()) + { + FAPI_INF(" Send FORCE HALT command via XCR..."); + l_data64.flush<0>().insertFromRight(p9hcd::FORCE_HALT, PU_PPE_XIXCR_XCR, + PU_PPE_XIXCR_XCR_LEN); - FAPI_TRY(ppe_pollHaltState(i_target, i_base_address)); + FAPI_TRY(putScom(i_target, i_base_address + PPE_XIXCR, l_data64), + "Error in PUTSCOM in XCR to generate Force Halt condition"); + + FAPI_TRY(ppe_pollHaltState(i_target, i_base_address)); + } fapi_try_exit: return fapi2::current_err; diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_hcd_cache_stopclocks_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_hcd_cache_stopclocks_errors.xml index 983f04ea9..470046cb9 100644 --- a/src/import/chips/p9/procedures/xml/error_info/p9_hcd_cache_stopclocks_errors.xml +++ b/src/import/chips/p9/procedures/xml/error_info/p9_hcd_cache_stopclocks_errors.xml @@ -140,4 +140,52 @@ </gard> </hwpError> <!-- ********************************************************************* --> + <hwpError> + <rc>RC_CACHE_STOPCLKS_PGPE_HALT_TIMEOUT</rc> + <description> + A timeout occured while waiting the PGPE to halt + </description> + <ffdc>CHIP</ffdc> + <callout> + <target>CHIP</target> + <priority>HIGH</priority> + </callout> + </hwpError> + <!-- ********************************************************************* --> + <hwpError> + <rc>RC_CACHE_STOPCLKS_SGPE_HALT_TIMEOUT</rc> + <description> + A timeout occured while waiting the SGPE to halt + </description> + <ffdc>CHIP</ffdc> + <callout> + <target>CHIP</target> + <priority>HIGH</priority> + </callout> + </hwpError> + <!-- ********************************************************************* --> + <hwpError> + <rc>RC_CACHE_STOPCLKS_ATOMIC_LOCK_FAIL</rc> + <description> + Failed attempt to clear the atomic lock to the cache chiplet + </description> + <ffdc>EQ</ffdc> + <callout> + <target>EQ</target> + <priority>HIGH</priority> + </callout> + </hwpError> + <!-- ********************************************************************* --> + <hwpError> + <rc>RC_CACHE_STOPCLKS_CME_HALT_TIMEOUT</rc> + <description> + A timeout occured while waiting a CME to halt + </description> + <ffdc>EX</ffdc> + <callout> + <target>EX</target> + <priority>HIGH</priority> + </callout> + </hwpError> + <!-- ********************************************************************* --> </hwpErrors> diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_hcd_core_stopclocks_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_hcd_core_stopclocks_errors.xml index 865f8c14a..c8f0adeb4 100644 --- a/src/import/chips/p9/procedures/xml/error_info/p9_hcd_core_stopclocks_errors.xml +++ b/src/import/chips/p9/procedures/xml/error_info/p9_hcd_core_stopclocks_errors.xml @@ -57,4 +57,52 @@ <ffdc>CORECPLTSTAT</ffdc> </hwpError> <!-- ********************************************************************* --> + <hwpError> + <rc>RC_CORE_STOPCLKS_PGPE_HALT_TIMEOUT</rc> + <description> + A timeout occured while waiting the PGPE to halt + </description> + <ffdc>CHIP</ffdc> + <callout> + <target>CHIP</target> + <priority>HIGH</priority> + </callout> + </hwpError> + <!-- ********************************************************************* --> + <hwpError> + <rc>RC_CORE_STOPCLKS_SGPE_HALT_TIMEOUT</rc> + <description> + A timeout occured while waiting the SGPE to halt + </description> + <ffdc>CHIP</ffdc> + <callout> + <target>CHIP</target> + <priority>HIGH</priority> + </callout> + </hwpError> + <!-- ********************************************************************* --> + <hwpError> + <rc>RC_CORE_STOPCLKS_ATOMIC_LOCK_FAIL</rc> + <description> + Failed attempt to clear the atomic lock to the cache chiplet + </description> + <ffdc>EQ</ffdc> + <callout> + <target>EQ</target> + <priority>HIGH</priority> + </callout> + </hwpError> + <!-- ********************************************************************* --> + <hwpError> + <rc>RC_CORE_STOPCLKS_CME_HALT_TIMEOUT</rc> + <description> + A timeout occured while waiting a CME to halt + </description> + <ffdc>EX</ffdc> + <callout> + <target>EX</target> + <priority>HIGH</priority> + </callout> + </hwpError> + <!-- ********************************************************************* --> </hwpErrors> diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_ppe_state_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_ppe_state_errors.xml index d9f0a9d85..43e6c24a8 100755 --- a/src/import/chips/p9/procedures/xml/error_info/p9_ppe_state_errors.xml +++ b/src/import/chips/p9/procedures/xml/error_info/p9_ppe_state_errors.xml @@ -26,12 +26,14 @@ <hwpErrors> <!-- ******************************************************************** --> <hwpError> - <rc>RC_P9_PPE_STATE_HALT_TIMEOUT_ERR</rc> + <rc>RC_PPE_STATE_HALT_TIMEOUT_ERR</rc> <description> - Procedure: p9_ppe_state - HALT Timedout. + A HALT operation to a PPE timed out. This is indicative of hardware error. </description> <ffdc>TARGET</ffdc> + <ffdc>ADDRESS</ffdc> </hwpError> + <!-- Note: callout/deconfiguration is left to the caller as this depends --> + <!-- on the scope of the PPE instance --> <!-- ******************************************************************** --> </hwpErrors> diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_sbe_ppe_utils.xml b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_ppe_utils.xml index 1de7bd402..29a6bc1c1 100755 --- a/src/import/chips/p9/procedures/xml/error_info/p9_sbe_ppe_utils.xml +++ b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_ppe_utils.xml @@ -28,8 +28,12 @@ <sbeError/> <rc>RC_SBE_PPE_UTILS_HALT_TIMEOUT_ERR</rc> <description> - PPE Halt timed out + A HALT operation to a PPE timed out. This is indicative of hardware error. </description> + <ffdc>TARGET</ffdc> + <ffdc>ADDRESS</ffdc> </hwpError> + <!-- Note: callout/deconfiguration is left to the caller as this depends --> + <!-- on the scope of the PPE instance --> <!-- ******************************************************************** --> </hwpErrors> |