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>
diff --git a/src/southbridge/intel/i82801gx/lpc.c b/src/southbridge/intel/i82801gx/lpc.c
index 7ba9492..34250d39 100644
--- a/src/southbridge/intel/i82801gx/lpc.c
+++ b/src/southbridge/intel/i82801gx/lpc.c
@@ -335,13 +335,15 @@
static void i82801gx_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);
+ }
}
}
@@ -409,8 +411,7 @@
/* Interrupt 9 should be level triggered (SCI) */
i8259_configure_irq_trigger(9, 1);
- if (CONFIG(HAVE_SMI_HANDLER))
- i82801gx_set_acpi_mode(dev);
+ i82801gx_set_acpi_mode(dev);
i82801gx_spi_init();
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:
diff --git a/src/southbridge/intel/i82801jx/lpc.c b/src/southbridge/intel/i82801jx/lpc.c
index 3e11a08..a594452 100644
--- a/src/southbridge/intel/i82801jx/lpc.c
+++ b/src/southbridge/intel/i82801jx/lpc.c
@@ -372,13 +372,15 @@
static void i82801jx_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);
+ }
}
}
@@ -422,8 +424,7 @@
/* Interrupt 9 should be level triggered (SCI) */
i8259_configure_irq_trigger(9, 1);
- if (CONFIG(HAVE_SMI_HANDLER))
- i82801jx_set_acpi_mode(dev);
+ i82801jx_set_acpi_mode(dev);
}
unsigned long acpi_fill_madt(unsigned long current)