diff options
author | Jacob Harvey <jlharvey@us.ibm.com> | 2017-06-12 13:13:42 -0500 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-06-20 11:23:02 -0400 |
commit | 2ba9ff874e2f66f6dc7b2c1b13f56b2806613093 (patch) | |
tree | c24262d34835eba965155eae62aa091d9a7785bf | |
parent | 6a21eb6f2af481f12d6baee963e3f563123f5cde (diff) | |
download | talos-hostboot-2ba9ff874e2f66f6dc7b2c1b13f56b2806613093.tar.gz talos-hostboot-2ba9ff874e2f66f6dc7b2c1b13f56b2806613093.zip |
Fix mss::c_str error in utils_to_throttle
Change-Id: I2739fa1eb241778d08a59132563a674a9765c0d3
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41699
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Reviewed-by: ANDRE A. MARIN <aamarin@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41702
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
-rw-r--r-- | src/import/chips/p9/procedures/hwp/memory/lib/power_thermal/throttle.C | 16 | ||||
-rw-r--r-- | src/import/chips/p9/procedures/hwp/memory/lib/power_thermal/throttle.H | 2 |
2 files changed, 7 insertions, 11 deletions
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/power_thermal/throttle.C b/src/import/chips/p9/procedures/hwp/memory/lib/power_thermal/throttle.C index 28d156a84..be742b07b 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/power_thermal/throttle.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/power_thermal/throttle.C @@ -163,7 +163,7 @@ fapi2::ReturnCode throttle::power_regulator_throttles () //Decide utilization for each dimm based off of dimm count and power slopes FAPI_TRY( calc_databus(iv_databus_port_max, l_databus_dimm_max), - "Failed to calculate each DIMMs' percentage of dram databus utilization for target %s, max port databus is %s", + "Failed to calculate each DIMMs' percentage of dram databus utilization for target %s, max port databus is %d", mss::c_str(iv_target), iv_databus_port_max); @@ -187,18 +187,18 @@ fapi2::ReturnCode throttle::power_regulator_throttles () l_port_power_calc_max, l_port_power_calc_idle); - FAPI_INF("POWER Port power limit is %d", iv_port_power_limit); + FAPI_INF("%s POWER Port power limit is %d", mss::c_str(iv_target), iv_port_power_limit); //Calculate the port's utilization to get under watt target using the port's calculated slopes calc_util_usage(l_port_power_slope, l_port_power_int, iv_port_power_limit, l_calc_util_port); - FAPI_INF("POWER calc util port is %f", l_calc_util_port); + FAPI_INF("%s POWER calc util port is %f", mss::c_str(iv_target), l_calc_util_port); //Calculate the new slot values and the max power value for the port FAPI_TRY( calc_slots_and_power( l_calc_util_port), - "Error calculating the final throttles and power values for target %s with passed in port utilization %d", + "%s Error calculating the final throttles and power values for target with passed in port utilization %d", mss::c_str(iv_target), l_calc_util_port); @@ -418,12 +418,8 @@ fapi2::ReturnCode throttle::calc_power_curve(const double i_power_idle, .set_UTIL_CONVERSION(UTIL_CONVERSION) .set_IDLE_UTIL(IDLE_UTIL) .set_RESULT(l_divisor), - "Calculated zero for the divisor in calc_power_curve on target %s, the equation is %s", - mss::c_str(iv_target), - "(double(iv_databus_port_max %d) / UTIL_CONVERSION %d) - IDLE_UTIL %d", - iv_databus_port_max, - UTIL_CONVERSION, - IDLE_UTIL); + "Calculated zero for the divisor in calc_power_curve on target %s", + mss::c_str(iv_target) ); o_slope = (i_power_max - i_power_idle) / l_divisor; o_int = i_power_idle - (o_slope * IDLE_UTIL); diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/power_thermal/throttle.H b/src/import/chips/p9/procedures/hwp/memory/lib/power_thermal/throttle.H index 05c1ce166..acb3df555 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/power_thermal/throttle.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/power_thermal/throttle.H @@ -287,7 +287,7 @@ fapi2::ReturnCode calc_util_from_throttles(const uint16_t i_n_throttles, o_calc_util = ( (o_calc_util == 0) ? MIN_UTIL : o_calc_util); - FAPI_INF("In calc_util_from_throttles, calculated %f for output utilization", o_calc_util); + FAPI_INF("In calc_util_from_throttles, calculated %d for output utilization", o_calc_util); return fapi2::FAPI2_RC_SUCCESS; fapi_try_exit: return fapi2::current_err; |