Mode support with WOF

Change-Id: I5f58a2b8444f151d4c7b0367137dd8c700442538
RTC: 168025
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/37109
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>
Reviewed-by: Andres A. Lugo-Reyes <aalugore@us.ibm.com>
Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>

2 files changed, 21 insertions, 50 deletions

diff --git a/src/occ_405/amec/amec_freq.c b/src/occ_405/amec/amec_freq.c
index 916b319..b7417ef 100755
--- a/src/occ_405/amec/amec_freq.c
+++ b/src/occ_405/amec/amec_freq.c
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER OnChipController Project                                     */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2011,2016                        */
+/* Contributors Listed Below - COPYRIGHT 2011,2017                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -172,13 +172,19 @@ errlHndl_t amec_set_freq_range(const OCC_MODE i_mode)
     {
         l_freq_min = G_sysConfigData.sys_mode_freq.table[OCC_MODE_MIN_FREQUENCY];
 
-        // Set Max frequency (ultra turbo freq if wof enabled, to turbo freq  otherwise)
+        // Set Max frequency (ultra turbo freq if wof enabled, to turbo freq otherwise)
         l_freq_max = G_proc_fmax_mhz;
     }
     else if( VALID_MODE(i_mode) )  // Set to Max Freq Range for this mode
     {
       l_freq_min = G_sysConfigData.sys_mode_freq.table[OCC_MODE_MIN_FREQUENCY];
-      l_freq_max = G_sysConfigData.sys_mode_freq.table[i_mode];
+
+      // Use max frequency for performance modes and FMF
+      if( (i_mode == OCC_MODE_NOM_PERFORMANCE) || (i_mode == OCC_MODE_MAX_PERFORMANCE) ||
+          (i_mode == OCC_MODE_FMF) )
+        l_freq_max = G_proc_fmax_mhz;
+      else
+        l_freq_max = G_sysConfigData.sys_mode_freq.table[i_mode];
     }
 
     if( (l_freq_min == 0) || (l_freq_max == 0) )
diff --git a/src/occ_405/amec/amec_slave_smh.c b/src/occ_405/amec/amec_slave_smh.c
index 2f28289..c2daa54 100755
--- a/src/occ_405/amec/amec_slave_smh.c
+++ b/src/occ_405/amec/amec_slave_smh.c
@@ -248,7 +248,6 @@ void amec_slv_check_apss_fail(void)
             l_pstate = proc_freq2pstate(l_pmax_rail_freq);
 
             // Set the Pmax clip via PGPE
-            // There is no Pmax "rail" in P9, just set clips via PGPE
             amec_set_pmax_clip(l_pstate);
 
             L_lower_pmax_rail = TRUE;
@@ -368,11 +367,7 @@ void amec_slv_state_0(void)
 {
   AMEC_DBG("\tAMEC Slave State 0\n");
 
-  //-------------------------------------------------------
-  // Update Proc Core sensors (for this tick)
-  //-------------------------------------------------------
-
-/* Not yet supported
+/* Not yet supported  TODO Centaur support RTC 163359
   //-------------------------------------------------------
   // Update Centaur sensors (for this tick)
   //-------------------------------------------------------
@@ -417,12 +412,7 @@ void amec_slv_state_1(void)
 {
   AMEC_DBG("\tAMEC Slave State 1\n");
 
-  //-------------------------------------------------------
-  // Update Proc Core sensors (for this tick)
-  //-------------------------------------------------------
-
-
-/* Not yet supported
+/* Not yet supported   TODO Centaur support RTC 163359
   //-------------------------------------------------------
   // Update Centaur sensors (for this tick)
   //-------------------------------------------------------
@@ -447,11 +437,7 @@ void amec_slv_state_2(void)
 {
   AMEC_DBG("\tAMEC Slave State 2\n");
 
-  //-------------------------------------------------------
-  // Update Proc Core sensors (for this tick)
-  //-------------------------------------------------------
-
-/* Not yet supported
+/* Not yet supported   TODO Centaur support RTC 163359
   //-------------------------------------------------------
   // Update Centaur sensors (for this tick)
   //-------------------------------------------------------
@@ -474,13 +460,9 @@ void amec_slv_state_3(void)
   AMEC_DBG("\tAMEC Slave State 3\n");
 
   //-------------------------------------------------------
-  // Update Proc Core sensors (for this tick)
-  //-------------------------------------------------------
-
-  //-------------------------------------------------------
   // Update Centaur sensors (for this tick)
   //-------------------------------------------------------
-/* Not yet supported
+/* Not yet supported   TODO Centaur support RTC 163359
   amec_update_centaur_sensors(CENTAUR_3);
 
   //-------------------------------------------------------
@@ -504,13 +486,9 @@ void amec_slv_state_4(void)
 {
   AMEC_DBG("\tAMEC Slave State 4\n");
 
+/* Not yet supported  TODO Centaur support RTC 163359
   //-------------------------------------------------------
-  // Update Proc Core sensors (for this tick)
-  //-------------------------------------------------------
-
-/* Not yet supported
-  //-------------------------------------------------------
-  // Update Centaur sensors (for this tick)
+  // Update Centaur sensors (for this tick) 
   //-------------------------------------------------------
   amec_update_centaur_sensors(CENTAUR_4);
 */
@@ -567,20 +545,15 @@ void amec_slv_state_5(void)
   AMEC_DBG("\tAMEC Slave State 5\n");
 
   //-------------------------------------------------------
-  // Update Proc Core sensors (for this tick)
+  // Update Centaur sensors (for this tick) TODO Centaur support RTC 163359
   //-------------------------------------------------------
-
-/* Not yet supported
-  //-------------------------------------------------------
-  // Update Centaur sensors (for this tick)
-  //-------------------------------------------------------
-  amec_update_centaur_sensors(CENTAUR_5);
+//  amec_update_centaur_sensors(CENTAUR_5);
 
   //-------------------------------------------------------
   // Update partition sensors for DPS algorithms (for this tick)
   //-------------------------------------------------------
-  amec_dps_main();
-*/
+//  amec_dps_main();
+
 }
 
 
@@ -597,11 +570,7 @@ void amec_slv_state_6(void)
 {
   AMEC_DBG("\tAMEC Slave State 6\n");
 
-  //-------------------------------------------------------
-  // Update Proc Core sensors (for this tick)
-  //-------------------------------------------------------
-
-/* Not yet supported
+/* Not yet supported  TODO Centaur support RTC 163359
   //-------------------------------------------------------
   // Update Centaur sensors (for this tick)
   //-------------------------------------------------------
@@ -621,11 +590,7 @@ void amec_slv_state_7(void)
 {
   AMEC_DBG("\tAMEC Slave State 7\n");
 
-  //-------------------------------------------------------
-  // Update Proc Core sensors (for this tick)
-  //-------------------------------------------------------
-
-/* Not yet supported
+/* Not yet supported   TODO Centaur support RTC 163359
   //-------------------------------------------------------
   // Update Centaur sensors (for this tick)
   //-------------------------------------------------------