From c9a12f2402bb9151f8a0643d98bb6915bf06531e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Niew=C3=B6hner?= Date: Fri, 24 Sep 2021 23:22:51 +0200 Subject: soc/intel/{common,apl,glk}: guard PM Timer option on SoCs w/o PM Timer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apollo Lake and Gemini Lake do not have a hardware PM ACPI timer but only uCode PM Timer emulation. Add a Kconfig `NO_PM_ACPI_TIMER` denoting SoCs without PM Timer and make it mutually exclusive with the Kconfig `USE_PM_ACPI_TIMER`. This is partly redundant to `PM_ACPI_TIMER_OPTIONAL`, which will be dropped in the follow-up change, though. Change-Id: Ic323bbfb7089c53a6f22724910a0ff3df8904ebd Signed-off-by: Michael Niewöhner Reviewed-on: https://review.coreboot.org/c/coreboot/+/57931 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- src/soc/intel/apollolake/Kconfig | 1 + src/soc/intel/common/block/pmc/Kconfig | 6 ++++++ 2 files changed, 7 insertions(+) (limited to 'src/soc') diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig index 6395f16f7c..0302546335 100644 --- a/src/soc/intel/apollolake/Kconfig +++ b/src/soc/intel/apollolake/Kconfig @@ -48,6 +48,7 @@ config CPU_SPECIFIC_OPTIONS select MRC_SETTINGS_PROTECT select MRC_SETTINGS_VARIABLE_DATA select NO_XIP_EARLY_STAGES + select NO_PM_ACPI_TIMER select PARALLEL_MP_AP_WORK select PCIEXP_ASPM select PCIEXP_COMMON_CLOCK diff --git a/src/soc/intel/common/block/pmc/Kconfig b/src/soc/intel/common/block/pmc/Kconfig index f60dc69692..6ec9339806 100644 --- a/src/soc/intel/common/block/pmc/Kconfig +++ b/src/soc/intel/common/block/pmc/Kconfig @@ -50,6 +50,11 @@ config PMC_GLOBAL_RESET_ENABLE_LOCK Note that the reset register is still at 0xCF9 this only controls the enable and lock feature. +config NO_PM_ACPI_TIMER + bool + help + Selected by SoCs that do not have a PM ACPI timer. + config PM_ACPI_TIMER_OPTIONAL bool default n @@ -62,6 +67,7 @@ if PM_ACPI_TIMER_OPTIONAL config USE_PM_ACPI_TIMER bool "Enable ACPI PM timer" default y + depends on !NO_PM_ACPI_TIMER help This should be disabled for devices running on battery since it can draw much power. Further, it must be disabled, if S0ix -- cgit v1.2.3