diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2020-06-02 05:05:30 +0300 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2020-06-16 08:02:54 +0000 |
| commit | ad882c3b171ccd71d84ddc971ab0c4ae563190de (patch) | |
| tree | f2f5df34b60fc1ba767370adbd2a8cb564752138 /src/southbridge | |
| parent | b6585481e8cb30ed04a1673b170af3df9e0e4320 (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')
| -rw-r--r-- | src/southbridge/intel/bd82x6x/lpc.c | 10 | ||||
| -rw-r--r-- | src/southbridge/intel/i82801gx/lpc.c | 10 | ||||
| -rw-r--r-- | src/southbridge/intel/i82801ix/lpc.c | 10 | ||||
| -rw-r--r-- | src/southbridge/intel/i82801jx/lpc.c | 10 | ||||
| -rw-r--r-- | src/southbridge/intel/ibexpeak/lpc.c | 12 | ||||
| -rw-r--r-- | src/southbridge/intel/lynxpoint/lpc.c | 3 |
6 files changed, 22 insertions, 33 deletions
diff --git a/src/southbridge/intel/bd82x6x/lpc.c b/src/southbridge/intel/bd82x6x/lpc.c index 200463268f..038bb37c61 100644 --- a/src/southbridge/intel/bd82x6x/lpc.c +++ b/src/southbridge/intel/bd82x6x/lpc.c @@ -404,7 +404,7 @@ static void enable_clock_gating(struct device *dev) 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 @@ 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); } } diff --git a/src/southbridge/intel/i82801gx/lpc.c b/src/southbridge/intel/i82801gx/lpc.c index 9e1efac236..901c97c279 100644 --- a/src/southbridge/intel/i82801gx/lpc.c +++ b/src/southbridge/intel/i82801gx/lpc.c @@ -314,12 +314,10 @@ static void enable_clock_gating(void) 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 2966b78b5e..27a7c959c9 100644 --- a/src/southbridge/intel/i82801ix/lpc.c +++ b/src/southbridge/intel/i82801ix/lpc.c @@ -343,12 +343,10 @@ static void enable_clock_gating(void) 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 d12e061226..edd1430ab3 100644 --- a/src/southbridge/intel/i82801jx/lpc.c +++ b/src/southbridge/intel/i82801jx/lpc.c @@ -347,12 +347,10 @@ static void enable_clock_gating(void) 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 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); } } diff --git a/src/southbridge/intel/lynxpoint/lpc.c b/src/southbridge/intel/lynxpoint/lpc.c index bf03125a8a..6cdbc78212 100644 --- a/src/southbridge/intel/lynxpoint/lpc.c +++ b/src/southbridge/intel/lynxpoint/lpc.c @@ -473,9 +473,8 @@ static void enable_lp_clock_gating(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); - } } static void pch_disable_smm_only_flashing(struct device *dev) |