INITPROC: Hostboot - High Priority HW Init Procedures for week of 5/7

SW202431

Change-Id: I442c98acc796dfc3f16ff6f0ac815d10164bd9fc
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/4521
Reviewed-by: Van H. Lee <vanlee@us.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 17 insertions, 9 deletions

diff --git a/src/usr/hwpf/hwp/dmi_training/proc_dmi_scominit/proc_dmi_scominit.C b/src/usr/hwpf/hwp/dmi_training/proc_dmi_scominit/proc_dmi_scominit.C
index da63f3081..b55d6cdc0 100644
--- a/src/usr/hwpf/hwp/dmi_training/proc_dmi_scominit/proc_dmi_scominit.C
+++ b/src/usr/hwpf/hwp/dmi_training/proc_dmi_scominit/proc_dmi_scominit.C
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: proc_dmi_scominit.C,v 1.5 2013/02/11 03:58:59 jmcgill Exp $
+// $Id: proc_dmi_scominit.C,v 1.7 2013/05/14 15:45:32 jmcgill Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_dmi_scominit.C,v $
 //------------------------------------------------------------------------------
 // *! (C) Copyright International Business Machines Corp. 2012
@@ -39,6 +39,8 @@
 //------------------------------------------------------------------------------
 //  Version		Date		Owner		Description
 //------------------------------------------------------------------------------
+//    1.7       05/14/13    jmcgill     Address review comments
+//    1.6	   	05/01/13	jgrell		Added proc chip target
 //    1.5	   	02/06/13	jmcgill		Change passed targets in order to match scominit file updates.
 //    1.4	   	02/04/13	thomsen		Fixed informational print to not say Error
 //    1.3	   	01/23/13	thomsen		Added separate calls to base & customized scominit files. Removed separate calls to SIM vs. HW scominit files
@@ -64,6 +66,7 @@ extern "C" {
 // HWP entry point, comments in header
 fapi::ReturnCode proc_dmi_scominit(const fapi::Target & i_target)
 {
+
     fapi::ReturnCode rc;
     fapi::Target i_this_pu_target;
     std::vector<fapi::Target> targets;
@@ -73,18 +76,23 @@ fapi::ReturnCode proc_dmi_scominit(const fapi::Target & i_target)
 
     do
     {
+        // Get parent chip target
+        rc = fapiGetParentChip(i_target, i_this_pu_target);
+        if (!rc.ok())
+        {
+            FAPI_ERR("proc_dmi_scominit: Error from fapiGetParentChip");
+            break;
+        }
 
-	    // Get parent chip target
-        rc = fapiGetParentChip(i_target, i_this_pu_target); if(rc) return rc;
-
-		// populate targets vector (i_target=chiplet target)
+        // populate targets vector (i_target=chiplet target)
         targets.push_back(i_target);
+        targets.push_back(i_this_pu_target);
 
         // processor MCS chiplet target
         // test target type to confirm correct before calling initfile(s) to execute
         if (i_target.getType() == fapi::TARGET_TYPE_MCS_CHIPLET)
         {
-		    // Call BASE DMI SCOMINIT
+            // Call BASE DMI SCOMINIT
             FAPI_INF("proc_dmi_scominit: fapiHwpExecInitfile executing %s on %s",
                      MCS_DMI_BASE_IF, i_target.toEcmdString());
             FAPI_EXEC_HWP(rc, fapiHwpExecInitFile, targets, MCS_DMI_BASE_IF);
@@ -94,7 +102,7 @@ fapi::ReturnCode proc_dmi_scominit(const fapi::Target & i_target)
                          MCS_DMI_BASE_IF, i_target.toEcmdString());
                 break;
             }
-		    // Call CUSTOMIZED DMI SCOMINIT (system specific)
+            // Call CUSTOMIZED DMI SCOMINIT (system specific)
             FAPI_INF("proc_dmi_scominit: fapiHwpExecInitfile executing %s on %s",
                      MCS_DMI_CUSTOM_IF, i_target.toEcmdString());
             FAPI_EXEC_HWP(rc, fapiHwpExecInitFile, targets, MCS_DMI_CUSTOM_IF);
@@ -104,7 +112,7 @@ fapi::ReturnCode proc_dmi_scominit(const fapi::Target & i_target)
                          MCS_DMI_CUSTOM_IF, i_target.toEcmdString());
                 break;
             }
-	    }
+        }
         // unsupported target type
         else
         {
@@ -116,7 +124,7 @@ fapi::ReturnCode proc_dmi_scominit(const fapi::Target & i_target)
 
     // mark HWP exit
     FAPI_INF("proc_dmi_scominit: End");
-	return rc;
+    return rc;
 }