INITPROC: Hostboot - SW241721 proc_a_x_pci_dmi_* changes

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

4 files changed, 37 insertions, 19 deletions

diff --git a/src/usr/hwpf/hwp/nest_chiplets/proc_a_x_pci_dmi_pll_setup/proc_a_x_pci_dmi_pll_initf.C b/src/usr/hwpf/hwp/nest_chiplets/proc_a_x_pci_dmi_pll_setup/proc_a_x_pci_dmi_pll_initf.C
index 00fbedacf..ec6724fab 100644
--- a/src/usr/hwpf/hwp/nest_chiplets/proc_a_x_pci_dmi_pll_setup/proc_a_x_pci_dmi_pll_initf.C
+++ b/src/usr/hwpf/hwp/nest_chiplets/proc_a_x_pci_dmi_pll_setup/proc_a_x_pci_dmi_pll_initf.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2013              */
+/* COPYRIGHT International Business Machines Corp. 2012,2014              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: proc_a_x_pci_dmi_pll_initf.C,v 1.15 2013/09/30 16:09:56 jmcgill Exp $
+// $Id: proc_a_x_pci_dmi_pll_initf.C,v 1.16 2014/01/07 14:43:23 mfred Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_a_x_pci_dmi_pll_initf.C,v $
 //------------------------------------------------------------------------------
 // *|
@@ -45,9 +45,9 @@
 //------------------------------------------------------------------------------
 // Includes
 //------------------------------------------------------------------------------
-#include "p8_scom_addresses.H"
-#include "proc_a_x_pci_dmi_pll_initf.H"
-#include "proc_a_x_pci_dmi_pll_utils.H"
+#include <p8_scom_addresses.H>
+#include <proc_a_x_pci_dmi_pll_initf.H>
+#include <proc_a_x_pci_dmi_pll_utils.H>
 
 using namespace fapi;
 
@@ -417,6 +417,9 @@ fapi::ReturnCode proc_a_x_pci_dmi_pll_initf(const fapi::Target & i_target,
 This section is automatically updated by CVS when you check in this file.
 Be sure to create CVS comments when you commit so that they can be included here.
 $Log: proc_a_x_pci_dmi_pll_initf.C,v $
+Revision 1.16  2014/01/07 14:43:23  mfred
+Checking in updates from Andrea Ma:  Include statements fixed and one fapi dbg statement changed.
+
 Revision 1.15  2013/09/30 16:09:56  jmcgill
 fix HW268965
 
diff --git a/src/usr/hwpf/hwp/nest_chiplets/proc_a_x_pci_dmi_pll_setup/proc_a_x_pci_dmi_pll_setup.C b/src/usr/hwpf/hwp/nest_chiplets/proc_a_x_pci_dmi_pll_setup/proc_a_x_pci_dmi_pll_setup.C
index c8cd63957..f292520e6 100644
--- a/src/usr/hwpf/hwp/nest_chiplets/proc_a_x_pci_dmi_pll_setup/proc_a_x_pci_dmi_pll_setup.C
+++ b/src/usr/hwpf/hwp/nest_chiplets/proc_a_x_pci_dmi_pll_setup/proc_a_x_pci_dmi_pll_setup.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2013              */
+/* COPYRIGHT International Business Machines Corp. 2012,2014              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: proc_a_x_pci_dmi_pll_setup.C,v 1.11 2013/04/17 22:38:42 jmcgill Exp $
+// $Id: proc_a_x_pci_dmi_pll_setup.C,v 1.12 2014/01/07 14:43:34 mfred Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_a_x_pci_dmi_pll_setup.C,v $
 //------------------------------------------------------------------------------
 // *|
@@ -42,9 +42,9 @@
 //------------------------------------------------------------------------------
 // Includes
 //------------------------------------------------------------------------------
-#include "p8_scom_addresses.H"
-#include "proc_a_x_pci_dmi_pll_setup.H"
-#include "proc_a_x_pci_dmi_pll_utils.H"
+#include <p8_scom_addresses.H>
+#include <proc_a_x_pci_dmi_pll_setup.H>
+#include <proc_a_x_pci_dmi_pll_utils.H>
 
 
 //------------------------------------------------------------------------------
@@ -223,6 +223,9 @@ extern "C"
 This section is automatically updated by CVS when you check in this file.
 Be sure to create CVS comments when you commit so that they can be included here.
 $Log: proc_a_x_pci_dmi_pll_setup.C,v $
+Revision 1.12  2014/01/07 14:43:34  mfred
+Checking in updates from Andrea Ma:  Include statements fixed and one fapi dbg statement changed.
+
 Revision 1.11  2013/04/17 22:38:42  jmcgill
 implement A/DMI PLL workaround for SW194943, reorganize code to use common subroutines for PLL scan/setup
 
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 90ad8d69b..949e00bec 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
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2013                   */
+/* COPYRIGHT International Business Machines Corp. 2013,2014              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: proc_a_x_pci_dmi_pll_utils.C,v 1.5 2013/10/28 06:45:46 jmcgill Exp $
+// $Id: proc_a_x_pci_dmi_pll_utils.C,v 1.6 2014/01/07 14:43:36 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 $
 //------------------------------------------------------------------------------
 // *|
@@ -39,8 +39,8 @@
 //------------------------------------------------------------------------------
 // Includes
 //------------------------------------------------------------------------------
-#include "p8_scom_addresses.H"
-#include "proc_a_x_pci_dmi_pll_utils.H"
+#include <p8_scom_addresses.H>
+#include <proc_a_x_pci_dmi_pll_utils.H>
 #include <fapi.H>
 
 using namespace fapi;
@@ -437,7 +437,7 @@ fapi::ReturnCode proc_a_x_pci_dmi_pll_release_pll(
     fapi::ReturnCode rc;
 
     // mark function entry
-    FAPI_DBG("Start");
+    FAPI_DBG("Start proc_a_x_pci_dmi_pll_release_pll");
 
     do
     {
@@ -553,7 +553,7 @@ fapi::ReturnCode proc_a_x_pci_dmi_pll_release_pll(
     } while(0);
 
     // mark function entry
-    FAPI_DBG("End");
+    FAPI_DBG("End proc_a_x_pci_dmi_pll_release_pll");
     return rc;
 }
 
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 1c9b0a1dd..ab02e01e3 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
@@ -5,7 +5,7 @@
 <!--                                                                        -->
 <!-- IBM CONFIDENTIAL                                                       -->
 <!--                                                                        -->
-<!-- COPYRIGHT International Business Machines Corp. 2012,2013              -->
+<!-- COPYRIGHT International Business Machines Corp. 2012,2014              -->
 <!--                                                                        -->
 <!-- p1                                                                     -->
 <!--                                                                        -->
@@ -20,25 +20,37 @@
 <!-- Origin: 30                                                             -->
 <!--                                                                        -->
 <!-- IBM_PROLOG_END_TAG                                                     -->
-<!-- $Id: proc_a_x_pci_dmi_pll_setup_errors.xml,v 1.4 2013/06/25 15:38:20 cswenson Exp $ -->
-<!-- Halt codes for proc_a_x_pci_dmi_pll_setup -->
+<!-- $Id: proc_a_x_pci_dmi_pll_setup_errors.xml,v 1.5 2014/01/07 14:17:46 mfred Exp $ -->
+<!-- Halt codes for proc_a_x_pci_dmi_pll_setup --> 
 <hwpErrors>
   <!-- ******************************************************************** -->
   <hwpError>
     <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>
+    <callout>
+        <procedure>CODE </procedure>
+        <priority>HIGH</priority>
+    </callout>
   </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>
+    <callout>
+        <procedure>CODE </procedure>
+        <priority>HIGH</priority>
+    </callout>
   </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>
+    <callout>
+        <procedure>CODE </procedure>
+        <priority>HIGH</priority>
+    </callout>
   </hwpError>
 </hwpErrors>