INITPROC: Hostboot SW246059 IPL error clean up

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

2 files changed, 16 insertions, 6 deletions

diff --git a/src/usr/hwpf/hwp/proc_hwreconfig/proc_enable_reconfig/proc_enable_reconfig.C b/src/usr/hwpf/hwp/proc_hwreconfig/proc_enable_reconfig/proc_enable_reconfig.C
index 37205cca0..b3e56aed0 100644
--- a/src/usr/hwpf/hwp/proc_hwreconfig/proc_enable_reconfig/proc_enable_reconfig.C
+++ b/src/usr/hwpf/hwp/proc_hwreconfig/proc_enable_reconfig/proc_enable_reconfig.C
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/hwpf/hwp/host_prd_hwreconfig/proc_enable_reconfig/proc_enable_reconfig.C $ */
+/* $Source: src/usr/hwpf/hwp/proc_hwreconfig/proc_enable_reconfig/proc_enable_reconfig.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2013                   */
+/* COPYRIGHT International Business Machines Corp. 2013,2014              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: proc_enable_reconfig.C,v 1.4 2013/11/13 17:21:51 bellows Exp $
+// $Id: proc_enable_reconfig.C,v 1.5 2014/02/19 13:45:23 bellows Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_enable_reconfig.C,v $
 //------------------------------------------------------------------------------
 // *! (C) Copyright International Business Machines Corp. 2013
@@ -44,6 +44,7 @@
 //------------------------------------------------------------------------------
 // Version:|  Author: |  Date:  | Comment:
 //---------|----------|---------|-----------------------------------------------
+//   1.5   | bellows  |17-FEB-14| Deconfig a proc if error found - SW246059
 //   1.4   | bellows  |13-NOV-13| Fixed up rc_ecmd problems from review
 //   1.3   | bellows  |11-NOV-13| Firmware review updates
 //   1.2   | bellows  |08-NOV-13| Simpified + added attributes
@@ -117,6 +118,7 @@ extern "C" {
       }
       else {
         FAPI_ERR("This processor cannot go through a reconfig loop. Please upgrade to > DD1\n");
+        const fapi::Target & PROC =  l_target_pu;
         FAPI_SET_HWP_ERROR(rc, RC_PROC_ENABLE_RECONFIG_UNSUPPORTED);
         return rc;
       }
@@ -254,6 +256,7 @@ extern "C" {
       }
       else {
         FAPI_ERR("This processor cannot go through a reconfig loop. Please upgrade to > DD1\n");
+        const fapi::Target & PROC =  l_target_pu;
         FAPI_SET_HWP_ERROR(rc, RC_PROC_ENABLE_RECONFIG_UNSUPPORTED);
         return rc;
       }
diff --git a/src/usr/hwpf/hwp/proc_hwreconfig/proc_enable_reconfig/proc_enable_reconfig_errors.xml b/src/usr/hwpf/hwp/proc_hwreconfig/proc_enable_reconfig/proc_enable_reconfig_errors.xml
index 5d079acb3..aa464dade 100644
--- a/src/usr/hwpf/hwp/proc_hwreconfig/proc_enable_reconfig/proc_enable_reconfig_errors.xml
+++ b/src/usr/hwpf/hwp/proc_hwreconfig/proc_enable_reconfig/proc_enable_reconfig_errors.xml
@@ -1,11 +1,11 @@
 <!-- IBM_PROLOG_BEGIN_TAG                                                   -->
 <!-- This is an automatically generated prolog.                             -->
 <!--                                                                        -->
-<!-- $Source: src/usr/hwas/proc_enable_reconfig/proc_enable_reconfig_errors.xml $ -->
+<!-- $Source: src/usr/hwpf/hwp/proc_hwreconfig/proc_enable_reconfig/proc_enable_reconfig_errors.xml $ -->
 <!--                                                                        -->
 <!-- IBM CONFIDENTIAL                                                       -->
 <!--                                                                        -->
-<!-- COPYRIGHT International Business Machines Corp. 2013                   -->
+<!-- COPYRIGHT International Business Machines Corp. 2013,2014              -->
 <!--                                                                        -->
 <!-- p1                                                                     -->
 <!--                                                                        -->
@@ -20,12 +20,19 @@
 <!-- Origin: 30                                                             -->
 <!--                                                                        -->
 <!-- IBM_PROLOG_END_TAG                                                     -->
-<!-- $Id: proc_enable_reconfig_errors.xml,v 1.1 2013/11/08 16:27:51 bellows Exp $ -->
+<!-- $Id: proc_enable_reconfig_errors.xml,v 1.2 2014/02/19 13:45:27 bellows Exp $ -->
 <!-- Error definitions for proc_enable_reconfig procedure -->
 <hwpErrors>
   <!-- *********************************************************************** -->
   <hwpError>
     <rc>RC_PROC_ENABLE_RECONFIG_UNSUPPORTED</rc>
     <description>Processor Hardware does not support reconfiguration loops.  For Venice and Murano, DD2.0 and greater hardware support this function</description>
+    <callout>
+      <target>PROC</target>
+      <priority>HIGH</priority>
+    </callout>
+    <deconfigure>
+      <target>PROC</target>
+    </deconfigure>
   </hwpError>
 </hwpErrors>