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>
This commit is contained in:
parent
cd0b67b30a
commit
44da9e73c7
|
@ -335,13 +335,15 @@ static void enable_clock_gating(void)
|
|||
|
||||
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 @@ static void lpc_init(struct device *dev)
|
|||
/* 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();
|
||||
|
||||
|
|
|
@ -367,13 +367,15 @@ static void enable_clock_gating(void)
|
|||
|
||||
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 @@ static void lpc_init(struct device *dev)
|
|||
/* 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:
|
||||
|
|
|
@ -372,13 +372,15 @@ static void enable_clock_gating(void)
|
|||
|
||||
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 @@ static void lpc_init(struct device *dev)
|
|||
/* 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)
|
||||
|
|
Loading…
Reference in New Issue