INITPROC: Hostboot - SW249688 RAS misc 1

Change-Id: Ie85a55f5684f414e44db6b403cdc12ae7768ef4a
CQ:SW249688
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/9734
Tested-by: Jenkins Server
Reviewed-by: STEPHEN M. CPREK <smcprek@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

6 files changed, 46 insertions, 58 deletions

diff --git a/src/usr/hwpf/hwp/build_winkle_images/p8_block_wakeup_intr/p8_block_wakeup_intr_errors.xml b/src/usr/hwpf/hwp/build_winkle_images/p8_block_wakeup_intr/p8_block_wakeup_intr_errors.xml
index afc58385d..e369c3ed8 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/p8_block_wakeup_intr/p8_block_wakeup_intr_errors.xml
+++ b/src/usr/hwpf/hwp/build_winkle_images/p8_block_wakeup_intr/p8_block_wakeup_intr_errors.xml
@@ -5,7 +5,7 @@
 <!--                                                                        -->
 <!-- IBM CONFIDENTIAL                                                       -->
 <!--                                                                        -->
-<!-- COPYRIGHT International Business Machines Corp. 2013                   -->
+<!-- COPYRIGHT International Business Machines Corp. 2013,2014              -->
 <!--                                                                        -->
 <!-- p1                                                                     -->
 <!--                                                                        -->
@@ -20,7 +20,7 @@
 <!-- Origin: 30                                                             -->
 <!--                                                                        -->
 <!-- IBM_PROLOG_END_TAG                                                     -->
-<!-- $Id: p8_block_wakeup_intr_errors.xml,v 1.1 2013/08/27 16:14:07 stillgs Exp $ -->
+<!-- $Id: p8_block_wakeup_intr_errors.xml,v 1.3 2014/02/27 03:45:05 stillgs Exp $ -->
 <!-- Error definitions for p8_block_wakeup_intr procedure -->
 <hwpErrors>
   <!-- *********************************************************************** -->
@@ -28,7 +28,11 @@
     <rc>RC_PROCPM_BLKWKUP_CODE_BAD_OP</rc>
     <description>An invalid operation (eg besides Set or Clear ENUM) was passed to p8_block_wakeup_intr</description>
     <ffdc>EX_TARGET</ffdc>
-   <ffdc>OPERATION</ffdc>
+    <ffdc>OPERATION</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- *********************************************************************** -->
 </hwpErrors>
diff --git a/src/usr/hwpf/hwp/mc_config/mss_eff_config/opt_memmap_errors.xml b/src/usr/hwpf/hwp/mc_config/mss_eff_config/opt_memmap_errors.xml
index c87ce3f27..038909d21 100644
--- a/src/usr/hwpf/hwp/mc_config/mss_eff_config/opt_memmap_errors.xml
+++ b/src/usr/hwpf/hwp/mc_config/mss_eff_config/opt_memmap_errors.xml
@@ -5,7 +5,7 @@
 <!--                                                                        -->
 <!-- IBM CONFIDENTIAL                                                       -->
 <!--                                                                        -->
-<!-- COPYRIGHT International Business Machines Corp. 2013                   -->
+<!-- COPYRIGHT International Business Machines Corp. 2013,2014              -->
 <!--                                                                        -->
 <!-- p1                                                                     -->
 <!--                                                                        -->
@@ -20,6 +20,7 @@
 <!-- Origin: 30                                                             -->
 <!--                                                                        -->
 <!-- IBM_PROLOG_END_TAG                                                     -->
+<!-- $Id: opt_memmap_errors.xml,v 1.4 2014/02/28 15:27:39 jmcgill Exp $ -->
 <!-- Error definitions for proc_setup_bars -->
 <hwpErrors>
   <!-- *********************************************************************** -->
@@ -27,38 +28,19 @@
     <rc>RC_OPT_MEMMAP_MEM_BASE_ERR</rc>
     <description>Unexpected value for ATTR_PROC_MEM_BASE returned after mss_eff_grouping execution.</description>
     <ffdc>ADDR</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
+  
   <hwpError>
     <rc>RC_OPT_MEMMAP_MIRROR_BASE_ERR</rc>
     <description>Unexpected value for ATTR_PROC_MIRROR_BASE returned after mss_eff_grouping execution.</description>
     <ffdc>ADDR</ffdc>
-  </hwpError>
-  <hwpError>
-    <rc>RC_OPT_MEMMAP_NON_MIRROR_GROUP_ERR</rc>
-    <description>Inconsistent non-mirrored group content.</description>
-    <ffdc>GROUP</ffdc>
-    <ffdc>MEM_BASES</ffdc>
-    <ffdc>MEM_SIZES</ffdc>
-    <ffdc>GROUP_BASE</ffdc>
-    <ffdc>GROUP_SIZE</ffdc>
-  </hwpError>
-  <hwpError>
-    <rc>RC_OPT_MEMMAP_MIRROR_GROUP_ERR</rc>
-    <description>Inconsistent mirrored group content.</description>
-    <ffdc>GROUP</ffdc>
-    <ffdc>MIRROR_BASES</ffdc>
-    <ffdc>MIRROR_SIZES</ffdc>
-    <ffdc>GROUP_BASE</ffdc>
-    <ffdc>GROUP_SIZE</ffdc>
-  </hwpError>
-  <hwpError>
-    <rc>RC_OPT_MEMMAP_GROUP_PARTNER_ERR</rc>
-    <description>Unable to find find non-mirrored group partner for mirrored group.</description>
-    <ffdc>GROUP</ffdc>
-  </hwpError>
-  <hwpError>
-    <rc>RC_OPT_MEMMAP_ALLOC_ERR</rc>
-    <description>Unable to satisfy allocatio request based on available free memory on this chip.</description>
-    <ffdc>ALLOC_INDEX</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
 </hwpErrors>
diff --git a/src/usr/hwpf/hwp/pstates/pstates/lab_pstates.c b/src/usr/hwpf/hwp/pstates/pstates/lab_pstates.c
index fe545b7a5..5c1f442d6 100755
--- a/src/usr/hwpf/hwp/pstates/pstates/lab_pstates.c
+++ b/src/usr/hwpf/hwp/pstates/pstates/lab_pstates.c
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2013                   */
+/* COPYRIGHT International Business Machines Corp. 2013,2014              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: lab_pstates.c,v 1.8 2013/08/13 17:12:54 jimyac Exp $
+// $Id: lab_pstates.c,v 1.9 2014/02/21 03:02:20 jmcgill Exp $
 
 /// \file lab_pstates.c
 /// \brief Lab-only (as opposed to product-procedure) support for Pstates.
@@ -538,7 +538,7 @@ cpmrange_print(FILE* stream, CpmPstateModeRanges* cpmrange)
     fprintf(stream, "Valid Number of CPM Pstate Ranges : %u\n", 
             cpmrange->validRanges);
             
-    for (i == 0; i < 8; i++) {        
+    for (i = 0; i < 8; i++) {        
       fprintf(stream, "  CPM Range %d Pstate : %d\n", 
               i, cpmrange->inflectionPoint[i]);
     }
diff --git a/src/usr/hwpf/hwp/pstates/pstates/pstates.c b/src/usr/hwpf/hwp/pstates/pstates/pstates.c
index 8ef039c56..d14d45d76 100755
--- a/src/usr/hwpf/hwp/pstates/pstates/pstates.c
+++ b/src/usr/hwpf/hwp/pstates/pstates/pstates.c
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2013                   */
+/* COPYRIGHT International Business Machines Corp. 2013,2014              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: pstates.c,v 1.6 2013/09/17 16:36:39 jimyac Exp $
+// $Id: pstates.c,v 1.7 2014/02/18 16:07:35 jimyac Exp $
 
 /// \file pstates.c
 /// \brief Pstate routines required by OCC product firmware
@@ -237,10 +237,6 @@ gpst_entry(const GlobalPstateTable *gpst,
     int rc, index;
     Pstate biased_pstate;
 
-// jwy    if (SSX_ERROR_CHECK_API) {
-// jwy      SSX_ERROR_IF(gpst == 0, GPST_INVALID_OBJECT);
-// jwy    }
-
     if (gpst == 0) {
         return -GPST_INVALID_OBJECT;
     }
@@ -327,11 +323,7 @@ gpst_vdd2pstate(const GlobalPstateTable* gpst,
     size_t i;
     int rc;
     gpst_entry_t         entry_rev;       // jwy
-    
-    
-// jwy     if (SSX_ERROR_CHECK_API) {
-// jwy     SSX_ERROR_IF(gpst == 0, GPST_INVALID_OBJECT);
-// jwy     }
+  
 
     if (gpst == 0) {
          return -GPST_INVALID_OBJECT;
@@ -347,7 +339,6 @@ gpst_vdd2pstate(const GlobalPstateTable* gpst,
         for (i = 0; i < gpst->entries; i++) {
             entry_rev.value = revle64(gpst->pstate[i].value);       // jwy
 
-// jwy            if (gpst->pstate[i].fields.evid_vdd <= vdd) {
             if (entry_rev.fields.evid_vdd <= vdd) {                 // jwy
                 break;
             }
@@ -359,7 +350,6 @@ gpst_vdd2pstate(const GlobalPstateTable* gpst,
             *entry = gpst->pstate[i - 1];
             rc = -GPST_PSTATE_CLIPPED_HIGH;
 
-// jwy        } else if ((i == 0) && (gpst->pstate[i].fields.evid_vdd < vdd)) {
         } else if ((i == 0) && (entry_rev.fields.evid_vdd < vdd)) {
 
             *pstate = gpst_pmin(gpst);
diff --git a/src/usr/hwpf/hwp/slave_sbe/proc_cen_ref_clk_enable/proc_cen_ref_clk_enable.C b/src/usr/hwpf/hwp/slave_sbe/proc_cen_ref_clk_enable/proc_cen_ref_clk_enable.C
index faece1ed5..a13f9f78e 100644
--- a/src/usr/hwpf/hwp/slave_sbe/proc_cen_ref_clk_enable/proc_cen_ref_clk_enable.C
+++ b/src/usr/hwpf/hwp/slave_sbe/proc_cen_ref_clk_enable/proc_cen_ref_clk_enable.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2013                   */
+/* COPYRIGHT International Business Machines Corp. 2013,2014              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -22,7 +22,7 @@
 /* IBM_PROLOG_END_TAG                                                     */
 // -*- mode: C++; c-file-style: "linux";  -*-
 
-// $Id: proc_cen_ref_clk_enable.C,v 1.2 2013/08/14 20:44:47 jmcgill Exp $
+// $Id: proc_cen_ref_clk_enable.C,v 1.3 2014/02/28 17:52:45 jmcgill Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_cen_ref_clk_enable.C,v $
 //------------------------------------------------------------------------------
 // *|
@@ -133,7 +133,8 @@ fapi::ReturnCode proc_cen_ref_clk_enable(const fapi::Target & i_target,
                 {
                     // bit offset exceeds field range
                     FAPI_ERR("proc_cen_ref_clk_enable: Translated Centaur refclock enable bit position is out of range!");
-                    const uint8_t& POSITION = mcs_unit_id;
+                    const fapi::Target& PROC_TARGET = i_target;
+                    const uint8_t& CENTAUR_POSITION = mcs_unit_id;
                     const uint8_t& REFCLOCK_BIT = refclock_bit;
                     FAPI_SET_HWP_ERROR(rc,
                                        RC_PROC_CEN_REF_CLK_ENABLE_SWIZZLE_ERR);
@@ -158,8 +159,9 @@ fapi::ReturnCode proc_cen_ref_clk_enable(const fapi::Target & i_target,
         if (configured_centaurs != i_attached_centaurs)
         {
             FAPI_ERR("proc_cen_ref_clk_enable: Not all Centaurs marked as attached were configured");
-            const uint8_t& CONFIGURED = configured_centaurs;
-            const uint8_t& ATTACHED = i_attached_centaurs;
+            const fapi::Target& PROC_TARGET = i_target;
+            const uint8_t& CONFIGURED_CENTAUR_POSITIONS = configured_centaurs;
+            const uint8_t& ATTACHED_CENTAUR_POSITIONS = i_attached_centaurs;
             FAPI_SET_HWP_ERROR(rc,
                                RC_PROC_CEN_REF_CLK_ENABLE_CONFIG_ERR);
             break;
diff --git a/src/usr/hwpf/hwp/slave_sbe/proc_cen_ref_clk_enable/proc_cen_ref_clk_enable_errors.xml b/src/usr/hwpf/hwp/slave_sbe/proc_cen_ref_clk_enable/proc_cen_ref_clk_enable_errors.xml
index eff8ecdc9..769b9d6a9 100644
--- a/src/usr/hwpf/hwp/slave_sbe/proc_cen_ref_clk_enable/proc_cen_ref_clk_enable_errors.xml
+++ b/src/usr/hwpf/hwp/slave_sbe/proc_cen_ref_clk_enable/proc_cen_ref_clk_enable_errors.xml
@@ -5,7 +5,7 @@
 <!--                                                                        -->
 <!-- IBM CONFIDENTIAL                                                       -->
 <!--                                                                        -->
-<!-- COPYRIGHT International Business Machines Corp. 2013                   -->
+<!-- COPYRIGHT International Business Machines Corp. 2013,2014              -->
 <!--                                                                        -->
 <!-- p1                                                                     -->
 <!--                                                                        -->
@@ -20,20 +20,30 @@
 <!-- Origin: 30                                                             -->
 <!--                                                                        -->
 <!-- IBM_PROLOG_END_TAG                                                     -->
-<!-- $Id: proc_cen_ref_clk_enable_errors.xml,v 1.1 2013/08/14 20:45:46 jmcgill Exp $ -->
+<!-- $Id: proc_cen_ref_clk_enable_errors.xml,v 1.2 2014/02/28 17:53:41 jmcgill Exp $ -->
 <!-- Error definitions for proc_cen_ref_clk_enable -->
 <hwpErrors>
   <!-- *********************************************************************** -->
   <hwpError>
     <rc>RC_PROC_CEN_REF_CLK_ENABLE_SWIZZLE_ERR</rc>
     <description>Translated Centaur refclock enable bit position is out of range.</description>
-    <ffdc>POSITION</ffdc>
+    <ffdc>PROC_TARGET</ffdc>
+    <ffdc>CENTAUR_POSITION</ffdc>
     <ffdc>REFCLOCK_BIT</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <hwpError>
     <rc>RC_PROC_CEN_REF_CLK_ENABLE_CONFIG_ERR</rc>
     <description>Not all Centaurs marked as attached were configured.</description>
-    <ffdc>CONFIGURED</ffdc>
-    <ffdc>ATTACHED</ffdc>
+    <ffdc>PROC_TARGET</ffdc>
+    <ffdc>CONFIGURED_CENTAUR_POSITIONS</ffdc>
+    <ffdc>ATTACHED_CENTAUR_POSITIONS</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
 </hwpErrors>