diff options
| author | Chris Cain <cjcain@us.ibm.com> | 2017-05-11 16:50:46 -0500 |
|---|---|---|
| committer | Christopher J. Cain <cjcain@us.ibm.com> | 2017-05-15 16:00:57 -0400 |
| commit | e919c4a61d53fb909beee113f43c4d3da8b2c77a (patch) | |
| tree | 201f222e35c2d99e9918c096a899848dcc686598 /src/occ_405/amec/amec_pcap.c | |
| parent | b8d42ae5170515e5a465c002d9f2449c12906469 (diff) | |
| download | talos-occ-e919c4a61d53fb909beee113f43c4d3da8b2c77a.tar.gz talos-occ-e919c4a61d53fb909beee113f43c4d3da8b2c77a.zip | |
Witherspoon pstate updates
- Adjust fmax on slave to account for diff freq
- Remove SIMICS_FLAG_ISSUE (automic registers not working in simics)
- Cleanup traces
Change-Id: Ifc30333463bc5a1e44ec81bd365860460b802e71
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40461
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>
Reviewed-by: Andres A. Lugo-Reyes <aalugore@us.ibm.com>
Reviewed-by: Christopher J. Cain <cjcain@us.ibm.com>
Diffstat (limited to 'src/occ_405/amec/amec_pcap.c')
| -rwxr-xr-x | src/occ_405/amec/amec_pcap.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/occ_405/amec/amec_pcap.c b/src/occ_405/amec/amec_pcap.c index 81b75ac..24557d4 100755 --- a/src/occ_405/amec/amec_pcap.c +++ b/src/occ_405/amec/amec_pcap.c @@ -73,6 +73,8 @@ uint32_t G_mhz_per_pstate=0; uint8_t G_over_pcap_count=0; +extern uint16_t G_proc_fmax_mhz; // max(turbo,uturbo) frequencies + //*************************************************************************/ // Function Prototypes //*************************************************************************/ @@ -250,9 +252,9 @@ void amec_pcap_controller(void) l_proc_pcap_vote += (PROC_MHZ_PER_WATT * l_power_avail); } - if(l_proc_pcap_vote > G_sysConfigData.sys_mode_freq.table[OCC_MODE_TURBO]) + if(l_proc_pcap_vote > G_proc_fmax_mhz) { - l_proc_pcap_vote = G_sysConfigData.sys_mode_freq.table[OCC_MODE_TURBO]; + l_proc_pcap_vote = G_proc_fmax_mhz; } if(l_proc_pcap_vote < G_sysConfigData.sys_mode_freq.table[OCC_MODE_MIN_FREQUENCY]) @@ -338,9 +340,9 @@ void amec_ppb_fmax_calc(void) G_sysConfigData.master_ppb_fmax += NODE_MHZ_PER_WATT() * l_power_avail; } - if(G_sysConfigData.master_ppb_fmax > G_sysConfigData.sys_mode_freq.table[OCC_MODE_TURBO]) + if(G_sysConfigData.master_ppb_fmax > G_proc_fmax_mhz) { - G_sysConfigData.master_ppb_fmax = G_sysConfigData.sys_mode_freq.table[OCC_MODE_TURBO]; + G_sysConfigData.master_ppb_fmax = G_proc_fmax_mhz; } if(G_sysConfigData.master_ppb_fmax < G_sysConfigData.sys_mode_freq.table[OCC_MODE_MIN_FREQUENCY]) |
