From e5269a8fd975fa0cba0655cd41f7f8cc99a1feb8 Mon Sep 17 00:00:00 2001 From: Aamir Bohra Date: Thu, 25 Jul 2019 11:52:35 +0530 Subject: soc/intel/cannonlake: Enable ACPI timer emulation if PM timer is disabled Add a check to enable ACPI timer emulation only when the APCI PM timer is disabled. Change-Id: I21c0b89218d0df9336e0b0e15f1b575b8508fb96 Signed-off-by: Aamir Bohra Reviewed-on: https://review.coreboot.org/c/coreboot/+/34563 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh Reviewed-by: Subrata Banik --- src/soc/intel/cannonlake/cpu.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/soc/intel') diff --git a/src/soc/intel/cannonlake/cpu.c b/src/soc/intel/cannonlake/cpu.c index b0eaa5dd34..6682cdc7b9 100644 --- a/src/soc/intel/cannonlake/cpu.c +++ b/src/soc/intel/cannonlake/cpu.c @@ -384,8 +384,14 @@ static void configure_thermal_target(void) */ static void enable_pm_timer_emulation(void) { - /* ACPI PM timer emulation */ + const struct soc_intel_cannonlake_config *config; msr_t msr; + + config = config_of_path(SA_DEVFN_ROOT); + + /* Enable PM timer emulation only if ACPI PM timer is disabled */ + if (!config->PmTimerDisabled) + return; /* * The derived frequency is calculated as follows: * (CTC_FREQ * msr[63:32]) >> 32 = target frequency. -- cgit v1.2.3