diff options
author | Prem Shanker Jha <premjha2@in.ibm.com> | 2017-10-04 04:25:20 -0500 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-12-11 17:59:13 -0500 |
commit | 45824ede1fc0942802fb11589514bb8739a15e1d (patch) | |
tree | ddd6122295b48aa2c14ac391c5e167d0f0958be3 /src | |
parent | a4dc66b8d1c6ef5d2f0c697f56a4797826a364dd (diff) | |
download | talos-hostboot-45824ede1fc0942802fb11589514bb8739a15e1d.tar.gz talos-hostboot-45824ede1fc0942802fb11589514bb8739a15e1d.zip |
STOP Recovery: Only XIR collection in HWP error path during PM Reset.
CQ: SW406487
Change-Id: I97a0309261c4d3f257ade2b70d952be253dc8f65
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/47124
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>
Reviewed-by: RANGANATHPRASAD G. BRAHMASAMUDRA <prasadbgr@in.ibm.com>
Reviewed-by: AMIT J. TENDOLKAR <amit.tendolkar@in.ibm.com>
Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/47130
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/import/chips/p9/procedures/hwp/ffdc/p9_collect_ppe_state.C | 15 | ||||
-rw-r--r-- | src/import/chips/p9/procedures/xml/attribute_info/pm_hwp_attributes.xml | 14 |
2 files changed, 28 insertions, 1 deletions
diff --git a/src/import/chips/p9/procedures/hwp/ffdc/p9_collect_ppe_state.C b/src/import/chips/p9/procedures/hwp/ffdc/p9_collect_ppe_state.C index fde990ae2..e62aa5e8f 100644 --- a/src/import/chips/p9/procedures/hwp/ffdc/p9_collect_ppe_state.C +++ b/src/import/chips/p9/procedures/hwp/ffdc/p9_collect_ppe_state.C @@ -53,6 +53,7 @@ extern "C" fapi2::ffdc_t PPE_REG_NR; fapi2::ffdc_t PPE_REG_VAL; + fapi2::ATTR_INITIATED_PM_RESET_Type l_pm_reset_active; fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP> l_proc_chip = *(reinterpret_cast<const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP> *> @@ -62,7 +63,19 @@ extern "C" *(reinterpret_cast<const std::vector<uint64_t>*> (i_v_ppe_addresses.ptr())); - const PPE_DUMP_MODE l_mode = *(reinterpret_cast<const PPE_DUMP_MODE*>(i_mode.ptr())); + PPE_DUMP_MODE l_mode = *(reinterpret_cast<const PPE_DUMP_MODE*>(i_mode.ptr())); + + // if call to this HWP is in PM Reset flow then just collect XIRs. + // Full PPE state will be collected as a part of PM Recovery in + // later part of PM reset flow. + FAPI_ATTR_GET(fapi2::ATTR_INITIATED_PM_RESET, + l_proc_chip, + l_pm_reset_active); + + if( fapi2::ENUM_ATTR_INITIATED_PM_RESET_ACTIVE == l_pm_reset_active ) + { + l_mode = XIRS; + } std::vector<PPERegValue_t> l_v_sprs; std::vector<PPERegValue_t> l_v_xirs; diff --git a/src/import/chips/p9/procedures/xml/attribute_info/pm_hwp_attributes.xml b/src/import/chips/p9/procedures/xml/attribute_info/pm_hwp_attributes.xml index 83dc524bb..9e5e2f7b6 100644 --- a/src/import/chips/p9/procedures/xml/attribute_info/pm_hwp_attributes.xml +++ b/src/import/chips/p9/procedures/xml/attribute_info/pm_hwp_attributes.xml @@ -518,4 +518,18 @@ <initToZero/> </attribute> <!-- ********************************************************************* --> + <attribute> + <id>ATTR_INITIATED_PM_RESET</id> + <targetType>TARGET_TYPE_PROC_CHIP</targetType> + <description> + Attribute is set by platform before initiating PM reset. + It act as a signal for FFDC collection utility to behave + differently during PM reset flow. + </description> + <valueType>uint8</valueType> + <enum>INACTIVE = 0x00, ACTIVE = 0x01</enum> + <writeable/> + <initToZero/> + </attribute> + <!-- ********************************************************************* --> </attributes> |