diff options
Diffstat (limited to 'src/usr/hwpf/hwp/dmi_training/proc_dmi_scominit/proc_dmi_scominit.C')
| -rw-r--r-- | src/usr/hwpf/hwp/dmi_training/proc_dmi_scominit/proc_dmi_scominit.C | 27 |
1 files changed, 13 insertions, 14 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 a236f9207..da63f3081 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.3 2013/01/24 20:20:34 thomsen Exp $ +// $Id: proc_dmi_scominit.C,v 1.5 2013/02/11 03:58:59 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,10 +39,12 @@ //------------------------------------------------------------------------------ // Version Date Owner Description //------------------------------------------------------------------------------ +// 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 // 1.2 01/10/13 thomsen Added separate calls to SIM vs. HW scominit files // Added commented-out call to OVERRIDE initfile for system/bus/lane specific inits -// Changed passed targets in order to match scominit file updates. +// Changed passed targets in order to match scominit file updates. // CO-REQs required: p8.dmi.vbu.scom.initfile v1.1 and p8.dmi.hw.scom.initfile v1.1 // 1.1 8/11/12 jmcgill Initial release //------------------------------------------------------------------------------ @@ -63,7 +65,6 @@ extern "C" { fapi::ReturnCode proc_dmi_scominit(const fapi::Target & i_target) { fapi::ReturnCode rc; - //fapi::TargetType target_type; fapi::Target i_this_pu_target; std::vector<fapi::Target> targets; @@ -72,22 +73,20 @@ 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) return rc; - // populate targets vector (i_this_pu_target=proc target, i_target=chiplet target) - targets.push_back(i_this_pu_target); + // populate targets vector (i_target=chiplet target) targets.push_back(i_target); - // processor target, processor MCS chiplet target - // test target types to confirm correct before calling initfile(s) to execute - if ((i_this_pu_target.getType() == fapi::TARGET_TYPE_PROC_CHIP) && - (i_target.getType() == fapi::TARGET_TYPE_MCS_CHIPLET)) + // 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 - FAPI_INF("proc_dmi_scominit: Error from fapiHwpExecInitfile executing %s on %s & %s", - MCS_DMI_BASE_IF, i_this_pu_target.toEcmdString(), i_target.toEcmdString()); + 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); if (!rc.ok()) { @@ -96,8 +95,8 @@ fapi::ReturnCode proc_dmi_scominit(const fapi::Target & i_target) break; } // Call CUSTOMIZED DMI SCOMINIT (system specific) - FAPI_INF("proc_dmi_scominit: Error from fapiHwpExecInitfile executing %s on %s & %s", - MCS_DMI_CUSTOM_IF, i_this_pu_target.toEcmdString(), i_target.toEcmdString()); + 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); if (!rc.ok()) { |
