[FIXED PATCH] Clear abnormal poweroff flag on VIA southbridges, fix resume

[Matthew Garrett <mjg59@srcf.ucam.org>]

On Tue, Jun 20, 2006 at 12:57:19AM +0200, karsten wiese wrote:
> --- Matthew Garrett <mjg59@srcf.ucam.org> schrieb:
> > Some VIA southbridges contain a flag in the ACPI register space that 
> > indicates whether an abnormal poweroff has occured, presumably with the 
> > intention that it can be cleared on clean shutdown. Some BIOSes check
> 
> (intel defines this bit as being set, when poweroff-button is
> pressed for > 4s. They say, BIOS is responsible for handling it.)

Interesting. The ACPI spec claims that it should just be ignored by the 
OS.

> with above comments applied it works on this VIA K8T800 mobo.
> Please repost. Thanks!

Yes, I sent entirely the wrong one. Try this.

Some VIA southbridges contain a flag in the ACPI register space that 
indicates whether an abnormal poweroff has occured, presumably with the 
intention that it can be cleared on clean shutdown. Some BIOSes check 
this and will fail to resume if it's set. Clear it on boot in order to 
prevent this.

Signed-off-by: Matthew Garrett <mjg59@srcf.ucam.org>
ACKed-by: Karsten Wiese <annabellesgarden@yahoo.de>

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 7537260..01da8cc 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -660,6 +660,33 @@ static void __devinit quirk_vt82c598_id(
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_82C597_0,	quirk_vt82c598_id );
 
+#ifdef CONFIG_ACPI
+
+/* Some VIA systems boot with the abnormal status flag set. This can cause
+ * the BIOS to re-POST the system on resume rather than passing control 
+ * back to the OS. Clear the flag on boot
+ */
+
+static void __devinit quirk_via_abnormal_poweroff(struct pci_dev *dev)
+{
+	u32 pm1_status;
+
+	acpi_hw_register_read (ACPI_MTX_DO_NOT_LOCK, ACPI_REGISTER_PM1_STATUS,
+			       &pm1_status);
+
+	if (pm1_status & 0x800) {
+		printk ("Clearing abnormal poweroff flag\n");
+		acpi_hw_register_write (ACPI_MTX_DO_NOT_LOCK,
+					ACPI_REGISTER_PM1_STATUS,
+					(u16)0x800);
+	}
+}
+
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8235, quirk_via_abnormal_poweroff);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237, quirk_via_abnormal_poweroff);
+
+#endif
+
 /*
  * CardBus controllers have a legacy base address that enables them
  * to respond as i82365 pcmcia controllers.  We don't want them to

-- 
Matthew Garrett | mjg59@srcf.ucam.org