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

[Aamir Bohra (Code Review)]

Aamir Bohra has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/34563 )

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

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 
---
M src/soc/intel/cannonlake/cpu.c
1 file changed, 5 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/63/34563/1

diff --git a/src/soc/intel/cannonlake/cpu.c b/src/soc/intel/cannonlake/cpu.c
index 7eb413c..1058443 100644
--- a/src/soc/intel/cannonlake/cpu.c
+++ b/src/soc/intel/cannonlake/cpu.c
@@ -384,8 +384,12 @@
  */
 static void enable_pm_timer_emulation(void)
 {
-	/* ACPI PM timer emulation */
+	config_t *conf = config_of_path(SA_DEVFN_ROOT);
    msr_t msr;
+
+	/* 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.