commit 44da9e73c79edea8a2e7785ecf481b3eb23f813c
author Kyösti Mälkki <kyosti.malkki@gmail.com> Wed Oct 09 12:32:16 2019 +0300
committer Kyösti Mälkki <kyosti.malkki@gmail.com> Wed Nov 13 21:15:13 2019 +0000
tree 03d3093d88b367028d7864dc9c57218c9f425c71
parent cd0b67b30a3dd5cd51ff0e1ad06cdbfc8590fcf6

sb/intel/i82801gx,ix,jx: Move HAVE_SMI_HANDLER conditional

Make these more consistent with later platforms. Followups will
do a more complete refactoring of set_acpi_mode() implementations.

Change-Id: I6a05b7600ebdc49915157eaff229459a1eea754c
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36790
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>

src/southbridge/intel/i82801ix/lpc.c

diff --git a/src/southbridge/intel/i82801ix/lpc.c b/src/southbridge/intel/i82801ix/lpc.c
index 3df9288..811b4b2 100644
--- a/src/southbridge/intel/i82801ix/lpc.c
+++ b/src/southbridge/intel/i82801ix/lpc.c
@@ -367,13 +367,15 @@
 
 static void i82801ix_set_acpi_mode(struct device *dev)
 {
-	if (!acpi_is_wakeup_s3()) {
-		printk(BIOS_DEBUG, "Disabling ACPI via APMC:\n");
-		outb(APM_CNT_ACPI_DISABLE, APM_CNT); // Disable ACPI mode
-		printk(BIOS_DEBUG, "done.\n");
-	} else {
-		printk(BIOS_DEBUG, "S3 wakeup, enabling ACPI via APMC\n");
-		outb(APM_CNT_ACPI_ENABLE, APM_CNT);
+	if (CONFIG(HAVE_SMI_HANDLER)) {
+		if (!acpi_is_wakeup_s3()) {
+			printk(BIOS_DEBUG, "Disabling ACPI via APMC:\n");
+			outb(APM_CNT_ACPI_DISABLE, APM_CNT); // Disable ACPI mode
+			printk(BIOS_DEBUG, "done.\n");
+		} else {
+			printk(BIOS_DEBUG, "S3 wakeup, enabling ACPI via APMC\n");
+			outb(APM_CNT_ACPI_ENABLE, APM_CNT);
+		}
 	}
 }
 
@@ -417,8 +419,7 @@
 	/* Interrupt 9 should be level triggered (SCI) */
 	i8259_configure_irq_trigger(9, 1);
 
-	if (CONFIG(HAVE_SMI_HANDLER))
-		i82801ix_set_acpi_mode(dev);
+	i82801ix_set_acpi_mode(dev);
 
 	/* Don't allow evil boot loaders, kernels, or
 	 * userspace applications to deceive us: