summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niewöhner <foss@mniewoehner.de>2020-10-05 16:56:31 +0000
committerPatrick Georgi <pgeorgi@google.com>2020-10-19 07:08:57 +0000
commit4b6ff98e84832bbdaab002dc6d5c860ec3b37ad5 (patch)
tree493409551cb9a80879bcca3bc4113d9e567bd6d0
parent4eedd938fa2882f0847d60b29c89bb98f435a37d (diff)
Revert "soc/intel/cannonlake: Enable ACPI timer emulation if PM timer is disabled"
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 <foss@mniewoehner.de> Reviewed-on: https://review.coreboot.org/c/coreboot/+/45000 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Nico Huber <nico.h@gmx.de> Reviewed-by: Furquan Shaikh <furquan@google.com>
-rw-r--r--src/soc/intel/cannonlake/cpu.c6
1 files changed, 0 insertions, 6 deletions
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.