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
This commit is contained in:
committed by
Paul Fagerburg
parent
159284606a
commit
586b1beb9c
@@ -40,7 +40,6 @@ config CPU_SPECIFIC_OPTIONS
|
||||
select PARALLEL_MP_AP_WORK
|
||||
select MICROCODE_BLOB_UNDISCLOSED
|
||||
select PLATFORM_USES_FSP2_2
|
||||
select PM_ACPI_TIMER_OPTIONAL
|
||||
select PMC_GLOBAL_RESET_ENABLE_LOCK
|
||||
select SOC_INTEL_COMMON
|
||||
select SOC_INTEL_COMMON_ACPI_WAKE_SOURCE
|
||||
|
@@ -70,7 +70,6 @@ config CPU_SPECIFIC_OPTIONS
|
||||
select MRC_SETTINGS_PROTECT
|
||||
select PARALLEL_MP_AP_WORK
|
||||
select PLATFORM_USES_FSP2_0
|
||||
select PM_ACPI_TIMER_OPTIONAL
|
||||
select PMC_GLOBAL_RESET_ENABLE_LOCK
|
||||
select SOC_INTEL_COMMON
|
||||
select SOC_INTEL_COMMON_ACPI_WAKE_SOURCE
|
||||
|
@@ -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;
|
||||
|
@@ -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
|
||||
|
@@ -24,7 +24,6 @@ config CPU_SPECIFIC_OPTIONS
|
||||
select HAVE_SMI_HANDLER
|
||||
select CACHE_MRC_SETTINGS
|
||||
select PCR_COMMON_IOSF_1_0
|
||||
select PM_ACPI_TIMER_OPTIONAL
|
||||
select SUPPORT_CPU_UCODE_IN_CBFS
|
||||
select INTEL_DESCRIPTOR_MODE_CAPABLE
|
||||
select SOC_INTEL_COMMON_BLOCK
|
||||
|
@@ -30,7 +30,6 @@ config CPU_SPECIFIC_OPTIONS
|
||||
select PARALLEL_MP_AP_WORK
|
||||
select MICROCODE_BLOB_UNDISCLOSED
|
||||
select PLATFORM_USES_FSP2_1
|
||||
select PM_ACPI_TIMER_OPTIONAL
|
||||
select PMC_GLOBAL_RESET_ENABLE_LOCK
|
||||
select SOC_INTEL_COMMON
|
||||
select SOC_INTEL_COMMON_ACPI_WAKE_SOURCE
|
||||
|
@@ -30,7 +30,6 @@ config CPU_SPECIFIC_OPTIONS
|
||||
select PARALLEL_MP_AP_WORK
|
||||
select MICROCODE_BLOB_UNDISCLOSED
|
||||
select PLATFORM_USES_FSP2_1
|
||||
select PM_ACPI_TIMER_OPTIONAL
|
||||
select PMC_GLOBAL_RESET_ENABLE_LOCK
|
||||
select CPU_INTEL_COMMON
|
||||
select SOC_INTEL_COMMON
|
||||
|
@@ -31,7 +31,6 @@ config CPU_SPECIFIC_OPTIONS
|
||||
select PARALLEL_MP_AP_WORK
|
||||
select MICROCODE_BLOB_UNDISCLOSED
|
||||
select PLATFORM_USES_FSP2_2
|
||||
select PM_ACPI_TIMER_OPTIONAL
|
||||
select PMC_GLOBAL_RESET_ENABLE_LOCK
|
||||
select SOC_INTEL_COMMON
|
||||
select SOC_INTEL_COMMON_ACPI_WAKE_SOURCE
|
||||
|
@@ -44,7 +44,6 @@ config CPU_SPECIFIC_OPTIONS
|
||||
select MRC_SETTINGS_PROTECT
|
||||
select PARALLEL_MP_AP_WORK
|
||||
select PLATFORM_USES_FSP2_0
|
||||
select PM_ACPI_TIMER_OPTIONAL
|
||||
select PMC_GLOBAL_RESET_ENABLE_LOCK
|
||||
select SA_ENABLE_DPR
|
||||
select SOC_INTEL_COMMON
|
||||
|
@@ -39,7 +39,6 @@ config CPU_SPECIFIC_OPTIONS
|
||||
select MRC_SETTINGS_PROTECT
|
||||
select PARALLEL_MP_AP_WORK
|
||||
select PLATFORM_USES_FSP2_2
|
||||
select PM_ACPI_TIMER_OPTIONAL
|
||||
select PMC_GLOBAL_RESET_ENABLE_LOCK
|
||||
select SOC_INTEL_COMMON
|
||||
select SOC_INTEL_COMMON_ACPI_WAKE_SOURCE
|
||||
|
@@ -36,7 +36,6 @@ config CPU_SPECIFIC_OPTIONS
|
||||
select FSP_M_XIP
|
||||
select POSTCAR_STAGE
|
||||
select PARALLEL_MP_AP_WORK
|
||||
select PM_ACPI_TIMER_OPTIONAL
|
||||
select PMC_GLOBAL_RESET_ENABLE_LOCK
|
||||
select INTEL_DESCRIPTOR_MODE_CAPABLE
|
||||
select SOC_INTEL_COMMON_BLOCK
|
||||
|
Reference in New Issue
Block a user