Register data collection in FFDC

 - Add PBA registers to FFDC collected on PBA init/reset fails
 - Add XISIB register collection as part of CME FFDC
 - Enable the callout/register ffdc collection for the target used

Change-Id: I76d0e63d3e0f838f2b1e905b4a736bccaa8457e7
RTC: 168127
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/37996
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Brian T. Vanderpool <vanderp@us.ibm.com>
Reviewed-by: AMIT KUMAR <akumar3@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38002
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

9 files changed, 141 insertions, 93 deletions

diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_pm_pba_init.C b/src/import/chips/p9/procedures/hwp/pm/p9_pm_pba_init.C
index 54edadffc..6c1f43539 100644
--- a/src/import/chips/p9/procedures/hwp/pm/p9_pm_pba_init.C
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_pba_init.C
@@ -491,7 +491,8 @@ fapi2::ReturnCode pba_slave_reset(
             FAPI_ASSERT(false, fapi2::P9_PMPROC_PBA_SLAVE_RESET_TIMEOUT()
                         .set_POLLCOUNT(l_pollCount)
                         .set_SLAVENUM(sl)
-                        .set_PBASLVREG(l_BUFFCONT),
+                        .set_PBASLVREG(l_BUFFCONT)
+                        .set_CHIP(i_target),
                         "PBA Slave Reset Timout");
         }
 
@@ -503,7 +504,8 @@ fapi2::ReturnCode pba_slave_reset(
             FAPI_ASSERT(false, fapi2::P9_PMPROC_PBA_SLAVE_BUSY_AFTER_RESET()
                         .set_POLLCOUNT(l_pollCount)
                         .set_SLAVENUM(sl)
-                        .set_PBASLVREG( l_BUFFCONT),
+                        .set_PBASLVREG( l_BUFFCONT)
+                        .set_CHIP(i_target),
                         "Slave 0x%x still busy after reset", sl);
         }
     }
@@ -851,7 +853,8 @@ fapi2::ReturnCode pba_bc_stop(
     {
         FAPI_ASSERT(false, fapi2::P9_PROCPM_PBA_BCDE_STOP_TIMEOUT()
                     .set_POLLCOUNT( p9pba::MAX_PBA_BC_STOP_POLLS)
-                    .set_POLLVALUE(p9pba::MAX_PBA_BC_STOP_POLLS),
+                    .set_POLLVALUE(p9pba::MAX_PBA_BC_STOP_POLLS)
+                    .set_CHIP(i_target),
                     "PBA BCDE Stop Timeout");
     }
 
@@ -860,7 +863,8 @@ fapi2::ReturnCode pba_bc_stop(
     {
         FAPI_ASSERT(false, fapi2::P9_PROCPM_PBA_BCUE_STOP_TIMEOUT()
                     .set_POLLCOUNT( p9pba::MAX_PBA_BC_STOP_POLLS)
-                    .set_POLLVALUE( p9pba::MAX_PBA_BC_STOP_POLLS),
+                    .set_POLLVALUE( p9pba::MAX_PBA_BC_STOP_POLLS)
+                    .set_CHIP(i_target),
                     "PBA BCUE Stop Timeout");
     }
 
diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_pm_pss_init.C b/src/import/chips/p9/procedures/hwp/pm/p9_pm_pss_init.C
index b59f0a255..4f5f9f505 100755
--- a/src/import/chips/p9/procedures/hwp/pm/p9_pm_pss_init.C
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_pss_init.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2015,2016                        */
+/* Contributors Listed Below - COPYRIGHT 2015,2017                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -318,7 +318,8 @@ fapi2::ReturnCode pm_pss_reset(
 
         // ADC error
         FAPI_ASSERT(l_data64.getBit<7>() != 1,
-                    fapi2::PM_PSS_ADC_ERROR(),
+                    fapi2::PM_PSS_ADC_ERROR()
+                    .set_CHIP(i_target),
                     "Error while sending the frames from ADC to APSS device");
 
         FAPI_DBG("Delay before next poll");
@@ -359,7 +360,8 @@ fapi2::ReturnCode pm_pss_reset(
 
         // P2S error
         FAPI_ASSERT(l_data64.getBit<7>() != 1,
-                    fapi2::PM_PSS_P2S_ERROR(),
+                    fapi2::PM_PSS_P2S_ERROR()
+                    .set_CHIP(i_target),
                     "Error while sending the frames from P2S to APSS device");
 
         FAPI_DBG("Delay before next poll");
diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_pm_pstate_gpe_init.C b/src/import/chips/p9/procedures/hwp/pm/p9_pm_pstate_gpe_init.C
index 58d194c94..966811804 100644
--- a/src/import/chips/p9/procedures/hwp/pm/p9_pm_pstate_gpe_init.C
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_pstate_gpe_init.C
@@ -132,7 +132,8 @@ fapi2::ReturnCode pstate_gpe_init(
     FAPI_ASSERT(!((l_xsr.getBit<p9hcd::HALTED_STATE>() == 1) &&
                   ((l_xsr_halt_condition == p9hcd::DEBUG_HALT ||
                     l_xsr_halt_condition == p9hcd::DBCR_HALT)   )),
-                fapi2::PSTATE_GPE_INIT_DEBUG_HALT(),
+                fapi2::PSTATE_GPE_INIT_DEBUG_HALT()
+                .set_CHIP(i_target),
                 "Pstate GPE Debug Halt detected");
 
     // @todo 146665 Need to collect PGPE state. Operations to PPEs should
@@ -142,7 +143,8 @@ fapi2::ReturnCode pstate_gpe_init(
     FAPI_ASSERT((l_timeout_counter != 0 &&
                  l_occ_scratch2.getBit<p9hcd::PGPE_ACTIVE>() == 1 &&
                  l_xsr.getBit<p9hcd::HALTED_STATE>() != 1),
-                fapi2::PSTATE_GPE_INIT_TIMEOUT(),
+                fapi2::PSTATE_GPE_INIT_TIMEOUT()
+                .set_CHIP(i_target),
                 "Pstate GPE Init timeout");
 
     if(( 1 == l_occ_scratch2.getBit<p9hcd::PGPE_ACTIVE>() ))
@@ -200,7 +202,8 @@ fapi2::ReturnCode pstate_gpe_reset(
 
     // When PGPE fails to halt, then assert ot
     FAPI_ASSERT((l_timeout_in_MS != 0),
-                fapi2::PSTATE_GPE_RESET_TIMEOUT(),
+                fapi2::PSTATE_GPE_RESET_TIMEOUT()
+                .set_CHIP(i_target),
                 "PSTATE GPE Init timeout");
 
     FAPI_TRY(getScom(i_target, PU_OCB_OCI_OCCS2_SCOM, l_data64));
@@ -240,7 +243,7 @@ fapi2::ReturnCode p9_pm_pstate_gpe_init(
 
         FAPI_ASSERT(fapi2::current_err == fapi2::FAPI2_RC_SUCCESS,
                     fapi2::PSTATE_GPE_PBA_INIT_FAILED()
-                    .set_TARGET(i_target)
+                    .set_CHIP(i_target)
                     .set_MODE(p9pm::PM_INIT),
                     "PBA setup failed");
     }
diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_pm_stop_gpe_init.C b/src/import/chips/p9/procedures/hwp/pm/p9_pm_stop_gpe_init.C
index 38b5868ea..cca29d407 100644
--- a/src/import/chips/p9/procedures/hwp/pm/p9_pm_stop_gpe_init.C
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_stop_gpe_init.C
@@ -168,8 +168,8 @@ fapi2::ReturnCode p9_pm_stop_gpe_init(
 
         FAPI_ASSERT(fapi2::current_err == fapi2::FAPI2_RC_SUCCESS,
                     fapi2::STOP_GPE_PFETS_FAILED()
-                    .set_TARGET(i_target)
-                    .set_MODE(i_mode),
+                    .set_MODE(i_mode)
+                    .set_CHIP(i_target),
                     "PFET setup failed");
 
 
@@ -178,7 +178,7 @@ fapi2::ReturnCode p9_pm_stop_gpe_init(
 
         FAPI_ASSERT(fapi2::current_err == fapi2::FAPI2_RC_SUCCESS,
                     fapi2::STOP_GPE_PBA_INIT_FAILED()
-                    .set_TARGET(i_target)
+                    .set_CHIP(i_target)
                     .set_MODE(p9pm::PM_RESET),
                     "PBA setup failed");
 
diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_pm_pba_init_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_pm_pba_init_errors.xml
index ff3b7b4de..93f2d6d98 100644
--- a/src/import/chips/p9/procedures/xml/error_info/p9_pm_pba_init_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_pm_pba_init_errors.xml
@@ -5,7 +5,7 @@
 <!--                                                                        -->
 <!-- OpenPOWER HostBoot Project                                             -->
 <!--                                                                        -->
-<!-- Contributors Listed Below - COPYRIGHT 2016                             -->
+<!-- Contributors Listed Below - COPYRIGHT 2016,2017                        -->
 <!-- [+] International Business Machines Corp.                              -->
 <!--                                                                        -->
 <!--                                                                        -->
@@ -24,35 +24,6 @@
 <!-- IBM_PROLOG_END_TAG                                                     -->
 <!-- Error definitions for p9_pm_pba_init procedure -->
 <hwpErrors>
-  <registerFfdc>
-    <id>REG_FFDC_PROC_PBA_REGISTERS</id>
-    <scomRegister>PU_PBAMODE_OCI</scomRegister>
-    <scomRegister>PU_PBACFG</scomRegister>
-    <scomRegister>PU_PBASLVCTL0_OCI</scomRegister>
-    <scomRegister>PU_PBASLVCTL1_OCI</scomRegister>
-    <scomRegister>PU_PBASLVCTL2_OCI</scomRegister>
-    <scomRegister>PU_PBASLVCTL3_OCI</scomRegister>
-    <scomRegister>PU_PBAFIR</scomRegister>
-    <scomRegister>PU_PBAERRRPT0</scomRegister>
-    <scomRegister>PU_PBAERRRPT1</scomRegister>
-    <scomRegister>PU_PBAERRRPT2</scomRegister>
-    <scomRegister>PU_BCDE_CTL_OCI</scomRegister>
-    <scomRegister>PU_BCDE_SET_OCI</scomRegister>
-    <scomRegister>PU_BCDE_STAT_OCI</scomRegister>
-    <scomRegister>PU_BCDE_PBADR_OCI</scomRegister>
-    <scomRegister>PU_BCDE_OCIBAR_OCI</scomRegister>
-    <scomRegister>PU_BCUE_CTL_OCI</scomRegister>
-    <scomRegister>PU_BCUE_SET_OCI</scomRegister>
-    <scomRegister>PU_BCUE_STAT_OCI</scomRegister>
-    <scomRegister>PU_BCUE_PBADR_OCI</scomRegister>
-    <scomRegister>PU_BCUE_OCIBAR_OCI</scomRegister>
-    <scomRegister>PU_PBAXSHBR0_OCI</scomRegister>
-    <scomRegister>PU_PBAXSHCS0_OCI</scomRegister>
-    <scomRegister>PU_PBAXSHBR1_OCI</scomRegister>
-    <scomRegister>PU_PBAXSHCS1_OCI</scomRegister>
-    <scomRegister>PU_PBAXCFG_OCI</scomRegister>
-    <scomRegister>PU_PBASLVRST_OCI</scomRegister>
-  </registerFfdc>
   <!-- *********************************************************************-->
   <hwpError>
     <rc>RC_P9_PMPROC_PBA_INIT_INCORRECT_MODE</rc>
@@ -73,7 +44,7 @@
     <ffdc>SLAVENUM</ffdc>
     <ffdc>PBASLVREG</ffdc>
     <collectRegisterFfdc>
-      <id>REG_FFDC_PROC_PBA_REGISTERS</id>
+      <id>PBA_FFDC_REGISTERS</id>
       <target>CHIP</target>
       <targetType>TARGET_TYPE_PROC_CHIP</targetType>
     </collectRegisterFfdc>
@@ -91,7 +62,7 @@
     <ffdc>SLAVENUM</ffdc>
     <ffdc>PBASLVREG</ffdc>
     <collectRegisterFfdc>
-      <id>REG_FFDC_PROC_PBA_REGISTERS</id>
+      <id>PBA_FFDC_REGISTERS</id>
       <target>CHIP</target>
       <targetType>TARGET_TYPE_PROC_CHIP</targetType>
     </collectRegisterFfdc>
@@ -109,7 +80,7 @@
     <ffdc>POLLCOUNT</ffdc>
     <ffdc>POLLVALUE</ffdc>
     <collectRegisterFfdc>
-      <id>REG_FFDC_PROC_PBA_REGISTERS</id>
+      <id>PBA_FFDC_REGISTERS</id>
       <target>CHIP</target>
       <targetType>TARGET_TYPE_PROC_CHIP</targetType>
     </collectRegisterFfdc>
@@ -127,7 +98,7 @@
     <ffdc>POLLCOUNT</ffdc>
     <ffdc>POLLVALUE</ffdc>
     <collectRegisterFfdc>
-      <id>REG_FFDC_PROC_PBA_REGISTERS</id>
+      <id>PBA_FFDC_REGISTERS</id>
       <target>CHIP</target>
       <targetType>TARGET_TYPE_PROC_CHIP</targetType>
     </collectRegisterFfdc>
diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_pm_pss_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_pm_pss_errors.xml
index 2516a849e..4e9e3e42d 100644
--- a/src/import/chips/p9/procedures/xml/error_info/p9_pm_pss_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_pm_pss_errors.xml
@@ -5,7 +5,7 @@
 <!--                                                                        -->
 <!-- OpenPOWER HostBoot Project                                             -->
 <!--                                                                        -->
-<!-- Contributors Listed Below - COPYRIGHT 2015,2016                        -->
+<!-- Contributors Listed Below - COPYRIGHT 2015,2017                        -->
 <!-- [+] International Business Machines Corp.                              -->
 <!--                                                                        -->
 <!--                                                                        -->
@@ -25,34 +25,11 @@
 <!-- Error definitions for p9_pm_pss_init procedure -->
 <hwpErrors>
   <!-- *********************************************************************** -->
-  <registerFfdc>
-    <id>REG_FFDC_PM_PSS_REGISTERS</id>
-    <scomRegister>PU_SPIPSS_ADC_CTRL_REG1</scomRegister>
-    <scomRegister>PU_SPIPSS_ADC_CTRL_REG2</scomRegister>
-    <scomRegister>PU_SPIPSS_ADC_STATUS_REG</scomRegister>
-    <scomRegister>PU_SPIPSS_ADC_CMD_REG</scomRegister>
-    <scomRegister>PU_SPIPSS_ADC_RESET_REGISTER</scomRegister>
-    <scomRegister>PU_SPIPSS_ADC_WDATA_REG</scomRegister>
-    <scomRegister>PU_SPIPSS_ADC_RDATA_REG0</scomRegister>
-    <scomRegister>PU_SPIPSS_ADC_RDATA_REG1</scomRegister>
-    <scomRegister>PU_SPIPSS_ADC_RDATA_REG2</scomRegister>
-    <scomRegister>PU_SPIPSS_ADC_RDATA_REG3</scomRegister>
-    <scomRegister>PU_SPIPSS_100NS_REG</scomRegister>
-    <scomRegister>PU_SPIPSS_P2S_CTRL_REG0</scomRegister>
-    <scomRegister>PU_SPIPSS_P2S_CTRL_REG1</scomRegister>
-    <scomRegister>PU_SPIPSS_P2S_CTRL_REG2</scomRegister>
-    <scomRegister>PU_SPIPSS_P2S_STATUS_REG</scomRegister>
-    <scomRegister>PU_SPIPSS_P2S_COMMAND_REG</scomRegister>
-    <scomRegister>PU_SPIPSS_P2S_RESET_REGISTER</scomRegister>
-    <scomRegister>PU_SPIPSS_P2S_WDATA_REG</scomRegister>
-    <scomRegister>PU_SPIPSS_P2S_RDATA_REG</scomRegister>
-  </registerFfdc>
-  <!-- *********************************************************************** -->
   <hwpError>
     <rc>RC_PM_PSS_ADC_ERROR</rc>
     <description>SPIADC error bit asserted waiting for operation to complete.</description>
     <collectRegisterFfdc>
-      <id>REG_FFDC_PM_PSS_REGISTERS</id>
+      <id>PSS_FFDC_REGISTERS</id>
       <target>CHIP</target>
       <targetType>TARGET_TYPE_PROC_CHIP</targetType>
     </collectRegisterFfdc>
@@ -66,7 +43,7 @@
     <rc>RC_PM_PSS_P2S_ERROR</rc>
     <description>SPIP2S error bit asserted waiting for operation to complete.</description>
     <collectRegisterFfdc>
-      <id>REG_FFDC_PM_PSS_REGISTERS</id>
+      <id>PSS_FFDC_REGISTERS</id>
       <target>CHIP</target>
       <targetType>TARGET_TYPE_PROC_CHIP</targetType>
     </collectRegisterFfdc>
diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_pm_pstate_gpe_init_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_pm_pstate_gpe_init_errors.xml
index 353433f0f..d3ec0dae7 100644
--- a/src/import/chips/p9/procedures/xml/error_info/p9_pm_pstate_gpe_init_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_pm_pstate_gpe_init_errors.xml
@@ -26,14 +26,6 @@
 <!-- Error definitions for p9_pm_pstate_gpe_init procedure -->
 <hwpErrors>
   <!-- ******************************************************************** -->
-  <registerFfdc>
-    <id>ERROR_STATUS_OF_PGPE</id>
-    <scomRegister>PU_OCB_OCI_OCCS2_SCOM</scomRegister>
-    <scomRegister>PU_GPE2_GPEXIXSR_SCOM</scomRegister>
-    <scomRegister>PU_GPE2_GPEXIIAR_SCOM</scomRegister>
-    <scomRegister>PU_GPE2_GPEXIIR_SCOM</scomRegister>
-  </registerFfdc>
-  <!-- ******************************************************************** -->
   <hwpError>
     <rc>RC_PSTATE_GPE_BAD_MODE</rc>
     <description>Unknown mode passed to p9_pm_pstate_gpe_init.
@@ -51,11 +43,15 @@
     SCRATCH2.
     </description>
     <collectRegisterFfdc>
-      <id>ERROR_STATUS_OF_PGPE</id>
+      <id>PGPE_FFDC_REGISTERS</id>
       <target>CHIP</target>
       <targetType>TARGET_TYPE_PROC_CHIP</targetType>
     </collectRegisterFfdc>
     <callout>
+      <target>CHIP</target>
+      <priority>LOW</priority>
+    </callout>
+    <callout>
       <procedure>CODE</procedure>
       <priority>HIGH</priority>
     </callout>
@@ -67,14 +63,18 @@
     assert in a development debug environment.
     </description>
     <collectRegisterFfdc>
-      <id>ERROR_STATUS_OF_PGPE</id>
+      <id>PGPE_FFDC_REGISTERS</id>
       <target>CHIP</target>
       <targetType>TARGET_TYPE_PROC_CHIP</targetType>
     </collectRegisterFfdc>
     <callout>
+      <target>CHIP</target>
+      <priority>LOW</priority>
+    </callout>
+    <callout>
       <procedure>CODE</procedure>
       <priority>HIGH</priority>
-    </callout>
+    </callout>	
   </hwpError>
   <!-- ******************************************************************** -->
   <hwpError>
@@ -82,7 +82,7 @@
     <description> Pstate GPE init timed out while waiting for HALT status in XSR register.
     </description>
     <collectRegisterFfdc>
-      <id>ERROR_STATUS_OF_PGPE</id>
+      <id>PGPE_FFDC_REGISTERS</id>
       <target>CHIP</target>
       <targetType>TARGET_TYPE_PROC_CHIP</targetType>
     </collectRegisterFfdc>
@@ -91,7 +91,7 @@
       <priority>LOW</priority>
     </callout>
     <callout>
-      <target>TARGET</target>
+      <target>CHIP</target>
       <priority>HIGH</priority>
     </callout>
   </hwpError>
@@ -100,7 +100,6 @@
     <rc>RC_PSTATE_GPE_PBA_INIT_FAILED</rc>
     <description> Pstate GPE called to p9_pm_pba_init failed.
     </description>
-    <!-- @todo RTC 168127 Create a PBA collectRegister Ffdc element to call -->
     <ffdc>TARGET</ffdc>
     <ffdc>MODE</ffdc>
     <callout>
@@ -108,9 +107,14 @@
       <priority>LOW</priority>
     </callout>
     <callout>
-      <target>TARGET</target>
+      <target>CHIP</target>
       <priority>HIGH</priority>
     </callout>
+    <collectRegisterFfdc>
+      <id>PBA_FFDC_REGISTERS</id>
+      <target>CHIP</target>
+      <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+    </collectRegisterFfdc>
   </hwpError>
   <!-- ******************************************************************** -->
 </hwpErrors>
diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_pm_registers.xml b/src/import/chips/p9/procedures/xml/error_info/p9_pm_registers.xml
index ba0611cd6..cb635129c 100644
--- a/src/import/chips/p9/procedures/xml/error_info/p9_pm_registers.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_pm_registers.xml
@@ -5,7 +5,7 @@
 <!--                                                                        -->
 <!-- OpenPOWER HostBoot Project                                             -->
 <!--                                                                        -->
-<!-- Contributors Listed Below - COPYRIGHT 2016                             -->
+<!-- Contributors Listed Below - COPYRIGHT 2016,2017                        -->
 <!-- [+] International Business Machines Corp.                              -->
 <!--                                                                        -->
 <!--                                                                        -->
@@ -27,7 +27,6 @@
 <hwpErrors>
   <!-- *********************************************************************** -->
   <registerFfdc>
-    <!--TODO: RTC 163970: Add the register GPE[n] XISIB to FFDC -->
     <id>CME_FFDC_REGISTERS</id>
     <scomRegister>EX_PPE_XIRAMDBG</scomRegister>
     <scomRegister>EX_CME_LCL_EISR_SCOM</scomRegister>
@@ -59,6 +58,7 @@
     <scomRegister>EX_CME_SCOM_LFIRMASK</scomRegister>
     <scomRegister>EX_CME_SCOM_SRTCH0_SCOM</scomRegister>
     <scomRegister>EX_CME_SCOM_SRTCH1_SCOM</scomRegister>
+    <scomRegister>EX_CME_SCOM_XISIB</scomRegister>
   </registerFfdc>
   <!-- *********************************************************************** -->
   <registerFfdc>
@@ -100,4 +100,78 @@
     <scomRegister>PU_GPE1_MIB_XIDCAC_SCOM</scomRegister>
   </registerFfdc>
   <!-- ******************************************************************** -->
+  <registerFfdc>
+    <id>PGPE_FFDC_REGISTERS</id>
+    <scomRegister>PU_OCB_OCI_OCCS2_SCOM</scomRegister>
+    <scomRegister>PU_GPE2_GPEXIXSR_SCOM</scomRegister>
+    <scomRegister>PU_GPE2_GPEXIIAR_SCOM</scomRegister>
+    <scomRegister>PU_GPE2_GPEXIIR_SCOM</scomRegister>
+  </registerFfdc>
+  <!-- ******************************************************************** -->
+  <registerFfdc>
+    <id>PBA_FFDC_REGISTERS</id>
+    <scomRegister>PU_PBAXCFG_SCOM</scomRegister>
+    <scomRegister>PU_BCUE_STAT_SCOM</scomRegister>
+    <scomRegister>PU_BCUE_PBADR_SCOM</scomRegister>
+    <scomRegister>PU_BCUE_OCIBAR_SCOM</scomRegister>
+    <scomRegister>PU_BCDE_PBADR_SCOM</scomRegister>
+    <scomRegister>PU_BCDE_OCIBAR_SCOM</scomRegister>
+    <scomRegister>PU_BCDE_STAT_SCOM</scomRegister>
+    <scomRegister>PU_PBASLVCTL0_SCOM</scomRegister>
+    <scomRegister>PU_PBASLVCTL1_SCOM</scomRegister>
+    <scomRegister>PU_PBASLVCTL2_SCOM</scomRegister>
+    <scomRegister>PU_PBASLVCTL3_SCOM</scomRegister>
+    <scomRegister>PU_PBASLVRST_SCOM</scomRegister>
+    <scomRegister>PU_PBAMODE_SCOM</scomRegister>
+    <scomRegister>PU_PBAFIR</scomRegister>
+    <scomRegister>PU_PBAFIRACT0</scomRegister>
+    <scomRegister>PU_PBAFIRACT1</scomRegister>
+    <scomRegister>PU_PBAFIRMASK</scomRegister>
+    <scomRegister>PU_PBACFG</scomRegister>
+    <scomRegister>PU_PBAERRRPT0</scomRegister>
+    <scomRegister>PU_PBAERRRPT1</scomRegister>
+    <scomRegister>PU_PBAERRRPT2</scomRegister>
+    <scomRegister>PU_PBARBUFVAL0</scomRegister>
+    <scomRegister>PU_PBARBUFVAL1</scomRegister>
+    <scomRegister>PU_PBARBUFVAL2</scomRegister>
+    <scomRegister>PU_PBARBUFVAL3</scomRegister>
+    <scomRegister>PU_PBARBUFVAL4</scomRegister>
+    <scomRegister>PU_PBARBUFVAL5</scomRegister>
+    <scomRegister>PU_PBARBUFVAL1</scomRegister>
+    <scomRegister>PU_PBARBUFVAL2</scomRegister>
+    <scomRegister>PU_PBARBUFVAL3</scomRegister>
+    <scomRegister>PU_PBARBUFVAL4</scomRegister>
+    <scomRegister>PU_PBARBUFVAL5</scomRegister>
+    <scomRegister>PU_PBABAR0</scomRegister>
+    <scomRegister>PU_PBABAR1</scomRegister>
+    <scomRegister>PU_PBABAR2</scomRegister>
+    <scomRegister>PU_PBABAR3</scomRegister>
+    <scomRegister>PU_PBABARMSK0</scomRegister>
+    <scomRegister>PU_PBABARMSK1</scomRegister>
+    <scomRegister>PU_PBABARMSK2</scomRegister>
+    <scomRegister>PU_PBABARMSK3</scomRegister>
+  </registerFfdc>
+  <!-- ******************************************************************** -->
+  <registerFfdc>
+    <id>PSS_FFDC_REGISTERS</id>
+    <scomRegister>PU_SPIPSS_ADC_CTRL_REG1</scomRegister>
+    <scomRegister>PU_SPIPSS_ADC_CTRL_REG2</scomRegister>
+    <scomRegister>PU_SPIPSS_ADC_STATUS_REG</scomRegister>
+    <scomRegister>PU_SPIPSS_ADC_CMD_REG</scomRegister>
+    <scomRegister>PU_SPIPSS_ADC_RESET_REGISTER</scomRegister>
+    <scomRegister>PU_SPIPSS_ADC_WDATA_REG</scomRegister>
+    <scomRegister>PU_SPIPSS_ADC_RDATA_REG0</scomRegister>
+    <scomRegister>PU_SPIPSS_ADC_RDATA_REG1</scomRegister>
+    <scomRegister>PU_SPIPSS_ADC_RDATA_REG2</scomRegister>
+    <scomRegister>PU_SPIPSS_ADC_RDATA_REG3</scomRegister>
+    <scomRegister>PU_SPIPSS_100NS_REG</scomRegister>
+    <scomRegister>PU_SPIPSS_P2S_CTRL_REG0</scomRegister>
+    <scomRegister>PU_SPIPSS_P2S_CTRL_REG1</scomRegister>
+    <scomRegister>PU_SPIPSS_P2S_CTRL_REG2</scomRegister>
+    <scomRegister>PU_SPIPSS_P2S_STATUS_REG</scomRegister>
+    <scomRegister>PU_SPIPSS_P2S_COMMAND_REG</scomRegister>
+    <scomRegister>PU_SPIPSS_P2S_RESET_REGISTER</scomRegister>
+    <scomRegister>PU_SPIPSS_P2S_WDATA_REG</scomRegister>
+    <scomRegister>PU_SPIPSS_P2S_RDATA_REG</scomRegister>
+  </registerFfdc>
 </hwpErrors>
diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_pm_stop_gpe_init_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_pm_stop_gpe_init_errors.xml
index e4456f28f..17d528efa 100644
--- a/src/import/chips/p9/procedures/xml/error_info/p9_pm_stop_gpe_init_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_pm_stop_gpe_init_errors.xml
@@ -68,16 +68,29 @@
     <rc>RC_STOP_GPE_PFETS_FAILED</rc>
     <description> Stop GPE called to p9_pm_pfet_init failed.
     </description>
-    <ffdc>TARGET</ffdc>
     <ffdc>MODE</ffdc>
+    <collectRegisterFfdc>
+      <id>SGPE_FFDC_REGISTERS</id>
+      <target>CHIP</target>
+      <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+    </collectRegisterFfdc>
   </hwpError>
   <!-- ******************************************************************** -->
   <hwpError>
     <rc>RC_STOP_GPE_PBA_INIT_FAILED</rc>
     <description> Stop GPE called to p9_pm_pba_init failed.
     </description>
-    <ffdc>TARGET</ffdc>
     <ffdc>MODE</ffdc>
+    <collectRegisterFfdc>
+      <id>PBA_FFDC_REGISTERS</id>
+      <target>CHIP</target>
+      <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+    </collectRegisterFfdc>
+    <collectRegisterFfdc>
+      <id>SGPE_FFDC_REGISTERS</id>
+      <target>CHIP</target>
+      <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+    </collectRegisterFfdc>
   </hwpError>
   <!-- ******************************************************************** -->
 </hwpErrors>