Don't disable ACPI in the S3 resume path
The OS does not re-execute the APMC 'enable ACPI' SMI on resume so this has the potential to leave things in an unknown state. Change-Id: Iaf0fcb99f699e9e0ecacaab3f529026782a95151 Signed-off-by: Duncan Laurie <dlaurie@chromium.org> Reviewed-on: http://review.coreboot.org/971 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
committed by
Stefan Reinauer
parent
7b508ddecb
commit
95be1d6f46
@@ -396,15 +396,18 @@ static void pch_lock_smm(struct device *dev)
|
|||||||
u8 reg8;
|
u8 reg8;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
if (acpi_slp_type != 3) {
|
||||||
#if ENABLE_ACPI_MODE_IN_COREBOOT
|
#if ENABLE_ACPI_MODE_IN_COREBOOT
|
||||||
printk(BIOS_DEBUG, "Enabling ACPI via APMC:\n");
|
printk(BIOS_DEBUG, "Enabling ACPI via APMC:\n");
|
||||||
outb(0xe1, 0xb2); // Enable ACPI mode
|
outb(0xe1, 0xb2); // Enable ACPI mode
|
||||||
printk(BIOS_DEBUG, "done.\n");
|
printk(BIOS_DEBUG, "done.\n");
|
||||||
#else
|
#else
|
||||||
printk(BIOS_DEBUG, "Disabling ACPI via APMC:\n");
|
printk(BIOS_DEBUG, "Disabling ACPI via APMC:\n");
|
||||||
outb(0x1e, 0xb2); // Disable ACPI mode
|
outb(0x1e, 0xb2); // Disable ACPI mode
|
||||||
printk(BIOS_DEBUG, "done.\n");
|
printk(BIOS_DEBUG, "done.\n");
|
||||||
#endif
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
/* Don't allow evil boot loaders, kernels, or
|
/* Don't allow evil boot loaders, kernels, or
|
||||||
* userspace applications to deceive us:
|
* userspace applications to deceive us:
|
||||||
*/
|
*/
|
||||||
|
Reference in New Issue
Block a user