P9N/P9C util to throttle HWP updates for min util and safemode

Changes include:
-- fix for SW408681 (p9n util to throttle min util enforcement)
-- safemode throttle calculation support when input util is 0 (p9n/p9c)
-- fix trace printing for floating point variables (p9n)
-- fix trace printing in equalize throttles (p9n)

Change-Id: I16530b98e29cb0ad32ae77387b92d9d70b50f83c
CQ: SW408681
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/60895
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/60898
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>

6 files changed, 110 insertions, 20 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 1cebe04ef..0589d11ae 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
@@ -907,13 +907,14 @@ fapi2::ReturnCode equalize_throttles (const std::vector< fapi2::Target<fapi2::TA
 
                     o_exceeded_power.push_back(l_mca);
                 }
+
+                FAPI_INF("%s Final throttles values for slot %d, for port %d, power value %d",
+                         mss::c_str(l_mca),
+                         l_fin_port[l_pos],
+                         l_fin_slot[l_pos],
+                         l_fin_power[l_pos]);
             }
 
-            FAPI_INF("%s Final throttles values for slot %d, for port %d, power value %d",
-                     mss::c_str(l_mcs),
-                     l_fin_port,
-                     l_fin_slot,
-                     l_fin_port);
             //Even if there's an error, still calculate and set the throttles.
             //OCC will set to safemode if there's an error
             //Better to set the throttles than leave them 0, and potentially brick the memory
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 3dbc59cc3..768917bcf 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
@@ -300,12 +300,12 @@ fapi2::ReturnCode calc_util_from_throttles(const uint16_t i_n_throttles,
     // Check for the minimum
     if(o_calc_util < MIN_UTIL)
     {
-        FAPI_INF("Calculated utilization (%lu) is less than the minimum utilization: %lu. Setting to minimum value",
+        FAPI_INF("Calculated utilization (%f) is less than the minimum utilization: %lu. Setting to minimum value",
                  o_calc_util, MIN_UTIL);
         o_calc_util = MIN_UTIL;
     }
 
-    FAPI_INF("In calc_util_from_throttles, calculated %d for output utilization", o_calc_util);
+    FAPI_INF("In calc_util_from_throttles, calculated %f for output utilization", o_calc_util);
     return fapi2::FAPI2_RC_SUCCESS;
 fapi_try_exit:
     return fapi2::current_err;
diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_eff_config_thermal.C b/src/import/chips/p9/procedures/hwp/memory/p9_mss_eff_config_thermal.C
index 50a046c1c..bd5819fd2 100644
--- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_eff_config_thermal.C
+++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_eff_config_thermal.C
@@ -27,8 +27,8 @@
 /// @file p9_mss_eff_config_thermal.C
 /// @brief Perform thermal calculations as part of the effective configuration
 ///
-// *HWP HWP Owner: Jacob Harvey <jlharvey@us.ibm.com>
-// *HWP HWP Backup: Andre Marin <aamarin@us.ibm.com>
+// *HWP HWP Owner: Andre Marin <aamarin@us.ibm.com>
+// *HWP HWP Backup: Michael Pardeik <pardeik@us.ibm.com>
 // *HWP Team: Memory
 // *HWP Level: 3
 // *HWP Consumed by: FSP:HB
@@ -72,6 +72,24 @@ extern "C"
 
         FAPI_INF("Size of vectors are %d %d %d", l_slope.size(), l_intercept.size(), l_thermal_power_limit.size());
 
+        // Return error if safemode throttle utilization is less than MIN_UTIL
+        // This section needs to be in braces otherwise the compile will fail
+        {
+            uint16_t l_throttle_per_port = 0;
+            uint32_t l_throttle_denominator = 0;
+            FAPI_TRY(mss::mrw_mem_m_dram_clocks(l_throttle_denominator), "Error in p9_mss_eff_config_thermal" );
+            FAPI_TRY(mss::mrw_safemode_mem_throttled_n_commands_per_port(l_throttle_per_port),
+                     "Error in p9_mss_eff_config_thermal" );
+            FAPI_ASSERT( (l_throttle_per_port  >= (mss::power_thermal::MIN_UTIL * l_throttle_denominator /
+                                                   mss::power_thermal::DRAM_BUS_UTILS / mss::power_thermal::UTIL_CONVERSION)),
+                         fapi2::MSS_MRW_SAFEMODE_THROTTLE_NOT_SUPPORTED()
+                         .set_MRW_SAFEMODE_N_VALUE(l_throttle_per_port)
+                         .set_MRW_DRAM_CLOCK_THROTTLE_M(l_throttle_denominator)
+                         .set_MIN_UTIL_VALUE(mss::power_thermal::MIN_UTIL),
+                         "MRW safemode attribute (N=%d, M=%d) has less util than the min util allowed (%d centi percent)",
+                         l_throttle_per_port, l_throttle_denominator, mss::power_thermal::MIN_UTIL);
+        }
+
         //Restore runtime_throttles from safemode setting
         //Decode and set power curve attributes at the same time
         for (const auto& l_mcs : i_targets )
diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_utils_to_throttle.C b/src/import/chips/p9/procedures/hwp/memory/p9_mss_utils_to_throttle.C
index 364486242..d8bf63b9c 100644
--- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_utils_to_throttle.C
+++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_utils_to_throttle.C
@@ -25,9 +25,10 @@
 
 ///
 /// @file p9_mss_utils_to_throttle.C
-/// @brief Sets throttles
+/// @brief Sets throttles and power attributes for a given utilization value
 /// TMGT will call this procedure to set the N address operations (commands)
 /// allowed within a window of M DRAM clocks given the minimum dram data bus utilization.
+////If input utilization is zero, then safemode values from MRW will be used
 ///
 
 // *HWP HWP Owner: Andre A. Marin <aamarin@us.ibm.com>
@@ -72,6 +73,7 @@ extern "C"
         FAPI_INF("Entering p9_mss_utils_to_throttle");
 
         std::vector< fapi2::Target<fapi2::TARGET_TYPE_MCA> > l_exceeded_power;
+        bool l_util_error = false;
 
         for( const auto& l_mcs : i_targets )
         {
@@ -83,6 +85,8 @@ extern "C"
             uint32_t l_input_databus_util [mss::PORTS_PER_MCS] = {};
             uint32_t l_max_databus_util  = {};
             uint32_t l_dram_clocks = 0;
+            uint16_t l_safemode_throttle_per_port = 0;
+            double l_calc_util_safemode = 0;
 
             uint16_t l_n_port[mss::PORTS_PER_MCS] = {};
             uint16_t l_n_slot[mss::PORTS_PER_MCS] = {};
@@ -107,11 +111,45 @@ extern "C"
                     continue;
                 }
 
-                //Make sure 0 < input_utilization <= max_utilization
-                const uint32_t l_databus_util = ( l_input_databus_util[l_port_num] != 0) ?
+                // If input utilization is zero, use mrw safemode throttle values for utilization
+                bool l_safemode = false;
+
+                if (l_input_databus_util[l_port_num] == 0)
+                {
+                    FAPI_TRY(mss::mrw_safemode_mem_throttled_n_commands_per_port(l_safemode_throttle_per_port),
+                             "Error in getting safemode throttles" );
+                    FAPI_TRY( mss::power_thermal::calc_util_from_throttles(l_safemode_throttle_per_port, l_dram_clocks,
+                              l_calc_util_safemode),
+                              "%s Error calculating utilization from safemode throttle %d and mem clocks %d",
+                              mss::c_str(l_mca),
+                              l_safemode_throttle_per_port,
+                              l_dram_clocks);
+                    FAPI_INF( "%s Safemode throttles being used since input util is zero:  Using N=%d, Utilization %f",
+                              mss::c_str(l_mca),
+                              l_safemode_throttle_per_port,
+                              l_calc_util_safemode);
+                    l_safemode = true;
+                    l_input_databus_util[l_port_num] = l_calc_util_safemode;
+                }
+
+                //Make sure MIN_UTIL <= input_utilization <= max_utilization
+                const uint32_t l_databus_util = ( l_input_databus_util[l_port_num] >= mss::power_thermal::MIN_UTIL) ?
                                                 std::min(l_input_databus_util[l_port_num], l_max_databus_util)
                                                 : mss::power_thermal::MIN_UTIL;
 
+                // Error if utilization is less than MIN_UTIL
+                // Don't exit, let HWP finish and return error at end
+                if (l_input_databus_util[l_port_num] < mss::power_thermal::MIN_UTIL)
+                {
+                    FAPI_ASSERT_NOEXIT( false,
+                                        fapi2::MSS_MIN_UTILIZATION_ERROR()
+                                        .set_INPUT_UTIL_VALUE(l_input_databus_util[l_port_num])
+                                        .set_MIN_UTIL_VALUE(mss::power_thermal::MIN_UTIL),
+                                        "%s Input utilization (%d) less than minimum utilization allowed (%d)",
+                                        mss::c_str(l_mca), l_input_databus_util[l_port_num], mss::power_thermal::MIN_UTIL);
+                    l_util_error = true;
+                }
+
                 //Make a throttle object in order to calculate the port power
                 fapi2::ReturnCode l_rc;
 
@@ -132,8 +170,8 @@ extern "C"
                           l_dram_clocks,
                           l_throttle.iv_calc_port_maxpower);
 
-                l_n_slot[l_port_num] = l_throttle.iv_n_slot;
-                l_n_port[l_port_num] = l_throttle.iv_n_port;
+                l_n_slot[l_port_num] = (l_safemode) ? l_safemode_throttle_per_port : l_throttle.iv_n_slot;
+                l_n_port[l_port_num] = (l_safemode) ? l_safemode_throttle_per_port : l_throttle.iv_n_port;
                 l_max_power[l_port_num] = l_throttle.iv_calc_port_maxpower;
             }// end for
 
@@ -152,6 +190,12 @@ extern "C"
         // Note that we don't do anything with any MCA that exceed the power limit here, as we don't have an input power limit to go from
         FAPI_TRY( mss::power_thermal::equalize_throttles (i_targets, mss::throttle_type::POWER, l_exceeded_power));
 
+        // Return a failing RC code if we had any input utilization values less than MIN_UTIL
+        if (l_util_error)
+        {
+            fapi2::current_err = fapi2::FAPI2_RC_FALSE;
+        }
+
     fapi_try_exit:
         return fapi2::current_err;
     }
diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_utils_to_throttle.H b/src/import/chips/p9/procedures/hwp/memory/p9_mss_utils_to_throttle.H
index 94ab34a4f..d5e410754 100644
--- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_utils_to_throttle.H
+++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_utils_to_throttle.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2015,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2015,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -30,8 +30,8 @@
 /// allowed within a window of M DRAM clocks given the minimum dram data bus utilization.
 ///
 
-// *HWP HWP Owner: Jacob Harvey <jlharvey@us.ibm.com>
-// *HWP HWP Backup: Andre A. Marin <aamarin@us.ibm.com>
+// *HWP HWP Owner: Andre A. Marin <aamarin@us.ibm.com>
+// *HWP HWP Backup: Michael Pardeik <pardeik@us.ibm.com>
 // *HWP Team: Memory
 // *HWP Level: 3
 // *HWP Consumed by: FSP:HB
diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_eff_config_thermal.xml b/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_eff_config_thermal.xml
index 28ee2ff8c..be58c845b 100644
--- a/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_eff_config_thermal.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_eff_config_thermal.xml
@@ -5,7 +5,7 @@
 <!--                                                                        -->
 <!-- OpenPOWER HostBoot Project                                             -->
 <!--                                                                        -->
-<!-- Contributors Listed Below - COPYRIGHT 2015,2017                        -->
+<!-- Contributors Listed Below - COPYRIGHT 2015,2018                        -->
 <!-- [+] International Business Machines Corp.                              -->
 <!--                                                                        -->
 <!--                                                                        -->
@@ -26,8 +26,8 @@
 <!-- @file memory_mss_timing.xml                                            -->
 <!-- @brief Error xml for timing.H                                          -->
 <!-- -->
-<!-- *HWP HWP Owner: Jacob Harvey <jlharvey@us.ibm.com>                     -->
-<!-- *HWP HWP Backup: Brian Silver <bsilver@us.ibm.com>                     -->
+<!-- *HWP HWP Owner: Andre A. Marin  <aamarin@us.ibm.com>                   -->
+<!-- *HWP HWP Backup: Michael Pardeik <pardeik@us.ibm.com>                  -->
 <!-- *HWP Team: Memory                                                      -->
 <!-- *HWP Level: 3                                                          -->
 <!-- *HWP Consumed by: HB:FSP                                               -->
@@ -224,4 +224,31 @@
       <priority>HIGH</priority>
     </callout>
   </hwpError>
+
+ <hwpError>
+    <rc>RC_MSS_MRW_SAFEMODE_THROTTLE_NOT_SUPPORTED</rc>
+    <description>
+        The MRW safemode throttle N value gives a utilization that is less than the minimum utilization supported.  Check ATTR_MSS_MRW_SAFEMODE_MEM_THROTTLED_N_COMMANDS_PER_PORT.
+    </description>
+    <ffdc>MRW_SAFEMODE_N_VALUE</ffdc>
+    <ffdc>MRW_DRAM_CLOCK_THROTTLE_M</ffdc>
+    <ffdc>MIN_UTIL_VALUE</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
+  </hwpError>
+
+ <hwpError>
+    <rc>RC_MSS_MIN_UTILIZATION_ERROR</rc>
+    <description>
+        The input utilization is less than the minimum utilization allowed.
+    </description>
+    <ffdc>INPUT_UTIL_VALUE</ffdc>
+    <ffdc>MIN_UTIL_VALUE</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
+  </hwpError>
 </hwpErrors>