GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
Kyösti Mälkki 2019-10-09 12:32:16 +03:00
parent cd0b67b30a
commit 44da9e73c7
3 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/southbridge/intel/i82801gx/lpc.c
View File

@ -335,6 +335,7 @@ static void enable_clock_gating(void)
static void i82801gx_set_acpi_mode(struct device *dev) static void i82801gx_set_acpi_mode(struct device *dev)
{ {
if (CONFIG(HAVE_SMI_HANDLER)) {
if (!acpi_is_wakeup_s3()) { if (!acpi_is_wakeup_s3()) {
printk(BIOS_DEBUG, "Disabling ACPI via APMC:\n"); printk(BIOS_DEBUG, "Disabling ACPI via APMC:\n");
outb(APM_CNT_ACPI_DISABLE, APM_CNT); // Disable ACPI mode outb(APM_CNT_ACPI_DISABLE, APM_CNT); // Disable ACPI mode
@ -344,6 +345,7 @@ static void i82801gx_set_acpi_mode(struct device *dev)
outb(APM_CNT_ACPI_ENABLE, APM_CNT); outb(APM_CNT_ACPI_ENABLE, APM_CNT);
} }
} }
}
#define SPIBASE 0x3020 #define SPIBASE 0x3020
static void i82801gx_spi_init(void) static void i82801gx_spi_init(void)
@ -409,7 +411,6 @@ static void lpc_init(struct device *dev)
/* Interrupt 9 should be level triggered (SCI) */ /* Interrupt 9 should be level triggered (SCI) */
i8259_configure_irq_trigger(9, 1); i8259_configure_irq_trigger(9, 1);
if (CONFIG(HAVE_SMI_HANDLER))
i82801gx_set_acpi_mode(dev); i82801gx_set_acpi_mode(dev);
i82801gx_spi_init(); i82801gx_spi_init();

3
src/southbridge/intel/i82801ix/lpc.c
View File

@ -367,6 +367,7 @@ static void enable_clock_gating(void)
static void i82801ix_set_acpi_mode(struct device *dev) static void i82801ix_set_acpi_mode(struct device *dev)
{ {
if (CONFIG(HAVE_SMI_HANDLER)) {
if (!acpi_is_wakeup_s3()) { if (!acpi_is_wakeup_s3()) {
printk(BIOS_DEBUG, "Disabling ACPI via APMC:\n"); printk(BIOS_DEBUG, "Disabling ACPI via APMC:\n");
outb(APM_CNT_ACPI_DISABLE, APM_CNT); // Disable ACPI mode outb(APM_CNT_ACPI_DISABLE, APM_CNT); // Disable ACPI mode
@ -376,6 +377,7 @@ static void i82801ix_set_acpi_mode(struct device *dev)
outb(APM_CNT_ACPI_ENABLE, APM_CNT); outb(APM_CNT_ACPI_ENABLE, APM_CNT);
} }
} }
}
static void lpc_init(struct device *dev) static void lpc_init(struct device *dev)
{ {
@ -417,7 +419,6 @@ static void lpc_init(struct device *dev)
/* Interrupt 9 should be level triggered (SCI) */ /* Interrupt 9 should be level triggered (SCI) */
i8259_configure_irq_trigger(9, 1); 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 /* Don't allow evil boot loaders, kernels, or

3
src/southbridge/intel/i82801jx/lpc.c
View File

@ -372,6 +372,7 @@ static void enable_clock_gating(void)
static void i82801jx_set_acpi_mode(struct device *dev) static void i82801jx_set_acpi_mode(struct device *dev)
{ {
if (CONFIG(HAVE_SMI_HANDLER)) {
if (!acpi_is_wakeup_s3()) { if (!acpi_is_wakeup_s3()) {
printk(BIOS_DEBUG, "Disabling ACPI via APMC:\n"); printk(BIOS_DEBUG, "Disabling ACPI via APMC:\n");
outb(APM_CNT_ACPI_DISABLE, APM_CNT); // Disable ACPI mode outb(APM_CNT_ACPI_DISABLE, APM_CNT); // Disable ACPI mode
@ -381,6 +382,7 @@ static void i82801jx_set_acpi_mode(struct device *dev)
outb(APM_CNT_ACPI_ENABLE, APM_CNT); outb(APM_CNT_ACPI_ENABLE, APM_CNT);
} }
} }
}
static void lpc_init(struct device *dev) static void lpc_init(struct device *dev)
{ {
@ -422,7 +424,6 @@ static void lpc_init(struct device *dev)
/* Interrupt 9 should be level triggered (SCI) */ /* Interrupt 9 should be level triggered (SCI) */
i8259_configure_irq_trigger(9, 1); i8259_configure_irq_trigger(9, 1);
if (CONFIG(HAVE_SMI_HANDLER))
i82801jx_set_acpi_mode(dev); i82801jx_set_acpi_mode(dev);
} }