From b403e6730f5ccbb9e065d49496b964a753cd02c2 Mon Sep 17 00:00:00 2001
From: Andre Marin <aamarin@us.ibm.com>
Date: Fri, 16 Aug 2019 13:51:47 -0400
Subject: Clean up for p10 porting dependency errors

CMVC-Coreq: 1094420
Change-Id: I02b8dfab08121d4ac9ffbb7dedd37f7083bf527f
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/81543
Dev-Ready: STEPHEN GLANCY <sglancy@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Reviewed-by: Jennifer A Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/82367
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M Crowell <dcrowell@us.ibm.com>
---
 .../hwp/memory/exp_mss_eff_config_thermal.C        | 18 ++++----
 .../hwp/memory/lib/power_thermal/exp_decoder.C     | 48 +++++++++++-----------
 2 files changed, 33 insertions(+), 33 deletions(-)

(limited to 'src/import/chips/ocmb/explorer/procedures/hwp/memory')

diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_mss_eff_config_thermal.C b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_mss_eff_config_thermal.C
index a261faa19..1891eb75e 100644
--- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_mss_eff_config_thermal.C
+++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_mss_eff_config_thermal.C
@@ -129,15 +129,15 @@ extern "C"
 
                     // Set the thermal power throttle
                     //Set the PMIC current slope, intercept and limit
-                    mss::power_thermal::get_power_attrs (l_throttle_type,
-                                                         l_port,
-                                                         l_thermal_power_slope_v,
-                                                         l_thermal_power_intecept_v,
-                                                         l_thermal_power_limit_v,
-                                                         l_current_curve_with_limit_v,
-                                                         l_slope,
-                                                         l_intercept,
-                                                         l_limit);
+                    FAPI_TRY( mss::power_thermal::get_power_attrs (l_throttle_type,
+                              l_port,
+                              l_thermal_power_slope_v,
+                              l_thermal_power_intecept_v,
+                              l_thermal_power_limit_v,
+                              l_current_curve_with_limit_v,
+                              l_slope,
+                              l_intercept,
+                              l_limit) );
 
                     FAPI_TRY(mss::attr::set_total_pwr_slope(l_port, l_slope));
                     FAPI_TRY(mss::attr::set_total_pwr_intercept(l_port, l_intercept));
diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/power_thermal/exp_decoder.C b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/power_thermal/exp_decoder.C
index 709a1989f..3411bc1d3 100644
--- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/power_thermal/exp_decoder.C
+++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/power_thermal/exp_decoder.C
@@ -86,16 +86,16 @@ fapi2::ReturnCode decoder<mss::mc_type::EXPLORER>::find_slope (
                 2);
 
     // To get thermal power slope
-    get_power_thermal_value<TT::THERMAL_START, TT::THERMAL_LENGTH, SLOPE>(
-        *i_slope[0],
-        "ATTR_MSS_MRW_OCMB_THERMAL_MEMORY_PWR_SLOPE",
-        iv_total_slope);
+    FAPI_TRY( (get_power_thermal_value<TT::THERMAL_START, TT::THERMAL_LENGTH, SLOPE>(
+                   *i_slope[0],
+                   "ATTR_MSS_MRW_OCMB_THERMAL_MEMORY_PWR_SLOPE",
+                   iv_total_slope)) );
 
     // To get power slope
-    get_power_thermal_value<TT::POWER_SLOPE_START, TT::POWER_SLOPE_LENGTH, SLOPE>(
-        *i_slope[1],
-        "ATTR_MSS_MRW_OCMB_CURRENT_CURVE_WITH_LIMIT",
-        iv_vddr_slope);
+    FAPI_TRY( (get_power_thermal_value<TT::POWER_SLOPE_START, TT::POWER_SLOPE_LENGTH, SLOPE>(
+                   *i_slope[1],
+                   "ATTR_MSS_MRW_OCMB_CURRENT_CURVE_WITH_LIMIT",
+                   iv_vddr_slope)) );
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -126,16 +126,16 @@ fapi2::ReturnCode decoder<mss::mc_type::EXPLORER>::find_intercept (
                 2);
 
     // To get thermal power intercept
-    get_power_thermal_value<TT::THERMAL_START, TT::THERMAL_LENGTH, INTERCEPT>(
-        *i_intercept[0],
-        "ATTR_MSS_MRW_OCMB_POWER_INTERCEPT",
-        iv_total_intercept);
+    FAPI_TRY( (get_power_thermal_value<TT::THERMAL_START, TT::THERMAL_LENGTH, INTERCEPT>(
+                   *i_intercept[0],
+                   "ATTR_MSS_MRW_OCMB_POWER_INTERCEPT",
+                   iv_total_intercept)) );
 
     // To get power intercept
-    get_power_thermal_value<TT::POWER_INTERCEPT_START, TT::POWER_INTERCEPT_LENGTH, INTERCEPT>(
-        *i_intercept[1],
-        "ATTR_MSS_MRW_OCMB_CURRENT_CURVE_WITH_LIMIT",
-        iv_vddr_intercept);
+    FAPI_TRY( (get_power_thermal_value<TT::POWER_INTERCEPT_START, TT::POWER_INTERCEPT_LENGTH, INTERCEPT>(
+                   *i_intercept[1],
+                   "ATTR_MSS_MRW_OCMB_CURRENT_CURVE_WITH_LIMIT",
+                   iv_vddr_intercept)) );
 
 fapi_try_exit:
     return fapi2::current_err;
@@ -167,16 +167,16 @@ fapi2::ReturnCode decoder<mss::mc_type::EXPLORER>::find_thermal_power_limit (
                 2);
 
     // To get thermal power limit
-    get_power_thermal_value<TT::THERMAL_START, TT::THERMAL_LENGTH, POWER_LIMIT>(
-        *i_thermal_limits[0],
-        "ATTR_MSS_MRW_OCMB_THERMAL_MEMORY_POWER_LIMIT",
-        iv_thermal_power_limit);
+    FAPI_TRY( (get_power_thermal_value<TT::THERMAL_START, TT::THERMAL_LENGTH, POWER_LIMIT>(
+                   *i_thermal_limits[0],
+                   "ATTR_MSS_MRW_OCMB_THERMAL_MEMORY_POWER_LIMIT",
+                   iv_thermal_power_limit)) );
 
     // To get power intercept
-    get_power_thermal_value<TT::POWER_LIMIT_START, TT::POWER_LIMIT_LENGTH, POWER_LIMIT>(
-        *i_thermal_limits[1],
-        "ATTR_MSS_MRW_OCMB_CURRENT_CURVE_WITH_LIMIT",
-        iv_power_limit);
+    FAPI_TRY( (get_power_thermal_value<TT::POWER_LIMIT_START, TT::POWER_LIMIT_LENGTH, POWER_LIMIT>(
+                   *i_thermal_limits[1],
+                   "ATTR_MSS_MRW_OCMB_CURRENT_CURVE_WITH_LIMIT",
+                   iv_power_limit)) );
 
 fapi_try_exit:
     return fapi2::current_err;
-- 
cgit v1.2.1