aboutsummaryrefslogtreecommitdiff
path: root/src/soc/intel
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2020-06-02 05:05:30 +0300
committerPatrick Georgi <pgeorgi@google.com>2020-06-16 08:02:54 +0000
commitad882c3b171ccd71d84ddc971ab0c4ae563190de (patch)
treef2f5df34b60fc1ba767370adbd2a8cb564752138 /src/soc/intel
parentb6585481e8cb30ed04a1673b170af3df9e0e4320 (diff)
sb/intel: Remove spurious HAVE_SMI_HANDLER test
There are no side-effects in calling acpi_is_wakeup_s3() and apm_control() is a no-op with HAVE_SMI_HANDLER=n. Change-Id: Ia9195781955cc5fa96d0690aa7735fc590e527e4 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/41986 Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Patrick Rudolph <patrick.rudolph@9elements.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/intel')
-rw-r--r--src/soc/intel/broadwell/lpc.c2
-rw-r--r--src/soc/intel/common/block/pmc/pmc.c2
-rw-r--r--src/soc/intel/denverton_ns/pmc.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/soc/intel/broadwell/lpc.c b/src/soc/intel/broadwell/lpc.c
index d5f8451272..b841291086 100644
--- a/src/soc/intel/broadwell/lpc.c
+++ b/src/soc/intel/broadwell/lpc.c
@@ -409,7 +409,7 @@ static void pch_cg_init(struct device *dev)
static void pch_set_acpi_mode(void)
{
- if (CONFIG(HAVE_SMI_HANDLER) && !acpi_is_wakeup_s3()) {
+ if (!acpi_is_wakeup_s3()) {
apm_control(APM_CNT_ACPI_DISABLE);
}
}
diff --git a/src/soc/intel/common/block/pmc/pmc.c b/src/soc/intel/common/block/pmc/pmc.c
index cc004191ef..84e22a2585 100644
--- a/src/soc/intel/common/block/pmc/pmc.c
+++ b/src/soc/intel/common/block/pmc/pmc.c
@@ -93,7 +93,7 @@ static void pch_pmc_read_resources(struct device *dev)
void pmc_set_acpi_mode(void)
{
- if (CONFIG(HAVE_SMI_HANDLER) && !acpi_is_wakeup_s3()) {
+ if (!acpi_is_wakeup_s3()) {
apm_control(APM_CNT_ACPI_DISABLE);
}
}
diff --git a/src/soc/intel/denverton_ns/pmc.c b/src/soc/intel/denverton_ns/pmc.c
index 3c592fe05f..64121449f5 100644
--- a/src/soc/intel/denverton_ns/pmc.c
+++ b/src/soc/intel/denverton_ns/pmc.c
@@ -24,7 +24,7 @@ static void pch_power_options(struct device *dev) { /* TODO */ }
static void pch_set_acpi_mode(void)
{
- if (CONFIG(HAVE_SMI_HANDLER) && !acpi_is_wakeup_s3()) {
+ if (!acpi_is_wakeup_s3()) {
apm_control(APM_CNT_ACPI_DISABLE);
}
}