Change in coreboot[master]: soc/intel/pmc: Revise PM timer Kconfig options

[Nico Huber (Code Review)]

Attention is currently required from: Michael Niewöhner.
Hello Michael Niewöhner,

I'd like you to do a code review. Please visit

https://review.coreboot.org/c/coreboot/+/58085

to review the following change.

Change subject: soc/intel/pmc: Revise PM timer Kconfig options
......................................................................

soc/intel/pmc: Revise PM timer Kconfig options

Now that all platforms use Kconfig to control disabling of the PM timer,
the USE_PM_ACPI_TIMER option can also be useful to reflect the expected
state of the timer.

USE_PM_ACPI_TIMER will always default to `y`, unless one of the fol-
lowing holds:
* there is no hardware PM timer,
* the mainboard port changed the default (e.g. to conserve power), or
* the user opted out.

For the first case we add a new option HAVE_PM_ACPI_TIMER that is
overridden by platforms that don't have one.

The PM_ACPI_TIMER_OPTIONAL option now only controls the prompt for
USE_PM_ACPI_TIMER and can be removed later, once all platforms honor
the USE_PM_ACPI_TIMER setting.

Change-Id: I28b439e4e3e1128104390ac9e59d0b2cc1a64814
Signed-off-by: Nico Huber 
---
M src/soc/intel/apollolake/Kconfig
M src/soc/intel/common/block/pmc/Kconfig
2 files changed, 12 insertions(+), 6 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/85/58085/1

diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index 6395f16..3089925 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -394,4 +394,7 @@
 config INTEL_GMA_BCLM_WIDTH
    default 32

+config HAVE_PM_ACPI_TIMER
+	default n
+
 endif
diff --git a/src/soc/intel/common/block/pmc/Kconfig b/src/soc/intel/common/block/pmc/Kconfig
index aaf4479..b92d718 100644
--- a/src/soc/intel/common/block/pmc/Kconfig
+++ b/src/soc/intel/common/block/pmc/Kconfig
@@ -56,18 +56,23 @@
      Enable this for PMC devices to perform registers programming
      to ensure low power in active idle scenario.

+config HAVE_PM_ACPI_TIMER
+	bool
+	default y
+	help
+	  Set if a hardware ACPI PM timer is available.
+
 config PM_ACPI_TIMER_OPTIONAL
    bool
    default n
+	depends on HAVE_PM_ACPI_TIMER
    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
+	bool "Enable ACPI PM timer" if PM_ACPI_TIMER_OPTIONAL
+	default HAVE_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
@@ -75,5 +80,3 @@

Disabling this option also stops the hardware TCO timer and makes
      the TCO watchdog unavailable.
-
-endif # PM_ACPI_TIMER_OPTIONAL