[coreboot-gerrit] Change in coreboot[master]: cpu/intel/haswell: Enable turbo ratio if available

[Nico Huber (Code Review)]

Nico Huber has submitted this change. ( https://review.coreboot.org/c/coreboot/+/46918 )

Change subject: cpu/intel/haswell: Enable turbo ratio if available
......................................................................

cpu/intel/haswell: Enable turbo ratio if available

Commit 7f28e4ee01 (broadwell: Enable turbo ratio if available) is also
applicable to Haswell, since the MSR definitions are the same for both.

Change-Id: Ic5f30a5b06301449253bbfb9ed58c6b35a767763
Signed-off-by: Angel Pons 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46918
Reviewed-by: Nico Huber 
Tested-by: build bot (Jenkins) 
---
M src/cpu/intel/haswell/haswell_init.c
1 file changed, 7 insertions(+), 4 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Nico Huber: Looks good to me, approved

diff --git a/src/cpu/intel/haswell/haswell_init.c b/src/cpu/intel/haswell/haswell_init.c
index ff9573f..920a7e7 100644
--- a/src/cpu/intel/haswell/haswell_init.c
+++ b/src/cpu/intel/haswell/haswell_init.c
@@ -541,7 +541,10 @@
    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 @@
    /* 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 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();