Patchwork New patch to review: f641e32 i82801gx: enable ACPI during S3 resume

login
register
about
Submitter gerrit@coreboot.org
Date 2011-06-06 16:57:33
Message ID <E1QTd7N-0004bG-Dv@ra.coresystems.de>
Download mbox | patch
Permalink /patch/3060/
State New, archived
Headers show

Comments

gerrit@coreboot.org - 2011-06-06 16:57:33
Dear list,

Sven Schnelle (svens@stackframe.org) just uploaded a new patch set to gerrit, which you can find at
http://review.coreboot.org/7.

You will also find it attached for your convenience.

Regards,
gerrit

Patch

commit f641e32ce44f9621c98075d4a327aebfdec85e1f
Author: Sven Schnelle <svens@stackframe.org>
Date:   Sun Jun 5 11:39:12 2011 +0200

    i82801gx: enable ACPI during S3 resume
    
    disabling ACPI during S3 wakeup breaks ACPI wakeup, as the
    Host OS is assuming that ACPI is enabled.
    
    Change-Id: I8ced72c4b553d41a57f26d64998118e8a77621f8
    Signed-off-by: Sven Schnelle <svens@stackframe.org>

diff --git a/src/southbridge/intel/i82801gx/lpc.c b/src/southbridge/intel/i82801gx/lpc.c
index 7feb76a..b82b31d 100644
--- a/src/southbridge/intel/i82801gx/lpc.c
+++ b/src/southbridge/intel/i82801gx/lpc.c
@@ -340,6 +340,7 @@  static void i82801gx_lock_smm(struct device *dev)
 	u8 reg8;
 #endif
 
+	if (acpi_slp_type != 3) {
 #if ENABLE_ACPI_MODE_IN_COREBOOT
 	printk(BIOS_DEBUG, "Enabling ACPI via APMC:\n");
 	outb(0xe1, 0xb2); // Enable ACPI mode
@@ -349,6 +350,10 @@  static void i82801gx_lock_smm(struct device *dev)
 	outb(0x1e, 0xb2); // Disable ACPI mode
 	printk(BIOS_DEBUG, "done.\n");
 #endif
+	} else {
+		printk(BIOS_DEBUG, "S3 wakeup, enabling ACPI via APMC\n");
+		outb(APM_CNT_ACPI_ENABLE, APM_CNT);
+	}
 	/* Don't allow evil boot loaders, kernels, or
 	 * userspace applications to deceive us:
 	 */