Extend PM Reset flow to collect PM FFDC to HOMER

- extend the base flow to ensure ffdc gets collected to homer
- revise error xmls
- misc changes to handle pm recovery flow triggered via Malf Alert

Key_Cronus_Test=PM_REGRESS

Change-Id: I12148ed227efe4613332ae76ff142c1d82855f20
RTC: 153979
CQ: SW416537
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/53522
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: RANGANATHPRASAD G. BRAHMASAMUDRA <prasadbgr@in.ibm.com>
Reviewed-by: Prem Shanker Jha <premjha2@in.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: Gregory S. Still <stillgs@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/53532
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>

2 files changed, 51 insertions, 2 deletions

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 10a0b38b..a2702aac 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
@@ -5,7 +5,7 @@
 <!--                                                                        -->
 <!-- OpenPOWER sbe Project                                                  -->
 <!--                                                                        -->
-<!-- Contributors Listed Below - COPYRIGHT 2017                             -->
+<!-- Contributors Listed Below - COPYRIGHT 2017,2018                        -->
 <!-- [+] International Business Machines Corp.                              -->
 <!--                                                                        -->
 <!--                                                                        -->
@@ -518,7 +518,7 @@
     <id>ATTR_INITIATED_PM_RESET</id>
     <targetType>TARGET_TYPE_PROC_CHIP</targetType>
     <description>
-    Attribute is set by platform before initiating PM reset.
+    Attribute is set at the start of PM reset and reset at the end.
     It act as a signal for FFDC collection utility to behave
     differently during PM reset flow.
     </description>
@@ -528,4 +528,18 @@
     <initToZero/>
   </attribute>
   <!-- ********************************************************************* -->
+  <attribute>
+    <id>ATTR_PM_RESET_PHASE</id>
+    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+    <description>
+    Attribute to indicate the progress in the PM Complex Reset flow.
+
+    Producer: p9_pm_reset.C
+    Consumers: p9_pm_reset.C p9_pm_recovery_ffdc_*.C
+    </description>
+    <valueType>uint8</valueType>
+    <initToZero/>
+    <writeable/>
+  </attribute>
+  <!-- ********************************************************************* -->
 </attributes>
diff --git a/src/import/chips/p9/procedures/xml/attribute_info/pm_plat_attributes.xml b/src/import/chips/p9/procedures/xml/attribute_info/pm_plat_attributes.xml
index 9f640199..55693b5d 100644
--- a/src/import/chips/p9/procedures/xml/attribute_info/pm_plat_attributes.xml
+++ b/src/import/chips/p9/procedures/xml/attribute_info/pm_plat_attributes.xml
@@ -2213,4 +2213,39 @@
     <default>NO_FALLBACK</default>
   </attribute>
   <!-- ********************************************************************* -->
+  <attribute>
+    <id>ATTR_PM_MALF_ALERT_ENABLE</id>
+    <targetType>TARGET_TYPE_SYSTEM</targetType>
+    <description>
+    Switch to enable or disable Power Management Malfunction Alert Handling
+    based on the platform support. e.g. True for PHYP based systems and False
+    for KVM based systems depending on support available.
+
+    Producer: Initialized by Hostboot firmware based on platform support
+    Consumers: Read by p9_pm_reset.C p9_pm_stop_gpe_init.C
+    </description>
+    <valueType>uint8</valueType>
+    <enum>FALSE = 0x00, TRUE = 0x01</enum>
+    <platInit/>
+    <default>FALSE</default>
+  </attribute>
+  <!-- ********************************************************************* -->
+  <attribute>
+    <id>ATTR_PM_RESET_FFDC_ENABLE</id>
+    <targetType>TARGET_TYPE_SYSTEM</targetType>
+    <description>
+    Switch to enable or disable Power Management Complex FFDC collection to HOMER.
+    When set, the PM Complex Reset flow will collect PM Complex data to the chip
+    HOMER region to assist with failure analysis and recovery.
+
+    Producer: HB must set or reset this based on the platform use-case and state.
+    Consumer: p9_pm_reset.C, p9_pm_callout.C
+    </description>
+    <valueType>uint8</valueType>
+    <enum>FALSE = 0x00, TRUE = 0x01</enum>
+    <writeable/>
+    <platInit/>
+    <default>FALSE</default>
+  </attribute>
+  <!-- ********************************************************************* -->
 </attributes>