aboutsummaryrefslogtreecommitdiff
path: root/src/southbridge/intel/ibexpeak
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/southbridge/intel/ibexpeak
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/southbridge/intel/ibexpeak')
-rw-r--r--src/southbridge/intel/ibexpeak/lpc.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/southbridge/intel/ibexpeak/lpc.c b/src/southbridge/intel/ibexpeak/lpc.c
index 2362649ae6..4f86e9b80b 100644
--- a/src/southbridge/intel/ibexpeak/lpc.c
+++ b/src/southbridge/intel/ibexpeak/lpc.c
@@ -408,8 +408,8 @@ static void enable_clock_gating(struct device *dev)
static void pch_set_acpi_mode(void)
{
- if (!acpi_is_wakeup_s3() && CONFIG(HAVE_SMI_HANDLER)) {
- apm_control(APM_CNT_ACPI_DISABLE); // Disable ACPI mode
+ if (!acpi_is_wakeup_s3()) {
+ apm_control(APM_CNT_ACPI_DISABLE);
}
}
@@ -722,11 +722,9 @@ static void lpc_final(struct device *dev)
spi_finalize_ops();
/* Call SMM finalize() handlers before resume */
- if (CONFIG(HAVE_SMI_HANDLER)) {
- if (CONFIG(INTEL_CHIPSET_LOCKDOWN) ||
- acpi_is_wakeup_s3()) {
- apm_control(APM_CNT_FINALIZE);
- }
+ if (CONFIG(INTEL_CHIPSET_LOCKDOWN) ||
+ acpi_is_wakeup_s3()) {
+ apm_control(APM_CNT_FINALIZE);
}
}