Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 709cf5ea authored by Matthew Garrett's avatar Matthew Garrett Committed by Greg Kroah-Hartman
Browse files

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



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
flag at resume time, and will re-POST the system rather than jump back to
the OS if it's set.  Clearing it at boot time appears to be sufficient.
I'm not sure if drivers/pci/quirks.c is the right place to do it, but I'm
not sure where would be cleaner.

[akpm@osdl.org: cleanups, build fix]
Signed-off-by: default avatarMatthew Garrett <mjg59@srcf.ucam.org>
Cc: Greg KH <greg@kroah.com>
Cc: "Brown, Len" <len.brown@intel.com>
Cc: "Yu, Luming" <luming.yu@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6e233899

drivers/pci/quirks.c

+27 −0
Original line number Diff line number Diff line
@@ -683,6 +683,33 @@ static void __devinit quirk_vt82c598_id(struct pci_dev *dev) 
}

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_82C597_0,	quirk_vt82c598_id );



#ifdef CONFIG_ACPI_SLEEP



/*

 * 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 reg;



	acpi_hw_register_read(ACPI_MTX_DO_NOT_LOCK, ACPI_REGISTER_PM1_STATUS,

				&reg);



	if (reg & 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