summaryrefslogtreecommitdiffstats
path: root/src/usr
diff options
context:
space:
mode:
authorThi Tran <thi@us.ibm.com>2014-04-28 20:38:56 -0500
committerA. Patrick Williams III <iawillia@us.ibm.com>2014-05-08 14:44:07 -0500
commit288c2befec3b4a4fb5424ec00cdb560aee32f452 (patch)
tree903e2c1956e07a019027d6fb6a7000f6a101cad2 /src/usr
parent23439f78d3c6f719b2e280ac12a41f9b3fb34aae (diff)
downloadtalos-hostboot-288c2befec3b4a4fb5424ec00cdb560aee32f452.tar.gz
talos-hostboot-288c2befec3b4a4fb5424ec00cdb560aee32f452.zip
SW259194: INITPROC: Hostboot - HB missed in SW247408
Change-Id: I05a7afbe556f6bdb38566bc38c19a537039fe877 CQ:SW259194 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/10810 Reviewed-by: Thi N. Tran <thi@us.ibm.com> Tested-by: Thi N. Tran <thi@us.ibm.com> Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/10821 Tested-by: Jenkins Server Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr')
-rw-r--r--src/usr/hwpf/hwp/activate_powerbus/proc_build_smp/proc_adu_utils.C23
-rw-r--r--src/usr/hwpf/hwp/activate_powerbus/proc_build_smp/proc_adu_utils_errors.xml7
2 files changed, 13 insertions, 17 deletions
diff --git a/src/usr/hwpf/hwp/activate_powerbus/proc_build_smp/proc_adu_utils.C b/src/usr/hwpf/hwp/activate_powerbus/proc_build_smp/proc_adu_utils.C
index 50af530d9..e5da4199d 100644
--- a/src/usr/hwpf/hwp/activate_powerbus/proc_build_smp/proc_adu_utils.C
+++ b/src/usr/hwpf/hwp/activate_powerbus/proc_build_smp/proc_adu_utils.C
@@ -20,7 +20,7 @@
/* Origin: 30 */
/* */
/* IBM_PROLOG_END_TAG */
-// $Id: proc_adu_utils.C,v 1.8 2014/01/19 17:35:55 jmcgill Exp $
+// $Id: proc_adu_utils.C,v 1.9 2014/02/12 05:13:49 jmcgill Exp $
// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/utils/proc_adu_utils.C,v $
//------------------------------------------------------------------------------
// *|
@@ -315,11 +315,10 @@ fapi::ReturnCode proc_adu_utils_send_fbc_op(
{
FAPI_ERR("proc_adu_utils_send_fbc_op: Out-of-range value %016llX specified for fabric address argument",
i_adu_ctl.address);
- const fapi::Target & TARGET = i_target;
+ const fapi::Target & TARGET = i_target;
const uint64_t & ADDRESS = i_adu_ctl.address;
- const bool & HP = i_use_hp;
- const uint32_t & HP_QUIESCE_DLY = i_adu_hp_ctl.post_quiesce_delay;
- const uint32_t & HP_INIT_DLY = i_adu_hp_ctl.pre_init_delay;
+ const proc_adu_utils_fbc_op & FBC_OP = i_adu_ctl;
+ const proc_adu_utils_fbc_op_hp_ctl & FBC_OP_HP_CTL = i_adu_hp_ctl;
FAPI_SET_HWP_ERROR(rc, RC_PROC_ADU_UTILS_INVALID_FBC_OP);
break;
}
@@ -329,11 +328,10 @@ fapi::ReturnCode proc_adu_utils_send_fbc_op(
{
FAPI_ERR("proc_adu_utils_send_fbc_op: Out-of-range value %d specified for hotplug post-quiesce delay argument",
i_adu_hp_ctl.post_quiesce_delay);
- const fapi::Target & TARGET = i_target;
+ const fapi::Target & TARGET = i_target;
const uint64_t & ADDRESS = i_adu_ctl.address;
- const bool & HP = i_use_hp;
- const uint32_t & HP_QUIESCE_DLY = i_adu_hp_ctl.post_quiesce_delay;
- const uint32_t & HP_INIT_DLY = i_adu_hp_ctl.pre_init_delay;
+ const proc_adu_utils_fbc_op & FBC_OP = i_adu_ctl;
+ const proc_adu_utils_fbc_op_hp_ctl & FBC_OP_HP_CTL = i_adu_hp_ctl;
FAPI_SET_HWP_ERROR(rc, RC_PROC_ADU_UTILS_INVALID_FBC_OP);
break;
}
@@ -343,11 +341,10 @@ fapi::ReturnCode proc_adu_utils_send_fbc_op(
{
FAPI_ERR("proc_adu_utils_send_fbc_op: Out-of-range value %d specified for hotplug pre-init delay argument",
i_adu_hp_ctl.pre_init_delay);
- const fapi::Target & TARGET = i_target;
+ const fapi::Target & TARGET = i_target;
const uint64_t & ADDRESS = i_adu_ctl.address;
- const bool & HP = i_use_hp;
- const uint32_t & HP_QUIESCE_DLY = i_adu_hp_ctl.post_quiesce_delay;
- const uint32_t & HP_INIT_DLY = i_adu_hp_ctl.pre_init_delay;
+ const proc_adu_utils_fbc_op & FBC_OP = i_adu_ctl;
+ const proc_adu_utils_fbc_op_hp_ctl & FBC_OP_HP_CTL = i_adu_hp_ctl;
FAPI_SET_HWP_ERROR(rc, RC_PROC_ADU_UTILS_INVALID_FBC_OP);
break;
}
diff --git a/src/usr/hwpf/hwp/activate_powerbus/proc_build_smp/proc_adu_utils_errors.xml b/src/usr/hwpf/hwp/activate_powerbus/proc_build_smp/proc_adu_utils_errors.xml
index 08ba59041..926292c4c 100644
--- a/src/usr/hwpf/hwp/activate_powerbus/proc_build_smp/proc_adu_utils_errors.xml
+++ b/src/usr/hwpf/hwp/activate_powerbus/proc_build_smp/proc_adu_utils_errors.xml
@@ -20,7 +20,7 @@
<!-- Origin: 30 -->
<!-- -->
<!-- IBM_PROLOG_END_TAG -->
-<!-- $Id: proc_adu_utils_errors.xml,v 1.4 2014/01/20 19:55:04 jmcgill Exp $ -->
+<!-- $Id: proc_adu_utils_errors.xml,v 1.5 2014/02/12 05:01:56 jmcgill Exp $ -->
<!-- Error definitions for proc_adu_utils library -->
<hwpErrors>
<!-- *********************************************************************** -->
@@ -50,9 +50,8 @@
<rc>RC_PROC_ADU_UTILS_INVALID_FBC_OP</rc>
<ffdc>TARGET</ffdc>
<ffdc>ADDRESS</ffdc>
- <ffdc>HP</ffdc>
- <ffdc>HP_QUIESCE_DLY</ffdc>
- <ffdc>HP_INIT_DLY</ffdc>
+ <ffdc>FBC_OP</ffdc>
+ <ffdc>FBC_OP_HP_CTL</ffdc>
<description>Invalid fabric op programming parameters presented to proc_adu_utils library routine.</description>
<callout>
<procedure>CODE</procedure>
OpenPOWER on IntegriCloud