GNUBoot/coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cpu/intel/haswell: Align cosmetics with Broadwell

Browse source 
Tested with BUILD_TIMELESS=1, Asrock B85M Pro4 remains identical.

Change-Id: I3eb522a48edf9e8fc7664141253ae4e2072d71fa
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46913
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Angel Pons 2020-10-28 19:38:12 +01:00
parent 829fb2e985
commit 4c95f10232
1 changed files with 33 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/cpu/intel/haswell/haswell_init.c
View file

@ -304,14 +304,15 @@ static void initialize_vr_config(void)
wrmsr(MSR_VR_MISC_CONFIG, msr); wrmsr(MSR_VR_MISC_CONFIG, msr);
/* Configure VR_MISC_CONFIG2 MSR. */ /* Configure VR_MISC_CONFIG2 MSR. */
if (haswell_is_ult()) { if (!haswell_is_ult())
return;
msr = rdmsr(MSR_VR_MISC_CONFIG2); msr = rdmsr(MSR_VR_MISC_CONFIG2);
msr.lo &= ~0xffff; msr.lo &= ~0xffff;
/* Allow CPU to control minimum voltage completely (15:8) and /* Allow CPU to control minimum voltage completely (15:8) and
* set the fast ramp voltage to 1110mV (0x6f in 10mV steps). */ * set the fast ramp voltage to 1110mV (0x6f in 10mV steps). */
msr.lo |= 0x006f; msr.lo |= 0x006f;
wrmsr(MSR_VR_MISC_CONFIG2, msr); wrmsr(MSR_VR_MISC_CONFIG2, msr);
}
} }
static void configure_pch_power_sharing(void) static void configure_pch_power_sharing(void)
@ -382,8 +383,7 @@ void set_power_limits(u8 power_limit_1_time)
u8 power_limit_1_val; u8 power_limit_1_val;
if (power_limit_1_time >= ARRAY_SIZE(power_limit_time_sec_to_msr)) if (power_limit_1_time >= ARRAY_SIZE(power_limit_time_sec_to_msr))
power_limit_1_time = ARRAY_SIZE(power_limit_time_sec_to_msr) power_limit_1_time = ARRAY_SIZE(power_limit_time_sec_to_msr) - 1;
- 1;
if (!(msr.lo & PLATFORM_INFO_SET_TDP)) if (!(msr.lo & PLATFORM_INFO_SET_TDP))
return; return;
@ -491,26 +491,24 @@ static void configure_c_states(void)
msr.lo = IRTL_VALID | IRTL_1024_NS | C_STATE_LATENCY_CONTROL_2_LIMIT; msr.lo = IRTL_VALID | IRTL_1024_NS | C_STATE_LATENCY_CONTROL_2_LIMIT;
wrmsr(MSR_C_STATE_LATENCY_CONTROL_2, msr); wrmsr(MSR_C_STATE_LATENCY_CONTROL_2, msr);
/* Haswell ULT only supoprts the 3-5 latency response registers.*/ /* Only Haswell ULT supports the 3-5 latency response registers */
if (haswell_is_ult()) { if (!haswell_is_ult())
return;
/* C-state Interrupt Response Latency Control 3 - package C8 */ /* C-state Interrupt Response Latency Control 3 - package C8 */
msr.hi = 0; msr.hi = 0;
msr.lo = IRTL_VALID | IRTL_1024_NS | msr.lo = IRTL_VALID | IRTL_1024_NS | C_STATE_LATENCY_CONTROL_3_LIMIT;
C_STATE_LATENCY_CONTROL_3_LIMIT;
wrmsr(MSR_C_STATE_LATENCY_CONTROL_3, msr); wrmsr(MSR_C_STATE_LATENCY_CONTROL_3, msr);
/* C-state Interrupt Response Latency Control 4 - package C9 */ /* C-state Interrupt Response Latency Control 4 - package C9 */
msr.hi = 0; msr.hi = 0;
msr.lo = IRTL_VALID | IRTL_1024_NS | msr.lo = IRTL_VALID | IRTL_1024_NS | C_STATE_LATENCY_CONTROL_4_LIMIT;
C_STATE_LATENCY_CONTROL_4_LIMIT;
wrmsr(MSR_C_STATE_LATENCY_CONTROL_4, msr); wrmsr(MSR_C_STATE_LATENCY_CONTROL_4, msr);
/* C-state Interrupt Response Latency Control 5 - package C10 */ /* C-state Interrupt Response Latency Control 5 - package C10 */
msr.hi = 0; msr.hi = 0;
msr.lo = IRTL_VALID | IRTL_1024_NS | msr.lo = IRTL_VALID | IRTL_1024_NS | C_STATE_LATENCY_CONTROL_5_LIMIT;
C_STATE_LATENCY_CONTROL_5_LIMIT;
wrmsr(MSR_C_STATE_LATENCY_CONTROL_5, msr); wrmsr(MSR_C_STATE_LATENCY_CONTROL_5, msr);
}
} }
static void configure_thermal_target(void) static void configure_thermal_target(void)
@ -595,7 +593,7 @@ static void configure_mca(void)
} }
/* All CPUs including BSP will run the following function. */ /* All CPUs including BSP will run the following function. */
static void haswell_init(struct device *cpu) static void cpu_core_init(struct device *cpu)
{ {
/* Clear out pending MCEs */ /* Clear out pending MCEs */
configure_mca(); configure_mca();
@ -640,10 +638,11 @@ static void pre_mp_init(void)
initialize_vr_config(); initialize_vr_config();
if (haswell_is_ult()) { if (!haswell_is_ult())
return;
calibrate_24mhz_bclk(); calibrate_24mhz_bclk();
configure_pch_power_sharing(); configure_pch_power_sharing();
}
} }
static int get_cpu_count(void) static int get_cpu_count(void)
@ -705,7 +704,7 @@ void mp_init_cpus(struct bus *cpu_bus)
} }
static struct device_operations cpu_dev_ops = { static struct device_operations cpu_dev_ops = {
.init = haswell_init, .init = cpu_core_init,
}; };
static const struct cpu_device_id cpu_table[] = { static const struct cpu_device_id cpu_table[] = {