summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cpu/intel/haswell/haswell_init.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/cpu/intel/haswell/haswell_init.c b/src/cpu/intel/haswell/haswell_init.c
index ff9573f6f8..920a7e7bb3 100644
--- a/src/cpu/intel/haswell/haswell_init.c
+++ b/src/cpu/intel/haswell/haswell_init.c
@@ -541,7 +541,10 @@ static void set_max_ratio(void)
perf_ctl.hi = 0;
/* Check for configurable TDP option */
- if (cpu_config_tdp_levels()) {
+ if (get_turbo_state() == TURBO_ENABLED) {
+ msr = rdmsr(MSR_TURBO_RATIO_LIMIT);
+ perf_ctl.lo = (msr.lo & 0xff) << 8;
+ } else if (cpu_config_tdp_levels()) {
/* Set to nominal TDP ratio */
msr = rdmsr(MSR_CONFIG_TDP_NOMINAL);
perf_ctl.lo = (msr.lo & 0xff) << 8;
@@ -600,9 +603,6 @@ static void cpu_core_init(struct device *cpu)
/* Set energy policy */
set_energy_perf_bias(ENERGY_POLICY_NORMAL);
- /* Set Max Ratio */
- set_max_ratio();
-
/* Enable Turbo */
enable_turbo();
}
@@ -658,6 +658,9 @@ static void per_cpu_smm_trigger(void)
static void post_mp_init(void)
{
+ /* Set Max Ratio */
+ set_max_ratio();
+
/* Now that all APs have been relocated as well as the BSP let SMIs
* start flowing. */
global_smi_enable();