diff options
| author | Michael Niewöhner <foss@mniewoehner.de> | 2021-09-27 23:08:59 +0200 |
|---|---|---|
| committer | Paul Fagerburg <pfagerburg@chromium.org> | 2021-11-08 21:11:05 +0000 |
| commit | 586b1beb9c11165265310883bfca209a0356c0ab (patch) | |
| tree | 6af5885f604d433eacd9574e5f12727592da812d /src/soc/intel/common/block | |
| parent | 159284606a761ea7f5574d9e8eb5cde20a1300ef (diff) | |
soc/intel: drop Kconfig `PM_ACPI_TIMER_OPTIONAL`
Technically, it's not depending on the hardware but on the software
(OS/payload), if the PM Timer is optional. OSes with ACPI >= 5.0A
support disabling of the PM Timer, when the respective FADT flag is
unset. Thus, drop this guard.
For platforms without hardware PM Timer (Apollo Lake, Gemini Lake) the
Kconfig `USE_PM_ACPI_TIMER` depends on `!NO_PM_ACPI_TIMER`.
As of this change, new platforms must either implement code for
disabling the hardware PM timer or select `NO_PM_ACPI_TIMER` if no such
is present.
Change-Id: I973ad418ba43cbd80b023abf94d3548edc53a561
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/58017
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Lance Zhao
Diffstat (limited to 'src/soc/intel/common/block')
| -rw-r--r-- | src/soc/intel/common/block/acpi/acpi.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/common/block/pmc/Kconfig | 11 |
2 files changed, 1 insertions, 12 deletions
diff --git a/src/soc/intel/common/block/acpi/acpi.c b/src/soc/intel/common/block/acpi/acpi.c index af7212e70e..16017779d9 100644 --- a/src/soc/intel/common/block/acpi/acpi.c +++ b/src/soc/intel/common/block/acpi/acpi.c @@ -142,7 +142,7 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) ACPI_FADT_SLEEP_BUTTON | ACPI_FADT_SEALED_CASE | ACPI_FADT_S4_RTC_WAKE; - if (CONFIG(USE_PM_ACPI_TIMER) || !CONFIG(PM_ACPI_TIMER_OPTIONAL)) + if (CONFIG(USE_PM_ACPI_TIMER)) fadt->flags |= ACPI_FADT_PLATFORM_CLOCK; fadt->x_pm1a_evt_blk.space_id = ACPI_ADDRESS_SPACE_IO; diff --git a/src/soc/intel/common/block/pmc/Kconfig b/src/soc/intel/common/block/pmc/Kconfig index 6ec9339806..fa1a99076b 100644 --- a/src/soc/intel/common/block/pmc/Kconfig +++ b/src/soc/intel/common/block/pmc/Kconfig @@ -55,15 +55,6 @@ config NO_PM_ACPI_TIMER help Selected by SoCs that do not have a PM ACPI timer. -config PM_ACPI_TIMER_OPTIONAL - bool - default n - help - This needs to be selected by SoCs, where the hardware PM Timer - can be disabled, to show the ACPI PM Timer Kconfig in menuconfig. - -if PM_ACPI_TIMER_OPTIONAL - config USE_PM_ACPI_TIMER bool "Enable ACPI PM timer" default y @@ -82,5 +73,3 @@ config USE_PM_ACPI_TIMER (Legacy) software requiring `TMR_STS` (for timer overflow interrupts) will not work with this option disabled. - -endif # PM_ACPI_TIMER_OPTIONAL |