Firestone fix for full frequency range on slave OCCs

This fix is intended to allow slave OCCs to have the full
frequency range. Master OCC does not have this problem.

Change-Id: I67759eb1038787fde43b6d9bc44fbb5b23c0e517
CQ:SW311104
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/18502
Tested-by: FSP CI Jenkins
Reviewed-by: ANDRES A. LUGO-REYES <aalugore@us.ibm.com>
Reviewed-by: Guillermo J. Silva <guilsilv@us.ibm.com>
Tested-by: Guillermo J. Silva <guilsilv@us.ibm.com>

2 files changed, 15 insertions, 8 deletions

diff --git a/src/occ/amec/amec_data.c b/src/occ/amec/amec_data.c
index 7321689..2556f5f 100755
--- a/src/occ/amec/amec_data.c
+++ b/src/occ/amec/amec_data.c
@@ -5,10 +5,10 @@
 /*                                                                        */
 /* OpenPOWER OnChipController Project                                     */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2011,2014                        */
-/* [+] Google Inc.                                                        */
+/* Contributors Listed Below - COPYRIGHT 2011,2015                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
+/*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
 /* You may obtain a copy of the License at                                */
@@ -64,6 +64,7 @@
 //*************************************************************************
 // Globals
 //*************************************************************************
+extern uint8_t G_occ_interrupt_type;
 
 //*************************************************************************
 // Function Prototypes
@@ -117,6 +118,18 @@ errlHndl_t AMEC_data_write_fcurr(const OCC_MODE i_mode)
         }
     }
 
+    // If we are in OpenPower environment, load this new range into DVFS
+    // min/max for AMEC component
+    if(G_occ_interrupt_type != FSP_SUPPORTED_OCC)
+    {
+        g_amec->sys.fmax = G_sysConfigData.sys_mode_freq.table[OCC_MODE_TURBO];
+        g_amec->sys.fmin = G_sysConfigData.sys_mode_freq.table[OCC_MODE_MIN_FREQUENCY];
+
+        TRAC_INFO("AMEC_data_write_fcurr: New frequency range Fmin[%u] Fmax[%u]",
+                  g_amec->sys.fmin,
+                  g_amec->sys.fmax);
+    }
+
     return l_err;
 }
 
diff --git a/src/occ/cmdh/cmdh_fsp_cmds_datacnfg.c b/src/occ/cmdh/cmdh_fsp_cmds_datacnfg.c
index 5d811dc..6b73c89 100755
--- a/src/occ/cmdh/cmdh_fsp_cmds_datacnfg.c
+++ b/src/occ/cmdh/cmdh_fsp_cmds_datacnfg.c
@@ -391,9 +391,6 @@ errlHndl_t data_store_freq_data(const cmdh_fsp_cmd_t * i_cmd_ptr,
 
             TRAC_INFO("Min frequency = %d", l_freq);
 
-            // Store the Fmax and Fmin for AMEC (OpenPower environment only)
-            g_amec->sys.fmax = l_table[OCC_MODE_TURBO];
-            g_amec->sys.fmin = l_table[OCC_MODE_MIN_FREQUENCY];
         }
         else if(DATA_FREQ_VERSION_11 == l_cmdp->version) // Version 0x11 - OpenPower
         {
@@ -416,9 +413,6 @@ errlHndl_t data_store_freq_data(const cmdh_fsp_cmd_t * i_cmd_ptr,
             l_freq = (l_buf[6] << 8 | l_buf[7]);
             TRAC_INFO("UT frequency = %d", l_freq);
 
-            // Store the Fmax and Fmin for AMEC (OpenPower environment only)
-            g_amec->sys.fmax = l_table[OCC_MODE_TURBO];
-            g_amec->sys.fmin = l_table[OCC_MODE_MIN_FREQUENCY];
         }
 
     }while(0);