Meera Ravindranath has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36932 )
Change subject: soc/intel/tigerlake: Use ACPI timer config from soc common code ......................................................................
soc/intel/tigerlake: Use ACPI timer config from soc common code
Replace the usage of structure member "PMTimerDisabled" of struct "soc_intel_tigerlake_config" in soc code with ACPI timer config defined under soc/intel/common/block/timer/Kconfig.
BUG=none TEST=none
Change-Id: I42fcf23524889d47e4491fac672ca6b1587ab348 Signed-off-by: Meera Ravindranath meera.ravindranath@intel.com --- M src/soc/intel/tigerlake/acpi.c M src/soc/intel/tigerlake/chip.h M src/soc/intel/tigerlake/finalize.c 3 files changed, 2 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/32/36932/1
diff --git a/src/soc/intel/tigerlake/acpi.c b/src/soc/intel/tigerlake/acpi.c index 225f4e8..894c31c 100644 --- a/src/soc/intel/tigerlake/acpi.c +++ b/src/soc/intel/tigerlake/acpi.c @@ -171,7 +171,7 @@
config_t *config = config_of_soc();
- if (!config->PmTimerDisabled) { + if (CONFIG_ENABLE_ACPI_PM_TIMER) { fadt->pm_tmr_blk = pmbase + PM1_TMR; fadt->pm_tmr_len = 4; fadt->x_pm_tmr_blk.space_id = 1; diff --git a/src/soc/intel/tigerlake/chip.h b/src/soc/intel/tigerlake/chip.h index 32dc02c..bb00b55 100644 --- a/src/soc/intel/tigerlake/chip.h +++ b/src/soc/intel/tigerlake/chip.h @@ -207,8 +207,6 @@ /* Enable C6 DRAM */ uint8_t enable_c6dram;
- uint8_t PmTimerDisabled; - /* Desired platform debug type. */ enum { DebugConsent_Disabled, diff --git a/src/soc/intel/tigerlake/finalize.c b/src/soc/intel/tigerlake/finalize.c index ac9dc24..ea5c909 100644 --- a/src/soc/intel/tigerlake/finalize.c +++ b/src/soc/intel/tigerlake/finalize.c @@ -91,7 +91,7 @@ */ config = config_of_soc(); pmcbase = pmc_mmio_regs(); - if (config->PmTimerDisabled) { + if (!CONFIG_ENABLE_ACPI_PM_TIMER) { reg8 = read8(pmcbase + PCH_PWRM_ACPI_TMR_CTL); reg8 |= (1 << 1); write8(pmcbase + PCH_PWRM_ACPI_TMR_CTL, reg8);