From 4b6ff98e84832bbdaab002dc6d5c860ec3b37ad5 Mon Sep 17 00:00:00 2001 From: Michael Niewöhner Date: Mon, 5 Oct 2020 16:56:31 +0000 Subject: Revert "soc/intel/cannonlake: Enable ACPI timer emulation if PM timer is disabled" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit e5269a8fd975fa0cba0655cd41f7f8cc99a1feb8. Reason for revert: BIOS spec says, it's recommended to always enable emulation (regardless of the OS version). Change-Id: If0d7fa6f9766c7c4e2fa9e846c179adc6a4e1681 Signed-off-by: Michael Niewöhner Reviewed-on: https://review.coreboot.org/c/coreboot/+/45000 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber Reviewed-by: Furquan Shaikh --- src/soc/intel/cannonlake/cpu.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/soc/intel/cannonlake/cpu.c') diff --git a/src/soc/intel/cannonlake/cpu.c b/src/soc/intel/cannonlake/cpu.c index 0c24535816..3d97c56404 100644 --- a/src/soc/intel/cannonlake/cpu.c +++ b/src/soc/intel/cannonlake/cpu.c @@ -112,14 +112,8 @@ static void configure_dca_cap(void) */ static void enable_pm_timer_emulation(void) { - const struct soc_intel_cannonlake_config *config; msr_t msr; - config = config_of_soc(); - - /* 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