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>
diff --git a/src/southbridge/intel/bd82x6x/lpc.c b/src/southbridge/intel/bd82x6x/lpc.c
index 2004632..038bb37 100644
--- a/src/southbridge/intel/bd82x6x/lpc.c
+++ b/src/southbridge/intel/bd82x6x/lpc.c
@@ -404,7 +404,7 @@
static void pch_set_acpi_mode(void)
{
- if (!acpi_is_wakeup_s3() && CONFIG(HAVE_SMI_HANDLER)) {
+ if (!acpi_is_wakeup_s3()) {
apm_control(APM_CNT_ACPI_DISABLE);
}
}
@@ -822,11 +822,9 @@
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);
}
}
diff --git a/src/southbridge/intel/i82801gx/lpc.c b/src/southbridge/intel/i82801gx/lpc.c
index 9e1efac..901c97c 100644
--- a/src/southbridge/intel/i82801gx/lpc.c
+++ b/src/southbridge/intel/i82801gx/lpc.c
@@ -314,12 +314,10 @@
static void i82801gx_set_acpi_mode(struct device *dev)
{
- if (CONFIG(HAVE_SMI_HANDLER)) {
- if (!acpi_is_wakeup_s3()) {
- apm_control(APM_CNT_ACPI_DISABLE);
- } else {
- apm_control(APM_CNT_ACPI_ENABLE);
- }
+ if (!acpi_is_wakeup_s3()) {
+ apm_control(APM_CNT_ACPI_DISABLE);
+ } else {
+ apm_control(APM_CNT_ACPI_ENABLE);
}
}
diff --git a/src/southbridge/intel/i82801ix/lpc.c b/src/southbridge/intel/i82801ix/lpc.c
index 2966b78..27a7c95 100644
--- a/src/southbridge/intel/i82801ix/lpc.c
+++ b/src/southbridge/intel/i82801ix/lpc.c
@@ -343,12 +343,10 @@
static void i82801ix_set_acpi_mode(struct device *dev)
{
- if (CONFIG(HAVE_SMI_HANDLER)) {
- if (!acpi_is_wakeup_s3()) {
- apm_control(APM_CNT_ACPI_DISABLE);
- } else {
- apm_control(APM_CNT_ACPI_ENABLE);
- }
+ if (!acpi_is_wakeup_s3()) {
+ apm_control(APM_CNT_ACPI_DISABLE);
+ } else {
+ apm_control(APM_CNT_ACPI_ENABLE);
}
}
diff --git a/src/southbridge/intel/i82801jx/lpc.c b/src/southbridge/intel/i82801jx/lpc.c
index d12e061..edd1430 100644
--- a/src/southbridge/intel/i82801jx/lpc.c
+++ b/src/southbridge/intel/i82801jx/lpc.c
@@ -347,12 +347,10 @@
static void i82801jx_set_acpi_mode(struct device *dev)
{
- if (CONFIG(HAVE_SMI_HANDLER)) {
- if (!acpi_is_wakeup_s3()) {
- apm_control(APM_CNT_ACPI_DISABLE);
- } else {
- apm_control(APM_CNT_ACPI_ENABLE);
- }
+ if (!acpi_is_wakeup_s3()) {
+ apm_control(APM_CNT_ACPI_DISABLE);
+ } else {
+ apm_control(APM_CNT_ACPI_ENABLE);
}
}
diff --git a/src/southbridge/intel/ibexpeak/lpc.c b/src/southbridge/intel/ibexpeak/lpc.c
index 2362649..4f86e9b 100644
--- a/src/southbridge/intel/ibexpeak/lpc.c
+++ b/src/southbridge/intel/ibexpeak/lpc.c
@@ -408,8 +408,8 @@
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 @@
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);
}
}
diff --git a/src/southbridge/intel/lynxpoint/lpc.c b/src/southbridge/intel/lynxpoint/lpc.c
index bf03125..6cdbc782 100644
--- a/src/southbridge/intel/lynxpoint/lpc.c
+++ b/src/southbridge/intel/lynxpoint/lpc.c
@@ -473,9 +473,8 @@
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);
- }
}
static void pch_disable_smm_only_flashing(struct device *dev)