INITPROC: Hostboot - SW232859 RAS review update

Change-Id: I033c8beb49157dc25eac56034b37f21eac1b7410
CMVC-Coreq:906027
CQ:SW232859
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/7147
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

9 files changed, 132 insertions, 54 deletions

diff --git a/src/usr/hwpf/hwp/edi_ei_initialization/proc_fab_iovalid/proc_fab_iovalid.C b/src/usr/hwpf/hwp/edi_ei_initialization/proc_fab_iovalid/proc_fab_iovalid.C
index b25b4c0b5..034f27c04 100644
--- a/src/usr/hwpf/hwp/edi_ei_initialization/proc_fab_iovalid/proc_fab_iovalid.C
+++ b/src/usr/hwpf/hwp/edi_ei_initialization/proc_fab_iovalid/proc_fab_iovalid.C
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: proc_fab_iovalid.C,v 1.12 2013/05/23 21:09:19 jmcgill Exp $
+// $Id: proc_fab_iovalid.C,v 1.13 2013/10/28 03:57:09 jmcgill Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_fab_iovalid.C,v $
 //------------------------------------------------------------------------------
 // *|
@@ -39,8 +39,8 @@
 //------------------------------------------------------------------------------
 // Includes
 //------------------------------------------------------------------------------
-#include "p8_scom_addresses.H"
-#include "proc_fab_iovalid.H"
+#include <p8_scom_addresses.H>
+#include <proc_fab_iovalid.H>
 
 extern "C"
 {
@@ -90,11 +90,11 @@ fapi::ReturnCode proc_fab_iovalid_write_active_mask(
         }
 
         // check return code from buffer manipulation operations
-        rc.setEcmdError(rc_ecmd);
-        if (!rc.ok())
+        if (rc_ecmd)
         {
             FAPI_ERR("proc_fab_iovalid_write_active_mask: Error 0x%x setting up active mask data buffer",
                      rc_ecmd);
+            rc.setEcmdError(rc_ecmd);
             break;
         }
 
@@ -128,7 +128,7 @@ fapi::ReturnCode proc_fab_iovalid_write_active_mask(
 // returns: FAPI_RC_SUCCESS if operation was successful, else error
 //------------------------------------------------------------------------------
 fapi::ReturnCode proc_fab_iovalid_manage_x_links(
-    proc_fab_iovalid_proc_chip& i_proc_chip,
+    const proc_fab_iovalid_proc_chip& i_proc_chip,
     bool i_set_not_clear)
 {
     ecmdDataBufferBase gp0_iovalid_active(64);
@@ -164,11 +164,11 @@ fapi::ReturnCode proc_fab_iovalid_manage_x_links(
         }
 
         // check aggregate return code from buffer manipulation operations
-        rc.setEcmdError(rc_ecmd);
-        if (!rc.ok())
+        if (rc_ecmd)
         {
             FAPI_ERR("proc_fab_iovalid_manage_x_links: Error 0x%x setting up active link mask data buffer",
                      rc_ecmd);
+            rc.setEcmdError(rc_ecmd);
             break;
         }
 
@@ -201,7 +201,7 @@ fapi::ReturnCode proc_fab_iovalid_manage_x_links(
 // returns: FAPI_RC_SUCCESS if operation was successful, else error
 //------------------------------------------------------------------------------
 fapi::ReturnCode proc_fab_iovalid_manage_a_links(
-    proc_fab_iovalid_proc_chip& i_proc_chip,
+    const proc_fab_iovalid_proc_chip& i_proc_chip,
     bool i_set_not_clear)
 {
     ecmdDataBufferBase gp0_iovalid_active(64);
@@ -274,11 +274,11 @@ fapi::ReturnCode proc_fab_iovalid_manage_a_links(
         }
 
         // check aggregate return code from buffer manipulation operations
-        rc.setEcmdError(rc_ecmd);
-        if (!rc.ok())
+        if (rc_ecmd)
         {
             FAPI_ERR("proc_fab_iovalid_manage_a_links: Error 0x%x setting up active link mask data buffersa",
                      rc_ecmd);
+            rc.setEcmdError(rc_ecmd);
             break;
         }
 
@@ -325,7 +325,7 @@ fapi::ReturnCode proc_fab_iovalid_manage_a_links(
 // returns: FAPI_RC_SUCCESS if operation was successful, else error
 //------------------------------------------------------------------------------
 fapi::ReturnCode proc_fab_iovalid_manage_ras_fir(
-    proc_fab_iovalid_proc_chip& i_proc_chip,
+    const proc_fab_iovalid_proc_chip& i_proc_chip,
     bool i_set_not_clear)
 {
     ecmdDataBufferBase mask_active(64);
@@ -376,11 +376,11 @@ fapi::ReturnCode proc_fab_iovalid_manage_ras_fir(
         }
 
         // check aggregate return code from buffer manipulation operations
-        rc.setEcmdError(rc_ecmd);
-        if (!rc.ok())
+        if (rc_ecmd)
         {
             FAPI_ERR("proc_fab_iovalid_manage_ras_fir: Error 0x%x setting up active link mask data buffers",
                      rc_ecmd);
+            rc.setEcmdError(rc_ecmd);
             break;
         }
 
@@ -414,7 +414,7 @@ fapi::ReturnCode proc_fab_iovalid_manage_ras_fir(
 // returns: FAPI_RC_SUCCESS if operation was successful, else error
 //------------------------------------------------------------------------------
 fapi::ReturnCode proc_fab_iovalid_manage_a_fir(
-    proc_fab_iovalid_proc_chip& i_proc_chip,
+    const proc_fab_iovalid_proc_chip& i_proc_chip,
     bool i_set_not_clear)
 {
     ecmdDataBufferBase or_data(64);
@@ -429,34 +429,31 @@ fapi::ReturnCode proc_fab_iovalid_manage_a_fir(
 
     do
     {
-         if (i_proc_chip.a0)
+        if (i_proc_chip.a0)
         {
             FAPI_DBG("proc_fab_iovalid_manage_a_fir: Configuring A FIR for link A0");
-            rc_ecmd |= or_data.flushTo0();
             rc_ecmd |= or_data.setDoubleWord(0, PB_A_FIR_A0_BIT_MASK);
             rc_ecmd |= mask_active.setOr(or_data, 0, 64);
         }
         if (i_proc_chip.a1)
         {
             FAPI_DBG("proc_fab_iovalid_manage_a_fir: Configuring A FIR for link A1");
-            rc_ecmd |= or_data.flushTo0();
             rc_ecmd |= or_data.setDoubleWord(0, PB_A_FIR_A1_BIT_MASK);
             rc_ecmd |= mask_active.setOr(or_data, 0, 64);
         }
         if (i_proc_chip.a2)
         {
             FAPI_DBG("proc_fab_iovalid_manage_a_fir: Configuring A FIR for link A2");
-            rc_ecmd |= or_data.flushTo0();
             rc_ecmd |= or_data.setDoubleWord(0, PB_A_FIR_A2_BIT_MASK);
             rc_ecmd |= mask_active.setOr(or_data, 0, 64);
         }
 
         // check aggregate return code from buffer manipulation operations
-        rc.setEcmdError(rc_ecmd);
-        if (!rc.ok())
+        if (rc_ecmd)
         {
             FAPI_ERR("proc_fab_iovalid_manage_a_fir: Error 0x%x setting up active link mask data buffers",
                      rc_ecmd);
+            rc.setEcmdError(rc_ecmd);
             break;
         }
 
@@ -490,7 +487,7 @@ fapi::ReturnCode proc_fab_iovalid_manage_a_fir(
 // returns: FAPI_RC_SUCCESS if operation was successful, else error
 //------------------------------------------------------------------------------
 fapi::ReturnCode proc_fab_iovalid_manage_x_fir(
-    proc_fab_iovalid_proc_chip& i_proc_chip,
+    const proc_fab_iovalid_proc_chip& i_proc_chip,
     bool i_set_not_clear)
 {
     ecmdDataBufferBase or_data(64);
@@ -505,41 +502,37 @@ fapi::ReturnCode proc_fab_iovalid_manage_x_fir(
 
     do
     {
-         if (i_proc_chip.x0)
+        if (i_proc_chip.x0)
         {
             FAPI_DBG("proc_fab_iovalid_manage_x_fir: Configuring X FIR for link X0");
-            rc_ecmd |= or_data.flushTo0();
             rc_ecmd |= or_data.setDoubleWord(0, PB_X_FIR_X0_BIT_MASK);
             rc_ecmd |= mask_active.setOr(or_data, 0, 64);
         }
         if (i_proc_chip.x1)
         {
             FAPI_DBG("proc_fab_iovalid_manage_x_fir: Configuring X FIR for link X1");
-            rc_ecmd |= or_data.flushTo0();
             rc_ecmd |= or_data.setDoubleWord(0, PB_X_FIR_X1_BIT_MASK);
             rc_ecmd |= mask_active.setOr(or_data, 0, 64);
         }
         if (i_proc_chip.x2)
         {
             FAPI_DBG("proc_fab_iovalid_manage_x_fir: Configuring X FIR for link X2");
-            rc_ecmd |= or_data.flushTo0();
             rc_ecmd |= or_data.setDoubleWord(0, PB_X_FIR_X2_BIT_MASK);
             rc_ecmd |= mask_active.setOr(or_data, 0, 64);
         }
         if (i_proc_chip.x3)
         {
             FAPI_DBG("proc_fab_iovalid_manage_x_fir: Configuring X FIR for link X3");
-            rc_ecmd |= or_data.flushTo0();
             rc_ecmd |= or_data.setDoubleWord(0, PB_X_FIR_X3_BIT_MASK);
             rc_ecmd |= mask_active.setOr(or_data, 0, 64);
         }
 
         // check aggregate return code from buffer manipulation operations
-        rc.setEcmdError(rc_ecmd);
-        if (!rc.ok())
+        if (rc_ecmd)
         {
             FAPI_ERR("proc_fab_iovalid_manage_x_fir: Error 0x%x setting up active link mask data buffers",
                      rc_ecmd);
+            rc.setEcmdError(rc_ecmd);
             break;
         }
 
@@ -573,7 +566,7 @@ fapi::ReturnCode proc_fab_iovalid(
     // return code
     fapi::ReturnCode rc;
     // iterator for HWP input vector
-    std::vector<proc_fab_iovalid_proc_chip>::iterator iter;
+    std::vector<proc_fab_iovalid_proc_chip>::const_iterator iter;
 
     // partial good attributes
     uint8_t abus_enable_attr;
@@ -603,13 +596,14 @@ fapi::ReturnCode proc_fab_iovalid(
                                    xbus_enable_attr);
                 if (!rc.ok())
                 {
-                    FAPI_ERR("proc_fab_iovalid_manage_x_links: Error querying ATTR_PROC_X_ENABLE");
+                    FAPI_ERR("proc_fab_iovalid: Error querying ATTR_PROC_X_ENABLE");
                     break;
                 }
 
                 if (xbus_enable_attr != fapi::ENUM_ATTR_PROC_X_ENABLE_ENABLE)
                 {
-                    FAPI_ERR("proc_fab_iovalid_manage_x_links: Partial good attribute error");
+                    FAPI_ERR("proc_fab_iovalid: Partial good attribute error");
+                    const fapi::Target & TARGET = iter->this_chip;
                     FAPI_SET_HWP_ERROR(rc, RC_PROC_FAB_IOVALID_X_PARTIAL_GOOD_ERR);
                     break;
                 }
@@ -649,6 +643,7 @@ fapi::ReturnCode proc_fab_iovalid(
                 if (abus_enable_attr != fapi::ENUM_ATTR_PROC_A_ENABLE_ENABLE)
                 {
                     FAPI_ERR("proc_fab_iovalid: Partial good attribute error");
+                    const fapi::Target & TARGET = iter->this_chip;
                     FAPI_SET_HWP_ERROR(rc, RC_PROC_FAB_IOVALID_A_PARTIAL_GOOD_ERR);
                     break;
                 }
diff --git a/src/usr/hwpf/hwp/nest_chiplets/proc_chiplet_scominit/proc_chiplet_scominit.C b/src/usr/hwpf/hwp/nest_chiplets/proc_chiplet_scominit/proc_chiplet_scominit.C
index a1ba95958..ca6859415 100644
--- a/src/usr/hwpf/hwp/nest_chiplets/proc_chiplet_scominit/proc_chiplet_scominit.C
+++ b/src/usr/hwpf/hwp/nest_chiplets/proc_chiplet_scominit/proc_chiplet_scominit.C
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: proc_chiplet_scominit.C,v 1.16 2013/07/31 21:10:31 jmcgill Exp $
+// $Id: proc_chiplet_scominit.C,v 1.18 2013/10/28 19:10:50 jmcgill Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_chiplet_scominit.C,v $
 //------------------------------------------------------------------------------
 // *! (C) Copyright International Business Machines Corp. 2012
@@ -42,7 +42,7 @@
 //------------------------------------------------------------------------------
 #include <fapiHwpExecInitFile.H>
 #include <proc_chiplet_scominit.H>
-#include "p8_scom_addresses.H"
+#include <p8_scom_addresses.H>
 
 extern "C" {
 
@@ -62,6 +62,7 @@ fapi::ReturnCode proc_chiplet_scominit(const fapi::Target & i_target)
     uint8_t mcs_pos;
     uint8_t master_mcs_pos = 0xFF;
     fapi::Target master_mcs;
+    uint8_t enable_xbus_resonant_clocking = 0x0;
 
     ecmdDataBufferBase data(64);
     ecmdDataBufferBase mask(64);
@@ -189,8 +190,54 @@ fapi::ReturnCode proc_chiplet_scominit(const fapi::Target & i_target)
             }
             else
             {
-                FAPI_DBG("proc_chiplet_scominit: Skipping execution of %s/%s (partial good)",
-                         PROC_CHIPLET_SCOMINIT_NX_IF, PROC_CHIPLET_SCOMINIT_AS_IF);
+                FAPI_DBG("proc_chiplet_scominit: Skipping execution of %s/%s/%s (partial good)",
+                         PROC_CHIPLET_SCOMINIT_NX_IF, PROC_CHIPLET_SCOMINIT_CXA_IF, PROC_CHIPLET_SCOMINIT_AS_IF);
+            }
+
+            // conditionally enable resonant clocking for XBUS
+            rc = FAPI_ATTR_GET(ATTR_CHIP_EC_FEATURE_VENICE_SPECIFIC,
+                               &i_target,
+                               enable_xbus_resonant_clocking);
+            if (!rc.ok())
+            {
+                FAPI_ERR("proc_chiplet_scominit: Error querying ATTR_CHIP_EC_FEATURE_VENICE_SPECIFIC");
+                break;
+            }
+
+            if (enable_xbus_resonant_clocking)
+            {
+                FAPI_DBG("proc_chiplet_scominit: Enabling XBUS resonant clocking");
+                rc = fapiGetScom(i_target,
+                                 MBOX_FSIGP6_0x00050015,
+                                 data);
+                if (!rc.ok())
+                {
+                    FAPI_ERR("proc_chiplet_scominit: fapiGetScom error (MBOX_FSIGP6_0x00050015)");
+                    break;
+                }
+
+                rc_ecmd |= data.insertFromRight(
+                    XBUS_RESONANT_CLOCK_CONFIG,
+                    MBOX_FSIGP6_XBUS_RESONANT_CLOCK_CONFIG_START_BIT,
+                    (MBOX_FSIGP6_XBUS_RESONANT_CLOCK_CONFIG_END_BIT-
+                     MBOX_FSIGP6_XBUS_RESONANT_CLOCK_CONFIG_START_BIT+1));
+
+                if (rc_ecmd)
+                {
+                    FAPI_ERR("proc_chiplet_scominit: Error 0x%x setting FSI GP6 register data buffer",
+                             rc_ecmd);
+                    rc.setEcmdError(rc_ecmd);
+                    break;
+                }
+
+                rc = fapiPutScom(i_target,
+                                 MBOX_FSIGP6_0x00050015,
+                                 data);
+                if (!rc.ok())
+                {
+                    FAPI_ERR("proc_chiplet_scominit: fapiPutScom error (MBOX_FSIGP6_0x00050015)");
+                    break;
+                }
             }
 
             // execute A/X/PCI/DMI FIR init SCOM initfile
@@ -250,7 +297,7 @@ fapi::ReturnCode proc_chiplet_scominit(const fapi::Target & i_target)
 
                 if (!rc.ok())
                 {
-                    FAPI_ERR("proc_chiplet_scominit: Error from FAPI_ATTR_GET (ATTR_POS)");
+                    FAPI_ERR("proc_chiplet_scominit: Error from FAPI_ATTR_GET (ATTR_CHIP_UNIT_POS)");
                     break;
                 }
 
@@ -309,15 +356,12 @@ fapi::ReturnCode proc_chiplet_scominit(const fapi::Target & i_target)
                 }
 
             }
-            if (!rc.ok())
-            {
-                break;
-            }
         }
         // unsupported target type
         else
         {
             FAPI_ERR("proc_chiplet_scominit: Unsupported target type");
+            const fapi::Target & TARGET = i_target;
             FAPI_SET_HWP_ERROR(rc, RC_PROC_CHIPLET_SCOMINIT_INVALID_TARGET);
             break;
         }
diff --git a/src/usr/hwpf/hwp/nest_chiplets/proc_chiplet_scominit/proc_chiplet_scominit.H b/src/usr/hwpf/hwp/nest_chiplets/proc_chiplet_scominit/proc_chiplet_scominit.H
index e20b02c8b..7990f2cd4 100644
--- a/src/usr/hwpf/hwp/nest_chiplets/proc_chiplet_scominit/proc_chiplet_scominit.H
+++ b/src/usr/hwpf/hwp/nest_chiplets/proc_chiplet_scominit/proc_chiplet_scominit.H
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: proc_chiplet_scominit.H,v 1.13 2013/05/30 13:13:07 jmcgill Exp $
+// $Id: proc_chiplet_scominit.H,v 1.14 2013/10/28 02:09:55 jmcgill Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_chiplet_scominit.H,v $
 //------------------------------------------------------------------------------
 // *! (C) Copyright International Business Machines Corp. 2012
@@ -59,6 +59,12 @@ const char * const PROC_CHIPLET_SCOMINIT_A_X_PCI_DMI_IF = "p8.a_x_pci_dmi_fir.sc
 const char * const PROC_CHIPLET_SCOMINIT_MCS_IF         = "p8.mcs.scom.if";
 
 
+// FSI GP6 Register field/bit definitions
+const uint16_t XBUS_RESONANT_CLOCK_CONFIG = 0xF180;
+
+const uint32_t MBOX_FSIGP6_XBUS_RESONANT_CLOCK_CONFIG_START_BIT = 0;
+const uint32_t MBOX_FSIGP6_XBUS_RESONANT_CLOCK_CONFIG_END_BIT   = 15;
+
 // MCS Mode0 Register field/bit definitions
 const uint32_t MCSMODE0_EN_CENTAUR_SYNC_BIT = 61;
 
diff --git a/src/usr/hwpf/hwp/nest_chiplets/proc_chiplet_scominit/proc_chiplet_scominit_errors.xml b/src/usr/hwpf/hwp/nest_chiplets/proc_chiplet_scominit/proc_chiplet_scominit_errors.xml
index 8a80cc5eb..045b8b5e7 100644
--- a/src/usr/hwpf/hwp/nest_chiplets/proc_chiplet_scominit/proc_chiplet_scominit_errors.xml
+++ b/src/usr/hwpf/hwp/nest_chiplets/proc_chiplet_scominit/proc_chiplet_scominit_errors.xml
@@ -20,12 +20,17 @@
 <!-- Origin: 30                                                             -->
 <!--                                                                        -->
 <!-- IBM_PROLOG_END_TAG                                                     -->
-<!-- $Id: proc_chiplet_scominit_errors.xml,v 1.2 2013/06/25 15:38:25 cswenson Exp $ -->
+<!-- $Id: proc_chiplet_scominit_errors.xml,v 1.3 2013/10/28 02:10:52 jmcgill Exp $ -->
 <!-- Error definitions for proc_chiplet_scominit procedure -->
 <hwpErrors>
   <!-- *********************************************************************** -->
   <hwpError>
     <rc>RC_PROC_CHIPLET_SCOMINIT_INVALID_TARGET</rc>
+    <ffdc>TARGET</ffdc>
     <description>Invalid target type presented to proc_chiplet_scominit HWP (expects TARGET_TYPE_PROC_CHIP).</description>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
 </hwpErrors>
diff --git a/src/usr/hwpf/hwp/nest_chiplets/proc_pcie_scominit/proc_pcie_scominit.C b/src/usr/hwpf/hwp/nest_chiplets/proc_pcie_scominit/proc_pcie_scominit.C
index 1037cfba0..fb508ac7d 100644
--- a/src/usr/hwpf/hwp/nest_chiplets/proc_pcie_scominit/proc_pcie_scominit.C
+++ b/src/usr/hwpf/hwp/nest_chiplets/proc_pcie_scominit/proc_pcie_scominit.C
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: proc_pcie_scominit.C,v 1.8 2013/10/11 14:54:22 jmcgill Exp $
+// $Id: proc_pcie_scominit.C,v 1.9 2013/10/28 03:57:12 jmcgill Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_pcie_scominit.C,v $
 //------------------------------------------------------------------------------
 // *! (C) Copyright International Business Machines Corp. 2012
@@ -39,7 +39,7 @@
 //  Includes
 //------------------------------------------------------------------------------
 #include <fapiHwpExecInitFile.H>
-#include "proc_pcie_scominit.H"
+#include <proc_pcie_scominit.H>
 
 extern "C" {
 
@@ -100,6 +100,7 @@ fapi::ReturnCode proc_pcie_scominit_iop_init(
         {
             FAPI_ERR("proc_pcie_scominit_iop_init: Invalid IOP lane configuration attribute value 0x%02X",
                      iop_config);
+            const fapi::Target & TARGET = i_target;
             const uint8_t& ATTR_DATA = iop_config;
             FAPI_SET_HWP_ERROR(rc, RC_PROC_PCIE_SCOMINIT_IOP_CONFIG_ATTR_ERR);
             break;
@@ -123,6 +124,7 @@ fapi::ReturnCode proc_pcie_scominit_iop_init(
             {
                 FAPI_ERR("proc_pcie_scominit_iop_init: Invalid IOP%d swap attribute value 0x%02X",
                          i, iop_swap[i]);
+                const fapi::Target & TARGET = i_target;
                 const uint8_t& IOP_DATA = i;
                 const uint8_t ATTR_DATA = iop_swap[i];
                 FAPI_SET_HWP_ERROR(rc, RC_PROC_PCIE_SCOMINIT_IOP_SWAP_ATTR_ERR);
@@ -444,6 +446,7 @@ fapi::ReturnCode proc_pcie_scominit(
         if (i_target.getType() != fapi::TARGET_TYPE_PROC_CHIP)
         {
             FAPI_ERR("proc_pcie_scominit: Unsupported target type");
+            const fapi::Target & TARGET = i_target;
             FAPI_SET_HWP_ERROR(rc, RC_PROC_PCIE_SCOMINIT_INVALID_TARGET);
             break;
         }
diff --git a/src/usr/hwpf/hwp/nest_chiplets/proc_pcie_scominit/proc_pcie_scominit.H b/src/usr/hwpf/hwp/nest_chiplets/proc_pcie_scominit/proc_pcie_scominit.H
index 26055c27b..aaef4f547 100644
--- a/src/usr/hwpf/hwp/nest_chiplets/proc_pcie_scominit/proc_pcie_scominit.H
+++ b/src/usr/hwpf/hwp/nest_chiplets/proc_pcie_scominit/proc_pcie_scominit.H
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: proc_pcie_scominit.H,v 1.5 2013/10/11 14:54:22 jmcgill Exp $
+// $Id: proc_pcie_scominit.H,v 1.6 2013/10/28 03:57:13 jmcgill Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_pcie_scominit.H,v $
 //------------------------------------------------------------------------------
 // *! (C) Copyright International Business Machines Corp. 2012
@@ -49,7 +49,7 @@
 // Includes
 //------------------------------------------------------------------------------
 #include <fapi.H>
-#include "p8_scom_addresses.H"
+#include <p8_scom_addresses.H>
 
 //------------------------------------------------------------------------------
 // Constant definitions
diff --git a/src/usr/hwpf/hwp/nest_chiplets/proc_pcie_scominit/proc_pcie_scominit_errors.xml b/src/usr/hwpf/hwp/nest_chiplets/proc_pcie_scominit/proc_pcie_scominit_errors.xml
index dbc4a9e18..6f2962b6c 100644
--- a/src/usr/hwpf/hwp/nest_chiplets/proc_pcie_scominit/proc_pcie_scominit_errors.xml
+++ b/src/usr/hwpf/hwp/nest_chiplets/proc_pcie_scominit/proc_pcie_scominit_errors.xml
@@ -20,23 +20,38 @@
 <!-- Origin: 30                                                             -->
 <!--                                                                        -->
 <!-- IBM_PROLOG_END_TAG                                                     -->
-<!-- $Id: proc_pcie_scominit_errors.xml,v 1.2 2013/06/25 15:38:31 cswenson Exp $ -->
+<!-- $Id: proc_pcie_scominit_errors.xml,v 1.3 2013/10/28 03:58:29 jmcgill Exp $ -->
 <!-- Error definitions for proc_pcie_scominit -->
 <hwpErrors>
   <!-- *********************************************************************** -->
   <hwpError>
     <rc>RC_PROC_PCIE_SCOMINIT_INVALID_TARGET</rc>
-    <description>Invalid target type provided to HWP.</description>
+    <description>Invalid target type provided to HWP (expects TARGET_TYPE_PROC_CHIP).</description>
+    <ffdc>TARGET</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <hwpError>
     <rc>RC_PROC_PCIE_SCOMINIT_IOP_CONFIG_ATTR_ERR</rc>
     <description>Unsupported/invalid IOP lane configuration attribute value.</description>
+    <ffdc>TARGET</ffdc>
     <ffdc>ATTR_DATA</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <hwpError>
     <rc>RC_PROC_PCIE_SCOMINIT_IOP_SWAP_ATTR_ERR</rc>
     <description>Unsupported/invalid IOP swap configuration attribute value.</description>
+    <ffdc>TARGET</ffdc>
     <ffdc>IOP_DATA</ffdc>
     <ffdc>ATTR_DATA</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
 </hwpErrors>
diff --git a/src/usr/hwpf/hwp/nest_chiplets/proc_scomoverride_chiplets/proc_scomoverride_chiplets.C b/src/usr/hwpf/hwp/nest_chiplets/proc_scomoverride_chiplets/proc_scomoverride_chiplets.C
index 9806d720b..88cd75a24 100644
--- a/src/usr/hwpf/hwp/nest_chiplets/proc_scomoverride_chiplets/proc_scomoverride_chiplets.C
+++ b/src/usr/hwpf/hwp/nest_chiplets/proc_scomoverride_chiplets/proc_scomoverride_chiplets.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012                   */
+/* COPYRIGHT International Business Machines Corp. 2012,2013              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: proc_scomoverride_chiplets.C,v 1.2 2012/10/07 18:25:47 jmcgill Exp $
+// $Id: proc_scomoverride_chiplets.C,v 1.3 2013/10/28 03:57:15 jmcgill Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_scomoverride_chiplets.C,v $
 //------------------------------------------------------------------------------
 // *|
@@ -29,7 +29,7 @@
 // *! *** IBM Confidential ***
 // *|
 // *! TITLE       : proc_scomoverride_chiplets.C
-// *! DESCRIPTION :
+// *! DESCRIPTION : Placeholder for chiplet SCOM overrides
 // *!
 // *! OWNER NAME  : Joe McGill              Email: jmcgill@us.ibm.com
 // *! OWNER NAME  : Jeshua Smith            Email: jeshua@us.ibm.com
@@ -40,7 +40,7 @@
 //------------------------------------------------------------------------------
 // Includes
 //------------------------------------------------------------------------------
-#include "proc_scomoverride_chiplets.H"
+#include <proc_scomoverride_chiplets.H>
 
 extern "C"
 {
diff --git a/src/usr/hwpf/hwp/proc_fab_iovalid_errors.xml b/src/usr/hwpf/hwp/proc_fab_iovalid_errors.xml
index 2bfa7b968..820d22599 100644
--- a/src/usr/hwpf/hwp/proc_fab_iovalid_errors.xml
+++ b/src/usr/hwpf/hwp/proc_fab_iovalid_errors.xml
@@ -20,16 +20,26 @@
 <!-- Origin: 30                                                             -->
 <!--                                                                        -->
 <!-- IBM_PROLOG_END_TAG                                                     -->
-<!-- $Id: proc_fab_iovalid_errors.xml,v 1.6 2013/05/22 15:51:27 mjjones Exp $ -->
+<!-- $Id: proc_fab_iovalid_errors.xml,v 1.7 2013/10/28 03:58:28 jmcgill Exp $ -->
 <!-- Error definitions for proc_fab_iovalid procedure -->
 <hwpErrors>
   <!-- *********************************************************************** -->
   <hwpError>
     <rc>RC_PROC_FAB_IOVALID_X_PARTIAL_GOOD_ERR</rc>
+    <ffdc>TARGET</ffdc>
     <description>X bus partial good attribute state does not allow for action on target.</description>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <hwpError>
     <rc>RC_PROC_FAB_IOVALID_A_PARTIAL_GOOD_ERR</rc>
+    <ffdc>TARGET</ffdc>
     <description>A bus partial good attribute state does not allow for action on target.</description>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
 </hwpErrors>