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

[Subrata Banik (Code Review)]

Subrata Banik has submitted this change and it was merged. ( 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 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34563
Tested-by: build bot (Jenkins) 
Reviewed-by: Furquan Shaikh 
Reviewed-by: Subrata Banik 
---
M src/soc/intel/cannonlake/cpu.c
1 file changed, 7 insertions(+), 1 deletion(-)

Approvals:
  build bot (Jenkins): Verified
  Furquan Shaikh: Looks good to me, approved
  Subrata Banik: Looks good to me, approved

diff --git a/src/soc/intel/cannonlake/cpu.c b/src/soc/intel/cannonlake/cpu.c
index b0eaa5d..6682cdc 100644
--- a/src/soc/intel/cannonlake/cpu.c
+++ b/src/soc/intel/cannonlake/cpu.c
@@ -384,8 +384,14 @@
  */
 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.