[coreboot-gerrit] Change in coreboot[master]: Revert "soc/intel/cannonlake: Enable ACPI timer emulation if PM timer...

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/45000 )

Change subject: Revert "soc/intel/cannonlake: Enable ACPI timer emulation if PM timer is disabled"
......................................................................

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 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/45000
Tested-by: build bot (Jenkins) 
Reviewed-by: Nico Huber 
Reviewed-by: Furquan Shaikh 
---
M src/soc/intel/cannonlake/cpu.c
1 file changed, 0 insertions(+), 6 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Nico Huber: Looks good to me, but someone else must approve
  Furquan Shaikh: Looks good to me, approved

diff --git a/src/soc/intel/cannonlake/cpu.c b/src/soc/intel/cannonlake/cpu.c
index 0c24535..3d97c56 100644
--- a/src/soc/intel/cannonlake/cpu.c
+++ b/src/soc/intel/cannonlake/cpu.c
@@ -112,14 +112,8 @@
  */
 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.