HWP: integrate new version of proc_chiplet_scominit into Hostboot

Change-Id: I7253d1a10a90f66a6fd9dd3280cb2aa3744bdbef
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/1844
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

7 files changed, 359 insertions, 122 deletions

diff --git a/src/usr/hwpf/hwp/initfiles/p8.fbc.define b/src/usr/hwpf/hwp/initfiles/p8.fbc.define
new file mode 100644
index 000000000..930238b3e
--- /dev/null
+++ b/src/usr/hwpf/hwp/initfiles/p8.fbc.define
@@ -0,0 +1,60 @@
+#-- $Id: p8.fbc.define,v 1.3 2012/08/21 03:33:40 jmcgill Exp $
+#-------------------------------------------------------------------------------
+#--
+#-- (C) Copyright International Business Machines Corp. 2011
+#-- All Rights Reserved -- Property of IBM
+#-- *** IBM Confidential ***
+#--
+#-- TITLE       : p8.fbc.define
+#-- DESCRIPTION : Register field/bit definitions for fabric initfile
+#--
+#-- OWNER NAME  : Joe McGill              Email: jmcgill@us.ibm.com
+#--------------------------------------------------------------------------------
+
+#-- PB Mode Register (PB_MODE / 0x02010C[048]A)
+define chip_is_system = 4;
+define avp_mode = 6;
+define sw_ab_wait = 12:15;
+define sp_hw_mark = 16:21;
+define gp_hw_mark = 22:27;
+define lcl_hw_mark = 28:33;
+define e2e_hw_mark = 34:40;
+define fp_hw_mark = 41:46;
+define switch_option_ab = 59;
+define cpu_ratio_override = 60:62;
+
+#-- PB Trace Array Select Configuration Register (PB_EVENT_TRACE / 0x02010C4F)
+define sn0_select = 0:1;
+define sn1_select = 2:3;
+define cr0_select = 4:5;
+define cr1_select = 6:7;
+define rt0_select = 8:9;
+define rt1_select = 10:12;
+define dat_select = 13:18;
+
+#-- PB Node Master Power Management Counter Register (PB_NMPM_COUNTER / 0x2010C50)
+define apm_en = 0;
+define pmucnt_en = 3;
+define pmucnt_sel = 4:5;
+
+#-- MCD Debug Configuration Register (MCD_DBG / 0x02013416)
+define mcd_debug_enable = 3;
+define mcd_debug_select = 4:7;
+
+#-- PB X Link Mode Register (PB_X_MODE / 0x04010C0A)
+define x_avp_mode = 0;
+define x_4b_mode = 1;
+
+#-- PB A Link Mode Register (PB_IOA_MODE / 0x0801080A)
+define a_avp_mode = 0;
+
+#-- PB A Link Framer Configuration Register (PB_IOA_FMR_CFG / 0x08010813)
+define a_ow_pack = 24;
+define a_ow_pack_priority = 25;
+
+#-- PB IOF Link Mode Register (PB_IOF_MODE / 0x0901080A)
+define f_avp_mode = 0;
+
+#-- PB F Link Framer Configuration Register (PB_IOF_FMR_CFG / 0x09010813)
+define f_ow_pack = 20;
+define f_ow_pack_priority = 21;
diff --git a/src/usr/hwpf/hwp/initfiles/p8.fbc.scom.initfile b/src/usr/hwpf/hwp/initfiles/p8.fbc.scom.initfile
new file mode 100644
index 000000000..3a7ce0d89
--- /dev/null
+++ b/src/usr/hwpf/hwp/initfiles/p8.fbc.scom.initfile
@@ -0,0 +1,107 @@
+#-- $Id: p8.fbc.scom.initfile,v 1.3 2012/08/21 03:33:42 jmcgill Exp $
+#-------------------------------------------------------------------------------
+#--
+#-- (C) Copyright International Business Machines Corp. 2011
+#-- All Rights Reserved -- Property of IBM
+#-- *** IBM Confidential ***
+#--
+#-- TITLE       : p8.fbc.scom.initfile
+#-- DESCRIPTION : Perform fabric configuration
+#--
+#-- OWNER NAME  : Joe McGill              Email: jmcgill@us.ibm.com
+#--
+#--------------------------------------------------------------------------------
+
+SyntaxVersion = 1
+
+#--------------------------------------------------------------------------------
+#-- Includes
+#--------------------------------------------------------------------------------
+include p8.fbc.define
+
+#--------------------------------------------------------------------------------
+#-- Defines
+#--------------------------------------------------------------------------------
+
+#define def_x_is_4b = (SYS.ATTR_PROC_X_BUS_WIDTH == ENUM_ATTR_PROC_X_BUS_WIDTH_W4BYTE);
+define def_x_is_4b = (0 == ENUM_ATTR_PROC_X_BUS_WIDTH_W4BYTE);
+
+
+#--------------------------------------------------------------------------------
+#-- SCOM initializations
+#--------------------------------------------------------------------------------
+
+#-- PB Mode Register (PB_MODE / 0x02010C[048]A)
+scom 0x02010C(0,4,8)A {
+    bits,                       scom_data;
+    chip_is_system,             0b1;                                    #-- single chip
+    avp_mode,                   0b0;                                    #-- AVP mode (TODO: link to attribute)
+    sw_ab_wait,                 0x0;                                    #-- no delay
+    sp_hw_mark,                 0x20;                                   #-- 32
+    gp_hw_mark,                 0x20;                                   #-- 32
+    lcl_hw_mark,                0x20;                                   #-- 32
+    e2e_hw_mark,                0x40;                                   #-- 64
+    fp_hw_mark,                 0x20;                                   #-- 32
+    switch_option_ab,           0b0;                                    #-- no switch CD on switch AB
+    cpu_ratio_override,         0b000;                                  #-- rcmd queue depth = 16
+}
+
+#-- PB Trace Array Select Configuration Register (PB_EVENT_TRACE / 0x02010C4F)
+scom 0x02010C4F {
+    bits,                       scom_data;
+    sn0_select,                 0b10;                                   #-- rcmd 0
+    sn1_select,                 0b10;                                   #-- rcmd 1
+    cr0_select,                 0b10;                                   #-- cresp 0 / presp 0
+    cr1_select,                 0b10;                                   #-- cresp 1 / presp 1
+    rt0_select,                 0b10;                                   #-- rtag NW
+    rt1_select,                 0b001;                                  #-- MCD
+    dat_select,                 0b000000;                               #-- none
+}
+
+#-- PB Node Master Power Management Counter Register (PB_NMPM_COUNTER / 0x2010C50)
+scom 0x02010C50 {
+    bits,                       scom_data;
+    apm_en,                     0b0;                                    #-- set shared counters to PMU mode
+    pmucnt_en,                  0b1;                                    #-- set shared counters to PMU mode
+    pmucnt_sel,                 0b11;                                   #-- PMU counter select = rcmd 0 OR rcmd 1
+}
+
+#-- MCD Debug Configuration Register (MCD_DBG / 0x02013416)
+scom 0x02013416 {
+    bits,                       scom_data;
+    mcd_debug_enable,           0b1;                                    #-- enable debug clocks
+    mcd_debug_select,           0b1000;                                 #-- default debug bus select
+}
+
+#-- PB X Link Mode Register (PB_X_MODE / 0x04010C0A)
+scom 0x04010C0A {
+    bits,                       scom_data,          expr;
+    x_avp_mode,                 0b0,                any;                #-- X AVP mode (TODO: link to attribute)
+    x_4b_mode,                  0b1,                (def_x_is_4b);      #-- X bus 4/8B switch
+}
+
+#-- PB A Link Mode Register (PB_IOA_MODE / 0x0801080A)
+scom 0x0801080A {
+    bits,                       scom_data;
+    a_avp_mode,                 0b0;                                    #-- A AVP mode (TODO: link to attribute)
+}
+
+#-- PB A Link Framer Configuration Register (PB_IOA_FMR_CFG / 0x08010813)
+scom 0x08010813 {
+    bits,                       scom_data;
+    a_ow_pack,                  0b0;                                    #-- OW pack disabled
+    a_ow_pack_priority,         0b0;                                    #-- low priority
+}
+
+#-- PB F Link Mode Register (PB_IOF_MODE / 0x0901080A)
+scom 0x0901080A {
+    bits,                       scom_data;
+    f_avp_mode,                 0b0;                                    #-- F AVP mode (TODO: link to attribute)
+}
+
+#-- PB F Link Framer Configuration Register (PB_IOF_FMR_CFG / 0x09010813)
+scom 0x09010813 {
+    bits,                       scom_data;
+    f_ow_pack,                  0b0;                                    #-- OW pack disabled
+    f_ow_pack_priority,         0b0;                                    #-- low priority
+}
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 6d47d0e70..866b67b76 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
@@ -1,71 +1,102 @@
-/*  IBM_PROLOG_BEGIN_TAG
- *  This is an automatically generated prolog.
- *
- *  $Source: src/usr/hwpf/hwp/nest_chiplets/proc_chiplet_scominit/proc_chiplet_scominit.C $
- *
- *  IBM CONFIDENTIAL
- *
- *  COPYRIGHT International Business Machines Corp. 2012
- *
- *  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 other-
- *  wise divested of its trade secrets, irrespective of what has
- *  been deposited with the U.S. Copyright Office.
- *
- *  Origin: 30
- *
- *  IBM_PROLOG_END_TAG
- */
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/hwpf/hwp/nest_chiplets/proc_chiplet_scominit/proc_chiplet_scominit.C $ */
+/*                                                                        */
+/* IBM CONFIDENTIAL                                                       */
+/*                                                                        */
+/* COPYRIGHT International Business Machines Corp. 2012                   */
+/*                                                                        */
+/* 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_chiplet_scominit.C,v 1.5 2012/08/11 03:43:10 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
 // *! All Rights Reserved -- Property of IBM
 // *! *** IBM Confidential ***
 //------------------------------------------------------------------------------
 // *! TITLE       : proc_chiplet_scominit.C
-// *! DESCRIPTION : Wrapper HWP that invokes the proc_chiplet_scominit initfiles
+// *! DESCRIPTION : Invoke initfiles for proc_chiplet_scominit istep (FAPI)
+// *!
 // *! OWNER NAME  : Mike Jones        Email: mjjones@us.ibm.com
-// *! BACKUP NAME : Mark Bellows      Email: bellows@us.ibm.com
+// *! BACKUP NAME : Joe McGill        Email: jmcgill@us.ibm.com
+// *!
 // *! ADDITIONAL COMMENTS :
-//
-// The purpose of this procedure execute memory initfiles in proper sequence.
-//
+// *!
 //------------------------------------------------------------------------------
-// Don't forget to create CVS comments when you check in your changes!
-//------------------------------------------------------------------------------
-// CHANGE HISTORY:
-//------------------------------------------------------------------------------
-// Version:|  Author: |  Date:  | Comment:
-//---------|----------|---------|-----------------------------------------------
-//   1.2   | mjjones  |26-JUN-12| Initial version
-//   1.3   | mjjones  |05-JUL-12| Removed DMI initfiles from here
-
-//----------------------------------------------------------------------
-//  My Includes
-//----------------------------------------------------------------------
-#include <proc_chiplet_scominit.H>
 
-//----------------------------------------------------------------------
+//------------------------------------------------------------------------------
 //  Includes
-//----------------------------------------------------------------------
+//------------------------------------------------------------------------------
 #include <fapiHwpExecInitFile.H>
+#include <proc_chiplet_scominit.H>
 
 extern "C" {
 
+//------------------------------------------------------------------------------
+// Function definitions
+//------------------------------------------------------------------------------
+
+// HWP entry point, comments in header
 fapi::ReturnCode proc_chiplet_scominit(const fapi::Target & i_target)
 {
-    FAPI_INF("Performing HWP: proc_chiplet_scominit on %s",
-             i_target.toEcmdString());
-    
-    fapi::ReturnCode l_rc;
+    fapi::ReturnCode rc;
+    fapi::TargetType target_type;
+    std::vector<fapi::Target> targets;
 
-    // This is a stub for now, initfiles will be invoked as and when needed
+    // mark HWP entry
+    FAPI_INF("proc_chiplet_scominit: Start");
 
-	return l_rc;
+    do
+    {
+        // obtain target type to determine which initfile(s) to execute
+        target_type = i_target.getType();
+        targets.push_back(i_target);
+
+        // chip level target
+        if (target_type == fapi::TARGET_TYPE_PROC_CHIP)
+        {
+            // execute FBC initfile
+            FAPI_INF("proc_chiplet_scominit: Executing %s on %s",
+                     PROC_CHIPLET_SCOMINIT_FBC_IF, i_target.toEcmdString());
+            FAPI_EXEC_HWP(
+                rc,
+                fapiHwpExecInitFile,
+                targets,
+                PROC_CHIPLET_SCOMINIT_FBC_IF);
+            if (!rc.ok())
+            {
+                FAPI_ERR("proc_chiplet_scominit: Error from fapiHwpExecInitfile executing %s on %s",
+                         PROC_CHIPLET_SCOMINIT_FBC_IF,
+                         i_target.toEcmdString());
+                break;
+            }
+        }
+        // unsupported target type
+        else
+        {
+            FAPI_ERR("proc_chiplet_scominit: Unsupported target type");
+            FAPI_SET_HWP_ERROR(rc, RC_PROC_CHIPLET_SCOMINIT_INVALID_TARGET);
+            break;
+        }
+    } while(0);
+
+    // mark HWP exit
+    FAPI_INF("proc_chiplet_scominit: End");
+    return rc;
 }
 
+
 } // extern "C"
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 dd6965e1a..c77eedf29 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
@@ -1,78 +1,85 @@
-/*  IBM_PROLOG_BEGIN_TAG
- *  This is an automatically generated prolog.
- *
- *  $Source: src/usr/hwpf/hwp/nest_chiplets/proc_chiplet_scominit/proc_chiplet_scominit.H $
- *
- *  IBM CONFIDENTIAL
- *
- *  COPYRIGHT International Business Machines Corp. 2012
- *
- *  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 other-
- *  wise divested of its trade secrets, irrespective of what has
- *  been deposited with the U.S. Copyright Office.
- *
- *  Origin: 30
- *
- *  IBM_PROLOG_END_TAG
- */
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/hwpf/hwp/nest_chiplets/proc_chiplet_scominit/proc_chiplet_scominit.H $ */
+/*                                                                        */
+/* IBM CONFIDENTIAL                                                       */
+/*                                                                        */
+/* COPYRIGHT International Business Machines Corp. 2012                   */
+/*                                                                        */
+/* 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_chiplet_scominit.H,v 1.6 2012/08/11 03:43:12 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
 // *! All Rights Reserved -- Property of IBM
 // *! *** IBM Confidential ***
 //------------------------------------------------------------------------------
 // *! TITLE       : proc_chiplet_scominit.H
-// *! DESCRIPTION : Wrapper HWP that invokes the proc_chiplet_scominit initfiles
+// *! DESCRIPTION : Invoke initfiles for proc_chiplet_scominit istep (FAPI)
+// *!
 // *! OWNER NAME  : Mike Jones        Email: mjjones@us.ibm.com
-// *! BACKUP NAME : Mark Bellows      Email: bellows@us.ibm.com
+// *! BACKUP NAME : Joe McGill        Email: jmcgill@us.ibm.com
+// *!
 // *! ADDITIONAL COMMENTS :
-//
-// Header file for proc_chiplet_scominit.
-//
-//------------------------------------------------------------------------------
-// Don't forget to create CVS comments when you check in your changes!
-//------------------------------------------------------------------------------
-// CHANGE HISTORY:
+// *!
 //------------------------------------------------------------------------------
-// Version:|  Author: |  Date:  | Comment:
-//---------|----------|---------|-----------------------------------------------
-//   1.3   | mjjones  |26-JUN-12| Initial version
-//   1.4   | mjjones  |05-JUL-12| Removed DMI initfiles from here
-
 
 #ifndef PROC_CHIPLET_SCOMINIT_H_
 #define PROC_CHIPLET_SCOMINIT_H_
 
-//----------------------------------------------------------------------
-//  My Includes
-//----------------------------------------------------------------------
-
-//----------------------------------------------------------------------
-//  Includes
-//----------------------------------------------------------------------
+//------------------------------------------------------------------------------
+// Includes
+//------------------------------------------------------------------------------
 #include <fapi.H>
 
-typedef fapi::ReturnCode (*proc_chiplet_scominit_FP_t)(const fapi::Target & i_target);
+//------------------------------------------------------------------------------
+// Constant definitions
+//------------------------------------------------------------------------------
+
+const char * const PROC_CHIPLET_SCOMINIT_FBC_IF = "p8.fbc.scom.if";
+
+//------------------------------------------------------------------------------
+// Structure definitions
+//------------------------------------------------------------------------------
+
+// function pointer typedef definition for HWP call support
+typedef fapi::ReturnCode
+(*proc_chiplet_scominit_FP_t)(const fapi::Target & i_target);
 
 extern "C" {
 
+//------------------------------------------------------------------------------
+// Function prototypes
+//------------------------------------------------------------------------------
+
 /**
- * @brief HWP that calls the proc_chiplet_scominit initfiles
- * 
+ * @brief HWP which invokes initfiles for proc_chiplet_scominit istep
+ *
  * Should be called with all functional proc chips. It invokes initfiles
  * on chiplets.
- * 
- * @param[in] i_target Reference to PROC_CHIP target
+ *
+ * @param[in] i_target Reference to target
+ *                     If TARGET_TYPE_PROC_CHIP, calls:
+ *                     - p8.fbc.scom.initfile
  *
  * @return ReturnCode
  */
 fapi::ReturnCode proc_chiplet_scominit(const fapi::Target & i_target);
 
+
 } // extern "C"
 
 #endif // PROC_CHIPLET_SCOMINIT_H_
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
new file mode 100644
index 000000000..5af51a27d
--- /dev/null
+++ b/src/usr/hwpf/hwp/nest_chiplets/proc_chiplet_scominit/proc_chiplet_scominit_errors.xml
@@ -0,0 +1,30 @@
+<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
+<!-- This is an automatically generated prolog.                             -->
+<!--                                                                        -->
+<!-- $Source: src/usr/hwpf/hwp/nest_chiplets/proc_chiplet_scominit/proc_chiplet_scominit_errors.xml $ -->
+<!--                                                                        -->
+<!-- IBM CONFIDENTIAL                                                       -->
+<!--                                                                        -->
+<!-- COPYRIGHT International Business Machines Corp. 2012                   -->
+<!--                                                                        -->
+<!-- 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                                                     -->
+<!-- Error definitions for proc_chiplet_scominit procedure -->
+<hwpErrors>
+  <!-- *********************************************************************** -->
+  <hwpError>
+    <rc>RC_PROC_CHIPLET_SCOMINIT_INVALID_TARGET</rc>
+    <description>Invalid target type presented to proc_chiplet_scominit HWP (expects TARGET_TYPE_PROC_CHIP).</description>
+  </hwpError>
+</hwpErrors>
diff --git a/src/usr/hwpf/makefile b/src/usr/hwpf/makefile
index 8fb57a76c..013fc3ab8 100644
--- a/src/usr/hwpf/makefile
+++ b/src/usr/hwpf/makefile
@@ -44,6 +44,7 @@ HWP_ERROR_XML_FILES = hwp/fapiHwpErrorInfo.xml   \
     hwp/dram_initialization/proc_setup_bars/proc_fab_smp_errors.xml     \
     hwp/build_winkle_images/proc_set_pore_bar/proc_set_pore_bar_errors.xml  \
     hwp/build_winkle_images/proc_pba_bar_config/proc_pba_bar_config_errors.xml \
+    hwp/nest_chiplets/proc_chiplet_scominit/proc_chiplet_scominit_errors.xml \
     hwp/nest_chiplets/proc_a_x_pci_dmi_pll_setup_errors.xml \
     hwp/core_activate/proc_prep_master_winkle/proc_prep_master_winkle_errors.xml \
     hwp/core_activate/proc_stop_deadman_timer/proc_stop_deadman_timer_errors.xml
@@ -76,7 +77,8 @@ HWP_INITFILES = hwp/initfiles/sample.initfile \
                 hwp/initfiles/p8.dmi.scom.initfile \
                 hwp/initfiles/mbs_def.initfile \
                 hwp/initfiles/mba_def.initfile \
-                hwp/initfiles/cen_ddrphy.initfile
+                hwp/initfiles/cen_ddrphy.initfile \
+                hwp/initfiles/p8.fbc.scom.initfile
 
 HWP_IF_DEFINE_DIR = hwp/initfiles
 
diff --git a/src/usr/hwpf/plat/fapiPlatCreateHwpRcDecoder.pl b/src/usr/hwpf/plat/fapiPlatCreateHwpRcDecoder.pl
index c5b3b7e51..a73a1dd77 100755
--- a/src/usr/hwpf/plat/fapiPlatCreateHwpRcDecoder.pl
+++ b/src/usr/hwpf/plat/fapiPlatCreateHwpRcDecoder.pl
@@ -1,26 +1,26 @@
 #!/usr/bin/perl
-#  IBM_PROLOG_BEGIN_TAG
-#  This is an automatically generated prolog.
-#
-#  $Source: src/usr/hwpf/plat/fapiPlatCreateHwpRcDecoder.pl $
-#
-#  IBM CONFIDENTIAL
-#
-#  COPYRIGHT International Business Machines Corp. 2012
-#
-#  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 other-
-#  wise divested of its trade secrets, irrespective of what has
-#  been deposited with the U.S. Copyright Office.
-#
-#  Origin: 30
-#
-#  IBM_PROLOG_END
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+# 
+# $Source: src/usr/hwpf/plat/fapiPlatCreateHwpRcDecoder.pl $
+# 
+# IBM CONFIDENTIAL
+# 
+# COPYRIGHT International Business Machines Corp. 2012
+# 
+# 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 
 
 #
 # Purpose:  This perl script will parse HWP Error XML files and create a
@@ -48,7 +48,7 @@ if ($numArgs < 2)
 #------------------------------------------------------------------------------
 use Digest::MD5 qw(md5_hex);
 use XML::Simple;
-my $xml = new XML::Simple (KeyAttr=>[]);
+my $xml = new XML::Simple (ForceArray=>[qw(hwpError)]);
 
 # Uncomment to enable debug output
 #use Data::Dumper;