SW265077: INITPROC: FSP & Hostboot - RAS review changes for SBE_Customize

Change-Id: I5bc9e6dd5fc33579cf9b550a0c1c67afcc5dff92
CQ:SW265077
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/11780
Tested-by: Jenkins Server
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

6 files changed, 313 insertions, 59 deletions

diff --git a/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_slw_build_errors.xml b/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_slw_build_errors.xml
index 6fb05774b..a76559e00 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_slw_build_errors.xml
+++ b/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_slw_build_errors.xml
@@ -20,7 +20,7 @@
 <!-- permissions and limitations under the License.                         -->
 <!--                                                                        -->
 <!-- IBM_PROLOG_END_TAG                                                     -->
-<!-- $Id: p8_slw_build_errors.xml,v 1.8 2013-04-23 22:47:26 wenning Exp $   -->
+<!-- $Id: p8_slw_build_errors.xml,v 1.9 2014/05/28 02:33:33 cmolsen Exp $   -->
 <!-- Error definitions for proc_slw_build procedure -->
 <hwpErrors>
   <!-- *********************************************************************** -->
@@ -29,13 +29,21 @@
     <description>Supplied max image size is too small or image too large.</description>
     <ffdc>DATA_IMG_SIZE_INP</ffdc>
     <ffdc>DATA_IMG_SIZE_MAX</ffdc>
-</hwpError>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
+  </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
     <rc>RC_PROC_SLWB_IMG_PTR_ERROR</rc>
     <description>Supplied image ptrs are the same. This is not allowed.</description>
     <ffdc>DATA_BUF1_PTR</ffdc>
     <ffdc>DATA_BUF2_PTR</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -43,6 +51,10 @@
     <description>Supplied buffer(s) is invalid. Either it (they) does not exist or they are the same. This is not allowed.</description>
     <ffdc>DATA_BUF1_PTR</ffdc>
     <ffdc>DATA_BUF2_PTR</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -51,6 +63,10 @@
     <ffdc>DATA_BUF1_SIZE</ffdc>
     <ffdc>DATA_BUF2_SIZE</ffdc>
     <ffdc>DATA_BUF_SIZE_FIXED</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -58,6 +74,10 @@
     <description>Supplied max output image size differs from agreed upon fixed SLW image size.</description>
     <ffdc>DATA_IMG_SIZE_MAX</ffdc>
     <ffdc>DATA_IMG_SIZE_FIXED</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -65,6 +85,10 @@
     <description>Supplied image size differs from size in image header.</description>
     <ffdc>DATA_IMG_SIZE_INP</ffdc>
     <ffdc>DATA_IMG_SIZE</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -72,6 +96,10 @@
     <description>Supplied image size differs from size in mainstore image header.</description>
     <ffdc>DATA_IMG_SIZE_INP</ffdc>
     <ffdc>DATA_IMG_SIZE</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -79,6 +107,10 @@
     <description>Ring block is too large.</description>
     <ffdc>DATA_RING_BLOCK_SIZEOFTHIS</ffdc>
     <ffdc>DATA_SIZE_OF_BUF1</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -86,12 +118,20 @@
     <description>Problem with WF ring block alignment.</description>
     <ffdc>DATA_RING_BLOCK_ENTRYOFFSET</ffdc>
     <ffdc>DATA_RING_BLOCK_SIZEOFTHIS</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
     <rc>RC_PROC_SLWB_IMGBUILD_ERROR</rc>
     <description>Local IMGBUILD_xyz error from non-FAPI routine. Check rc code in p8_delta_scan_rw.h.</description>
     <ffdc>RC_LOCAL</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -100,36 +140,61 @@
     <ffdc>DATA_IMG_SIZE_OLD</ffdc>
     <ffdc>DATA_IMG_SIZE_EST</ffdc>
     <ffdc>DATA_IMG_SIZE_MAX</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
     <rc>RC_PROC_SLWB_INTERNAL_IMAGE_ERR</rc>
     <description>Unable to obtain either image size or to validate image.</description>
     <ffdc>RC_LOCAL</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
     <rc>RC_PROC_SLWB_MS_INTERNAL_IMAGE_ERR</rc>
     <description>Unable to obtain either image size or to validate image in mainstore.</description>
     <ffdc>RC_LOCAL</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
     <rc>RC_PROC_SLWB_DELETE_IMAGE_SECTION_ERROR</rc>
     <description>Error associated with deleting an image section.</description>
+    <ffdc>SBE_XIP_SECTION</ffdc>
     <ffdc>RC_LOCAL</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
     <rc>RC_PROC_SLWB_RING_RETRIEVAL_ERROR</rc>
     <description>Error associated with retrieving RS4 ring from image.</description>
     <ffdc>RC_LOCAL</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
     <rc>RC_PROC_SLWB_RS4_DECOMPRESSION_ERROR</rc>
     <description>RS4 decompression failed.</description>
     <ffdc>RC_LOCAL</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -138,58 +203,99 @@
     <ffdc>DATA_FAIL_BYTE_NO</ffdc>
     <ffdc>DATA_EXISTING_RING_BYTE</ffdc>
     <ffdc>DATA_OVERLAY_RING_BYTE</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
 </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
     <rc>RC_PROC_SLWB_WF_CREATION_ERROR</rc>
     <description>Wiggle-flip programming failed.</description>
     <ffdc>RC_LOCAL</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
     <rc>RC_PROC_SLWB_IMAGE_UPDATE_ERROR</rc>
     <description>Error associated with updating mainstore image.</description>
     <ffdc>RC_LOCAL</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
     <rc>RC_PROC_SLWB_APPEND_SLW_SECTION_ERROR</rc>
     <description>Error associated with adding empty SLW section for ramming table.</description>
     <ffdc>RC_LOCAL</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
     <rc>RC_PROC_SLWB_CREATE_FIXED_IMAGE_ERROR</rc>
     <description>Error associated with creating and initializing fixed image and fixed .slw and .ffdc sections.</description>
     <ffdc>RC_LOCAL</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
     <rc>RC_PROC_SLWB_KEYWORD_NOT_FOUND_ERROR</rc>
     <description>A keyword in the XIP image was not found.</description>
     <ffdc>RC_LOCAL</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
     <rc>RC_PROC_SLWB_UNKNOWN_XIP_ERROR</rc>
     <description>Unknown XIP error, except it's not an _ITEM_NOT_FOUND error.</description>
     <ffdc>RC_LOCAL</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
     <rc>RC_PROC_SLWB_UNKNOWN_ERROR</rc>
     <description>Unknown error. (Shouldn't be in this code section.)</description>
     <ffdc>RC_LOCAL</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
     <rc>RC_PROC_SLWB_BAD_CODE_OR_PARM</rc>
     <description>Shouldn't be in this code section or invalid parm.</description>
+    <ffdc>MODE_BUILD</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
     <rc>RC_PROC_SLWB_MEMORY_ERROR</rc>
     <description>Memory allocation error.</description>
     <ffdc>RC_LOCAL</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
 </hwpErrors>
diff --git a/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_slw_build_fixed.C b/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_slw_build_fixed.C
index ce6191db9..fc266b0c6 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_slw_build_fixed.C
+++ b/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_slw_build_fixed.C
@@ -20,7 +20,7 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: p8_slw_build_fixed.C,v 1.18 2013/12/16 21:41:47 cmolsen Exp $
+// $Id: p8_slw_build_fixed.C,v 1.19 2014/05/28 02:32:41 cmolsen Exp $
 /*------------------------------------------------------------------------------*/
 /* *! TITLE : p8_slw_build_fixed                                                      */
 /* *! DESCRIPTION : Extracts and decompresses delta ring states from EPROM      */
@@ -99,6 +99,7 @@ ReturnCode p8_slw_build_fixed( const fapi::Target &i_target,
   uint32_t  dataTmp1, dataTmp2, dataTmp3;
   uint64_t  ptrTmp1, ptrTmp2;
   uint32_t  bufLC;
+  uint8_t   ffdc_temp;
 
 	// Sanity checks on buffers and image.
   // - validate image.
@@ -185,6 +186,8 @@ ReturnCode p8_slw_build_fixed( const fapi::Target &i_target,
   if (i_modeBuild>P8_SLW_MODEBUILD_MAX_VALUE)  {
     FAPI_ERR("modeBuild=%i invalid. Valid range is [0;%i].",
       i_modeBuild,P8_SLW_MODEBUILD_MAX_VALUE);
+    ffdc_temp = i_modeBuild;
+    uint8_t & MODE_BUILD=ffdc_temp;
 		FAPI_SET_HWP_ERROR(rc, RC_PROC_SLWB_BAD_CODE_OR_PARM);
     return rc;
   }
@@ -223,6 +226,8 @@ ReturnCode p8_slw_build_fixed( const fapi::Target &i_target,
   rcLoc = sbe_xip_delete_section( i_imageOut, SBE_XIP_SECTION_DCRINGS);
   if (rcLoc)  {
     FAPI_ERR("xip_delete_section(.dcrings) failed w/rcLoc=%i",rcLoc);
+    ffdc_temp=(uint8_t)SBE_XIP_SECTION_DCRINGS;
+    uint8_t & SBE_XIP_SECTION=ffdc_temp;
 	  uint32_t & RC_LOCAL=rcLoc;
     FAPI_SET_HWP_ERROR(rc, RC_PROC_SLWB_DELETE_IMAGE_SECTION_ERROR);
     return rc;
@@ -240,6 +245,8 @@ ReturnCode p8_slw_build_fixed( const fapi::Target &i_target,
   rcLoc = sbe_xip_delete_section( i_imageOut, SBE_XIP_SECTION_RINGS);
   if (rcLoc)  {
     FAPI_ERR("xip_delete_section(.rings) failed w/rcLoc=%i",rcLoc);
+    ffdc_temp=(uint8_t)SBE_XIP_SECTION_RINGS;
+    uint8_t & SBE_XIP_SECTION=ffdc_temp;
 	  uint32_t & RC_LOCAL=rcLoc;
     FAPI_SET_HWP_ERROR(rc, RC_PROC_SLWB_DELETE_IMAGE_SECTION_ERROR);
     return rc;
@@ -257,6 +264,8 @@ ReturnCode p8_slw_build_fixed( const fapi::Target &i_target,
   rcLoc = sbe_xip_delete_section( i_imageOut, SBE_XIP_SECTION_PIBMEM0);
   if (rcLoc)  {
     FAPI_ERR("xip_delete_section(.pibmem0) failed w/rcLoc=%i",rcLoc);
+    ffdc_temp=(uint8_t)SBE_XIP_SECTION_PIBMEM0;
+    uint8_t & SBE_XIP_SECTION=ffdc_temp;
 	  uint32_t & RC_LOCAL=rcLoc;
     FAPI_SET_HWP_ERROR(rc, RC_PROC_SLWB_DELETE_IMAGE_SECTION_ERROR);
     return rc;
@@ -727,6 +736,8 @@ ReturnCode p8_slw_build_fixed( const fapi::Target &i_target,
 		// Default case - Should never get here.
 		default:
 			FAPI_ERR("Bad code, or bad modeBuild (=%i) parm.",i_modeBuild);
+      ffdc_temp = i_modeBuild;
+      uint8_t & MODE_BUILD=ffdc_temp;
 			FAPI_SET_HWP_ERROR(rc, RC_PROC_SLWB_BAD_CODE_OR_PARM);
 			return rc;
 		}
diff --git a/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_xip_customize.C b/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_xip_customize.C
index 5233178fa..a03e9da7e 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_xip_customize.C
+++ b/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_xip_customize.C
@@ -20,7 +20,7 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: p8_xip_customize.C,v 1.70 2014/04/28 15:49:49 cmolsen Exp $
+// $Id: p8_xip_customize.C,v 1.71 2014/05/28 15:34:53 cmolsen Exp $
 /*------------------------------------------------------------------------------*/
 /* *! TITLE : p8_xip_customize                                                  */
 /* *! DESCRIPTION : Obtains repair rings from VPD and adds them to either       */
@@ -408,6 +408,8 @@ ReturnCode p8_xip_customize( const fapi::Target &i_target,
   bool       largeSeeprom = false;
   uint8_t    seepromAddrBytes = 0;
   const uint32_t   desiredBootCoreMask = (i_sysPhase==0)?io_bootCoreMask:0x0000FFFF;
+  uint8_t    ffdc_temp;
+
   FAPI_INF("Desired boot core mask is 0x%08X, io_bootCoreMask is 0x%08X", desiredBootCoreMask, io_bootCoreMask);
 
   SBE_XIP_ERROR_STRINGS(errorStrings);
@@ -1453,6 +1455,8 @@ ReturnCode p8_xip_customize( const fapi::Target &i_target,
   // Default case - Should never get here.
   default:
     FAPI_ERR("Bad code, or bad modeBuild (=%i) parm.",i_modeBuild);
+    ffdc_temp = i_modeBuild;
+    uint8_t & MODE_BUILD=ffdc_temp;
     FAPI_SET_HWP_ERROR(rc, RC_PROC_XIPC_BAD_CODE_OR_PARM);
     return rc;
   
diff --git a/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_xip_customize.H b/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_xip_customize.H
index f07e588c7..1e9edf00d 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_xip_customize.H
+++ b/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_xip_customize.H
@@ -20,18 +20,11 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-
-// $Id: p8_xip_customize.H,v 1.8 2013/06/13 16:52:41 jeshua Exp $
+// $Id: p8_xip_customize.H,v 1.9 2014/05/28 02:35:45 cmolsen Exp $
 
 #include <fapi.H>
 
-typedef fapi::ReturnCode (*fapiGetMvpdField_FP_t) ( const fapi::MvpdRecord i_record,
-                                                    const fapi::MvpdKeyword i_keyword,
-                                                    const fapi::Target &i_procTarget,
-                                                    uint8_t * const i_pBuffer,
-                                                    uint32_t &io_fieldSize);
-
-typedef fapi::ReturnCode (*p8_xip_customize_FP_t) (  const fapi::Target&,
+typedef fapi::ReturnCode (*p8_xip_customize_FP_t) (  const fapi::Target&, 
                                                     void*,
                                                     void*,
                                                     uint32_t&,
@@ -50,18 +43,18 @@ extern "C"
 // Function declares.
 //
 
-  // Description:
+  // Description: 
   // FAPI HWP entry point for p8_xip_customize().
   // p8_xip_customize() adds VPD rings to the IPL and SLW images and updates
   //   various vectors in the images.
   //
-  // Parameters:
+  // Parameters:  
   // fapi::Target &i_target:        Processor chip target.
   // void         *i_imageIn:       Ptr to input IPL or SLW image.
   // void         *i_imageOut:      Ptr to output IPL img. (Ignored for SLW/RAM imgs.)
   // uint32_t     &io_sizeImageOut: In: Max size of IPL/SRAM img. Out: Final size.
   // uint8_t      i_sysPhase:       0: IPL  1: SLW
-  // uint8_t      i_modeBuild:      0: HB/IPL  1: PHYP/Rebuild  2: SRAM
+  // uint8_t      i_modeBuild:      0: HB/IPL  1: PHYP/Rebuild  2: SRAM 
   // void         *i_buf1:          Temp buffer1 for dexed RS4 ring. Caller allocs/frees.
   // uint32_t     i_sizeBuf1:       Size of buf1.
   // void         *i_buf2:          Temp buffer2 for WF ring. Caller allocs/frees.
@@ -74,7 +67,7 @@ extern "C"
                                      void           *i_imageOut,
                                      uint32_t       &io_sizeImageOut,
                                      const uint8_t  i_sysPhase,
-                                     const uint8_t  i_modeBuild,
+                                     const uint8_t  i_modeBuild, 
                                      void           *i_buf1,
                                      const uint32_t i_sizeBuf1,
                                      void           *i_buf2,
diff --git a/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_xip_customize_errors.xml b/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_xip_customize_errors.xml
index a2684b907..aad8d4714 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_xip_customize_errors.xml
+++ b/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_xip_customize_errors.xml
@@ -20,7 +20,7 @@
 <!-- permissions and limitations under the License.                         -->
 <!--                                                                        -->
 <!-- IBM_PROLOG_END_TAG                                                     -->
-<!-- $Id: p8_xip_customize_errors.xml,v 1.20 2013/11/08 22:36:14 jeshua Exp $ -->
+<!-- $Id: p8_xip_customize_errors.xml,v 1.21 2014/05/28 15:31:56 cmolsen Exp $ -->
 <!-- Error definitions for p8_xip_customize procedure -->
 <hwpErrors>
   <!-- *********************************************************************** -->
@@ -32,6 +32,10 @@
     </description>
     <ffdc>DATA_IMG_SIZE_MAX</ffdc>
     <ffdc>DATA_IMG_SIZE_WORK_SPACE</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -42,6 +46,10 @@
     </description>
     <ffdc>DATA_IMG_SIZE</ffdc>
     <ffdc>DATA_IMG_SIZE_MAX</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -51,16 +59,10 @@
       Unable to obtain either image size or to validate image.
     </description>
     <ffdc>RC_LOCAL</ffdc>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROC_XIPC_IMAGE_SIZE_MISMATCH</rc>
-    <description>
-      Procedure: p8_xip_customize
-      Supplied image size differs from size in image header.
-    </description>
-    <ffdc>DATA_IMG_SIZE_INP</ffdc>
-    <ffdc>DATA_IMG_SIZE</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -70,6 +72,10 @@
       Unable to obtain either image size or to validate image in MS.
     </description>
     <ffdc>RC_LOCAL</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -80,6 +86,10 @@
     </description>
     <ffdc>DATA_IMG_SIZE_INP</ffdc>
     <ffdc>DATA_IMG_SIZE</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -90,6 +100,10 @@
     </description>
     <ffdc>DATA_BUF1_PTR</ffdc>
     <ffdc>DATA_BUF2_PTR</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -101,15 +115,10 @@
     <ffdc>DATA_BUF1_SIZE</ffdc>
     <ffdc>DATA_BUF2_SIZE</ffdc>
     <ffdc>DATA_BUF_SIZE_FIXED</ffdc>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROC_XIPC_IMAGE_UPDATE_ERROR</rc>
-    <description>
-      Procedure: p8_xip_customize
-      Error associated with updating mainstore image.
-    </description>
-    <ffdc>RC_LOCAL</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -119,6 +128,10 @@
       Expected field size of 4 bytes. Got something else from fapiGetMvpdField().
     </description>
     <ffdc>DATA_SIZE_VPD_FIELD</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -128,6 +141,10 @@
       Updating Scom NC table w/L2 or L3 data failed. Check rc code in p8_delta_scan_rw.h
     </description>
     <ffdc>RC_LOCAL</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -137,6 +154,10 @@
       Updating RAM table w/LPCR or HMEER RAM failed. Check rc code in p8_delta_scan_rw.h
     </description>
     <ffdc>RC_LOCAL</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -148,6 +169,10 @@
     <ffdc>DATA_ATTRIBUTE_RING_SIZE</ffdc>
     <ffdc>DATA_MAX_PLL_RING_SIZE</ffdc>
     <ffdc>DATA_SIZE_OF_BUF1</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -157,15 +182,10 @@
       Local IMGBUILD_xyz error from non-FAPI routine. Check rc code in p8_delta_scan_rw.h.
     </description>
     <ffdc>RC_LOCAL</ffdc>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROC_XIPC_XIP_FIND_ERROR</rc>
-    <description>
-      Procedure: p8_xip_customize
-      sbe_xip_find() failed w/local rc.
-    </description>
-    <ffdc>RC_LOCAL</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -175,6 +195,10 @@
       _rs4_compress() failed w/local rc.
     </description>
     <ffdc>RC_LOCAL</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -185,6 +209,10 @@
     </description>
     <ffdc>DATA_SIZE_RS4_COMPRESS_RETURN</ffdc>
     <ffdc>DATA_SIZE_RS4_COMPRESS_CONTAINER</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -194,6 +222,10 @@
       RS4 decompress address has illegal value.
     </description>
     <ffdc>DATA_RS4_DECOMPRESS_ADDR</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -203,6 +235,10 @@
       pore_inline_context_create failed w/local rc.
     </description>
     <ffdc>RC_LOCAL</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -212,6 +248,10 @@
       pore_MR/ADDS/LI/BRAD failed w/local rc.
     </description>
     <ffdc>RC_LOCAL</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -222,6 +262,10 @@
     </description>
     <ffdc>DATA_RING_BLOCK_SIZEOFTHIS</ffdc>
     <ffdc>DATA_SIZE_OF_BUF1</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -233,6 +277,10 @@
     <ffdc>DATA_SIZE_OF_RS4_LAUNCH</ffdc>
     <ffdc>DATA_RING_BLOCK_ENTRYOFFSET</ffdc>
     <ffdc>DATA_RING_BLOCK_SIZEOFTHIS</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -243,6 +291,10 @@
     </description>
     <ffdc>DATA_CHIPLET_ID_VPD</ffdc>
     <ffdc>DATA_CHIPLET_ID_REQ</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -253,6 +305,10 @@
     </description>
     <ffdc>DATA_RING_SIZE_REQ</ffdc>
     <ffdc>DATA_RING_SIZE_MAX</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -263,6 +319,10 @@
     </description>
     <ffdc>DATA_RING_SIZE_REQ</ffdc>
     <ffdc>DATA_RING_SIZE_MAX</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -272,6 +332,10 @@
       Invalid VPD type.
     </description>
     <ffdc>DATA_VPD_TYPE</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -281,6 +345,10 @@
       A keyword in the XIP image was not found.
     </description>
     <ffdc>RC_LOCAL</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -290,6 +358,10 @@
       Unable to resolve local vpd keyword to fapi-level mvpd keyword.
     </description>
     <ffdc>DATA_RING_LIST_VPD_KEYWORD</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -299,6 +371,10 @@
       Error occured during check_and_perform_ring_datacare()
     </description>
     <ffdc>RC_LOCAL</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -308,6 +384,10 @@
       Error occured during rs4_redundant()
     </description>
     <ffdc>RC_LOCAL</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -322,6 +402,10 @@
     <ffdc>RING_ID</ffdc>
     <ffdc>RING_SIZE</ffdc>
     <ffdc>IMAGE_SIZE</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -334,6 +418,10 @@
     <ffdc>MINIMUM</ffdc>
     <ffdc>DESIRED_CORES</ffdc>
     <ffdc>BOOT_CORE_MASK</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -347,6 +435,10 @@
     <ffdc>MINIMUM</ffdc>
     <ffdc>DESIRED_CORES</ffdc>
     <ffdc>BOOT_CORE_MASK</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -356,6 +448,10 @@
       Error occured during write_vpd_ring_to_ipl_image()
     </description>
     <ffdc>RC_LOCAL</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -365,6 +461,10 @@
       Error occured during write_vpd_ring_to_slw_image()
     </description>
     <ffdc>RC_LOCAL</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -374,6 +474,10 @@
       sbe_xip_delete_section() failed w/local rc.
     </description>
     <ffdc>RC_LOCAL</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -383,6 +487,10 @@
       Error associated with creating and initializing fixed image and fixed .slw and .ffdc sections.
     </description>
     <ffdc>RC_LOCAL</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -393,6 +501,10 @@
     </description>
     <ffdc>DATA_IMG_SIZE_NEW</ffdc>
     <ffdc>DATA_IMG_SIZE_MAX</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
@@ -402,22 +514,22 @@
       Error associated with adding empty SLW section for ram and scom tables.
     </description>
     <ffdc>RC_LOCAL</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
   <hwpError>
     <rc>RC_PROC_XIPC_BAD_CODE_OR_PARM</rc>
     <description>
       Procedure: p8_xip_customize
-      Shouldn't be in this code section or invalid parm.
+      Shouldn't be in this code section or invalid modeBuild parm.
     </description>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROC_XIPC_UNKNOWN_ERROR</rc>
-    <description>
-      Procedure: p8_xip_customize
-      Unknown error. (Shouldn't be in this code section.)
-    </description>
-    <ffdc>RC_LOCAL</ffdc>
+    <ffdc>MODE_BUILD</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
 </hwpErrors>
diff --git a/src/usr/hwpf/hwp/sbe_centaur_init/cen_xip_customize_errors.xml b/src/usr/hwpf/hwp/sbe_centaur_init/cen_xip_customize_errors.xml
index 578906b6e..8d33b064b 100644
--- a/src/usr/hwpf/hwp/sbe_centaur_init/cen_xip_customize_errors.xml
+++ b/src/usr/hwpf/hwp/sbe_centaur_init/cen_xip_customize_errors.xml
@@ -20,7 +20,7 @@
 <!-- permissions and limitations under the License.                         -->
 <!--                                                                        -->
 <!-- IBM_PROLOG_END_TAG                                                     -->
-<!-- $Id: cen_xip_customize_errors.xml,v 1.3 2014/05/13 13:34:01 jmcgill Exp $ -->
+<!-- $Id: cen_xip_customize_errors.xml,v 1.4 2014/05/28 15:50:19 cmolsen Exp $ -->
 <!-- Error definitions for proc_slw_build procedure -->
 <hwpErrors>
 <!-- *********************************************************************** -->
@@ -28,6 +28,10 @@
   <rc>RC_CEN_XIPC_UNSPECIFIED_IMAGE_ERR</rc>
   <description>Unspecified image error. Check sbe_xip_image.h for meaning of local rcLoc.</description>
   <ffdc>RC_LOCAL</ffdc>
+  <callout>
+    <procedure>CODE</procedure>
+    <priority>HIGH</priority>
+  </callout>
 </hwpError>
 <!-- *********************************************************************** -->
 <hwpError>
@@ -35,6 +39,10 @@
   <description>Supplied image size differs from size in image header in MS.</description>
   <ffdc>DATA_IMG_SIZE_INP</ffdc>
   <ffdc>DATA_IMG_SIZE</ffdc>
+  <callout>
+    <procedure>CODE</procedure>
+    <priority>HIGH</priority>
+  </callout>
 </hwpError>
 <!-- *********************************************************************** -->
 <hwpError>
@@ -42,20 +50,32 @@
   <description>PLL ring size returned from attribute is too large.</description>
   <ffdc>DATA_ATTRIBUTE_RING_SIZE</ffdc>
   <ffdc>DATA_MAX_PLL_RING_SIZE</ffdc>
-        <ffdc>DATA_SIZE_OF_BUF1</ffdc>
+  <ffdc>DATA_SIZE_OF_BUF1</ffdc>
+  <callout>
+    <procedure>CODE</procedure>
+    <priority>HIGH</priority>
+  </callout>
 </hwpError>
 <!-- *********************************************************************** -->
 <hwpError>
   <rc>RC_CEN_XIPC_IMGBUILD_ERROR</rc>
   <description>Local IMGBUILD_xyz error from non-FAPI image build routine. Check rcLoc code in p8_delta_scan_rw.h.</description>
   <ffdc>RC_LOCAL</ffdc>
+  <callout>
+    <procedure>CODE</procedure>
+    <priority>HIGH</priority>
+  </callout>
 </hwpError>
 <!-- *********************************************************************** -->
 <hwpError>
   <rc>RC_CEN_XIPC_PLL_RING_BLOCK_TOO_LARGE</rc>
   <description>PLL ring block is too large.</description>
   <ffdc>DATA_RING_BLOCK_SIZEOFTHIS</ffdc>
-        <ffdc>DATA_SIZE_OF_BUF1</ffdc>
+  <ffdc>DATA_SIZE_OF_BUF1</ffdc>
+  <callout>
+    <procedure>CODE</procedure>
+    <priority>HIGH</priority>
+  </callout>
 </hwpError>
 <!-- *********************************************************************** -->
 <hwpError>
@@ -63,12 +83,20 @@
   <description>Problem with WF PLL ring block alignment.</description>
   <ffdc>DATA_RING_BLOCK_ENTRYOFFSET</ffdc>
   <ffdc>DATA_RING_BLOCK_SIZEOFTHIS</ffdc>
+  <callout>
+    <procedure>CODE</procedure>
+    <priority>HIGH</priority>
+  </callout>
 </hwpError>
 <!-- *********************************************************************** -->
 <hwpError>
   <rc>RC_CEN_XIPC_KEYWORD_NOT_FOUND_ERROR</rc>
   <description>A keyword in the XIP image was not found.</description>
   <ffdc>RC_LOCAL</ffdc>
+  <callout>
+    <procedure>CODE</procedure>
+    <priority>HIGH</priority>
+  </callout>
 </hwpError>
 <!-- *********************************************************************** -->
 </hwpErrors>