INITPROC: Hostboot - SW246994 HWP for week 2/11

Change-Id: I017e05f0e4803a9fbb83998f6c2270cbd63740a1
CQ:SW246994
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/9435
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

3 files changed, 133 insertions, 5 deletions

diff --git a/src/usr/hwpf/hwp/nest_chiplets/proc_a_x_pci_dmi_pll_registers.xml b/src/usr/hwpf/hwp/nest_chiplets/proc_a_x_pci_dmi_pll_registers.xml
new file mode 100755
index 000000000..0d4f68479
--- /dev/null
+++ b/src/usr/hwpf/hwp/nest_chiplets/proc_a_x_pci_dmi_pll_registers.xml
@@ -0,0 +1,56 @@
+<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
+<!-- This is an automatically generated prolog.                             -->
+<!--                                                                        -->
+<!-- $Source: src/usr/hwpf/hwp/nest_chiplets/proc_a_x_pci_dmi_pll_registers.xml $ -->
+<!--                                                                        -->
+<!-- IBM CONFIDENTIAL                                                       -->
+<!--                                                                        -->
+<!-- COPYRIGHT International Business Machines Corp. 2014                   -->
+<!--                                                                        -->
+<!-- p1                                                                     -->
+<!--                                                                        -->
+<!-- Object Code Only (OCO) source materials                                -->
+<!-- Licensed Internal Code Source Materials                                -->
+<!-- IBM HostBoot Licensed Internal Code                                    -->
+<!--                                                                        -->
+<!-- The source code for this program is not published or otherwise         -->
+<!-- divested of its trade secrets, irrespective of what has been           -->
+<!-- deposited with the U.S. Copyright Office.                              -->
+<!--                                                                        -->
+<!-- Origin: 30                                                             -->
+<!--                                                                        -->
+<!-- IBM_PROLOG_END_TAG                                                     -->
+<!-- $Id: proc_a_x_pci_dmi_pll_registers.xml,v 1.1 2014/02/04 18:55:00 mfred Exp $ -->
+<!-- Definition of PLL registers to collect on some errors -->
+
+<hwpErrors>
+  <registerFfdc>
+    <id>REG_FFDC_DMI_PLL_NO_LOCK_REGISTERS</id>
+    <scomRegister>NEST_GP3_0x020F0012</scomRegister>
+    <scomRegister>PB_PLLLOCKREG_0x020F0019</scomRegister>
+    <cfamRegister>CFAM_FSI_GP3_0x00002812</cfamRegister>
+    <cfamRegister>CFAM_FSI_GP4_0x00002813</cfamRegister>
+    <cfamRegister>CFAM_FSI_GP6_0x00002815</cfamRegister>
+    <cfamRegister>CFAM_FSI_GP7_0x00002816</cfamRegister>
+  </registerFfdc>
+
+  <registerFfdc>
+    <id>REG_FFDC_ABUS_PLL_NO_LOCK_REGISTERS</id>
+    <scomRegister>A_GP3_0x080F0012</scomRegister>
+    <scomRegister>A_PLLLOCKREG_0x080F0019</scomRegister>
+    <cfamRegister>CFAM_FSI_GP3_0x00002812</cfamRegister>
+    <cfamRegister>CFAM_FSI_GP4_0x00002813</cfamRegister>
+    <cfamRegister>CFAM_FSI_GP6_0x00002815</cfamRegister>
+    <cfamRegister>CFAM_FSI_GP7_0x00002816</cfamRegister>
+  </registerFfdc>
+
+  <registerFfdc>
+    <id>REG_FFDC_PCIE_PLL_NO_LOCK_REGISTERS</id>
+    <scomRegister>PCIE_GP3_0x090F0012</scomRegister>
+    <scomRegister>PCIE_PLLLOCKREG_0x090F0019</scomRegister>
+    <cfamRegister>CFAM_FSI_GP3_0x00002812</cfamRegister>
+    <cfamRegister>CFAM_FSI_GP4_0x00002813</cfamRegister>
+    <cfamRegister>CFAM_FSI_GP6_0x00002815</cfamRegister>
+    <cfamRegister>CFAM_FSI_GP7_0x00002816</cfamRegister>
+  </registerFfdc>
+</hwpErrors>
diff --git a/src/usr/hwpf/hwp/nest_chiplets/proc_a_x_pci_dmi_pll_setup/proc_a_x_pci_dmi_pll_utils.C b/src/usr/hwpf/hwp/nest_chiplets/proc_a_x_pci_dmi_pll_setup/proc_a_x_pci_dmi_pll_utils.C
index 949e00bec..dabee5fa4 100644
--- a/src/usr/hwpf/hwp/nest_chiplets/proc_a_x_pci_dmi_pll_setup/proc_a_x_pci_dmi_pll_utils.C
+++ b/src/usr/hwpf/hwp/nest_chiplets/proc_a_x_pci_dmi_pll_setup/proc_a_x_pci_dmi_pll_utils.C
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: proc_a_x_pci_dmi_pll_utils.C,v 1.6 2014/01/07 14:43:36 mfred Exp $
+// $Id: proc_a_x_pci_dmi_pll_utils.C,v 1.7 2014/02/03 16:29:10 mfred Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_a_x_pci_dmi_pll_utils.C,v $
 //------------------------------------------------------------------------------
 // *|
@@ -531,6 +531,7 @@ fapi::ReturnCode proc_a_x_pci_dmi_pll_release_pll(
             {
                 FAPI_ERR("Timed out polling for PLL lock");
                 const uint8_t LOCK_STATUS = data.getByte(0);
+                const fapi::Target & CHIP_IN_ERROR = i_target;
                 if (i_chiplet_base_scom_addr == NEST_CHIPLET_0x02000000)
                 {
                     FAPI_SET_HWP_ERROR(rc, RC_PROC_A_X_PCI_DMI_PLL_SETUP_DMI_PLL_NO_LOCK);
diff --git a/src/usr/hwpf/hwp/nest_chiplets/proc_a_x_pci_dmi_pll_setup_errors.xml b/src/usr/hwpf/hwp/nest_chiplets/proc_a_x_pci_dmi_pll_setup_errors.xml
index ab02e01e3..599371ddf 100644
--- a/src/usr/hwpf/hwp/nest_chiplets/proc_a_x_pci_dmi_pll_setup_errors.xml
+++ b/src/usr/hwpf/hwp/nest_chiplets/proc_a_x_pci_dmi_pll_setup_errors.xml
@@ -20,7 +20,7 @@
 <!-- Origin: 30                                                             -->
 <!--                                                                        -->
 <!-- IBM_PROLOG_END_TAG                                                     -->
-<!-- $Id: proc_a_x_pci_dmi_pll_setup_errors.xml,v 1.5 2014/01/07 14:17:46 mfred Exp $ -->
+<!-- $Id: proc_a_x_pci_dmi_pll_setup_errors.xml,v 1.7 2014/02/04 18:55:02 mfred Exp $ -->
 <!-- Halt codes for proc_a_x_pci_dmi_pll_setup --> 
 <hwpErrors>
   <!-- ******************************************************************** -->
@@ -28,29 +28,100 @@
     <rc>RC_PROC_A_X_PCI_DMI_PLL_SETUP_ABUS_PLL_NO_LOCK</rc>
     <ffdc>LOCK_STATUS</ffdc>
     <description>A_Bus PLL failed to lock.</description>
+    <collectRegisterFfdc>
+        <id>REG_FFDC_ABUS_PLL_NO_LOCK_REGISTERS</id>
+        <target>CHIP_IN_ERROR</target>
+    </collectRegisterFfdc>
     <callout>
-        <procedure>CODE </procedure>
+        <hw>
+            <hwid>PROC_REF_CLOCK</hwid>
+            <refTarget>CHIP_IN_ERROR</refTarget>
+        </hw>
         <priority>HIGH</priority>
     </callout>
+    <callout>
+        <target>CHIP_IN_ERROR</target>  
+        <priority>MEDIUM</priority>
+    </callout>
+    <callout>
+        <procedure>CODE </procedure>
+        <priority>LOW</priority>
+    </callout>
+    <!-- Deconfigure CHIP_IN_ERROR -->
+    <deconfigure>
+      <target>CHIP_IN_ERROR</target>
+    </deconfigure>
+    <!-- Create GARD record for CHIP_IN_ERROR -->
+    <gard>
+      <target>CHIP_IN_ERROR</target>
+    </gard>
   </hwpError>
+
   <!-- ******************************************************************** -->
   <hwpError>
     <rc>RC_PROC_A_X_PCI_DMI_PLL_SETUP_DMI_PLL_NO_LOCK</rc>
     <ffdc>LOCK_STATUS</ffdc>
     <description>DMI PLL failed to lock.</description>
+    <collectRegisterFfdc>
+        <id>REG_FFDC_DMI_PLL_NO_LOCK_REGISTERS</id>
+        <target>CHIP_IN_ERROR</target>
+    </collectRegisterFfdc>
     <callout>
-        <procedure>CODE </procedure>
+        <hw>
+            <hwid>PROC_REF_CLOCK</hwid>
+            <refTarget>CHIP_IN_ERROR</refTarget>
+        </hw>
         <priority>HIGH</priority>
     </callout>
+    <callout>
+        <target>CHIP_IN_ERROR</target>  
+        <priority>MEDIUM</priority>
+    </callout>
+    <callout>
+        <procedure>CODE </procedure>
+        <priority>LOW</priority>
+    </callout>
+    <!-- Deconfigure CHIP_IN_ERROR -->
+    <deconfigure>
+      <target>CHIP_IN_ERROR</target>
+    </deconfigure>
+    <!-- Create GARD record for CHIP_IN_ERROR -->
+    <gard>
+      <target>CHIP_IN_ERROR</target>
+    </gard>
   </hwpError>
+
   <!-- ******************************************************************** -->
   <hwpError>
     <rc>RC_PROC_A_X_PCI_DMI_PLL_SETUP_PCIE_PLL_NO_LOCK</rc>
     <ffdc>LOCK_STATUS</ffdc>
     <description>PCIE PLL failed to lock.</description>
+    <collectRegisterFfdc>
+        <id>REG_FFDC_PCIE_PLL_NO_LOCK_REGISTERS</id>
+        <target>CHIP_IN_ERROR</target>
+    </collectRegisterFfdc>
     <callout>
-        <procedure>CODE </procedure>
+        <hw>
+            <hwid>PCI_REF_CLOCK</hwid>
+            <refTarget>CHIP_IN_ERROR</refTarget>
+        </hw>
         <priority>HIGH</priority>
     </callout>
+    <callout>
+        <target>CHIP_IN_ERROR</target>  
+        <priority>MEDIUM</priority>
+    </callout>
+    <callout>
+        <procedure>CODE </procedure>
+        <priority>LOW</priority>
+    </callout>
+    <!-- Deconfigure CHIP_IN_ERROR -->
+    <deconfigure>
+      <target>CHIP_IN_ERROR</target>
+    </deconfigure>
+    <!-- Create GARD record for CHIP_IN_ERROR -->
+    <gard>
+      <target>CHIP_IN_ERROR</target>
+    </gard>
   </hwpError>
 </hwpErrors>