diff options
author | Karsten Wiese <annabellesgarden@yahoo.de> | 2006-10-20 17:45:36 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-10-27 14:20:33 -0400 |
commit | 3560cc5ec3488b20d927f7160a21a0df1d1fda20 (patch) | |
tree | 442305638a7702363f14119d2e07fdd267c0e894 | |
parent | 2449e06a5696b7af1c8a369b04c97f3b139cf3bb (diff) |
PCI: Remove quirk_via_abnormal_poweroff
My K8T800 mobo resumes fine from suspend to ram with and without patch
applied against 2.6.18.
quirk_via_abnormal_poweroff makes some boards not boot 2.6.18, so IMO patch
should go to head, 2.6.18.2 and everywhere "ACPI: ACPICA 20060623" has been
applied.
Remove quirk_via_abnormal_poweroff
Obsoleted by "ACPI: ACPICA 20060623":
<snip>
Implemented support for "ignored" bits in the ACPI
registers. According to the ACPI specification, these
bits should be preserved when writing the registers via
a read/modify/write cycle. There are 3 bits preserved
in this manner: PM1_CONTROL[0] (SCI_EN), PM1_CONTROL[9],
and PM1_STATUS[11].
http://bugzilla.kernel.org/show_bug.cgi?id=3691
</snip>
Signed-off-by: Karsten Wiese <fzu@wemgehoertderstaat.de>
Cc: Bob Moore <robert.moore@intel.com>
Cc: "Brown, Len" <len.brown@intel.com>
Acked-by: Dave Jones <davej@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/pci/quirks.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 687ab4a0c6c6..204b1c8e972b 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c | |||
@@ -714,33 +714,6 @@ static void __devinit quirk_vt82c598_id(struct pci_dev *dev) | |||
714 | } | 714 | } |
715 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C597_0, quirk_vt82c598_id ); | 715 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C597_0, quirk_vt82c598_id ); |
716 | 716 | ||
717 | #ifdef CONFIG_ACPI_SLEEP | ||
718 | |||
719 | /* | ||
720 | * Some VIA systems boot with the abnormal status flag set. This can cause | ||
721 | * the BIOS to re-POST the system on resume rather than passing control | ||
722 | * back to the OS. Clear the flag on boot | ||
723 | */ | ||
724 | static void __devinit quirk_via_abnormal_poweroff(struct pci_dev *dev) | ||
725 | { | ||
726 | u32 reg; | ||
727 | |||
728 | acpi_hw_register_read(ACPI_MTX_DO_NOT_LOCK, ACPI_REGISTER_PM1_STATUS, | ||
729 | ®); | ||
730 | |||
731 | if (reg & 0x800) { | ||
732 | printk("Clearing abnormal poweroff flag\n"); | ||
733 | acpi_hw_register_write(ACPI_MTX_DO_NOT_LOCK, | ||
734 | ACPI_REGISTER_PM1_STATUS, | ||
735 | (u16)0x800); | ||
736 | } | ||
737 | } | ||
738 | |||
739 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8235, quirk_via_abnormal_poweroff); | ||
740 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237, quirk_via_abnormal_poweroff); | ||
741 | |||
742 | #endif | ||
743 | |||
744 | /* | 717 | /* |
745 | * CardBus controllers have a legacy base address that enables them | 718 | * CardBus controllers have a legacy base address that enables them |
746 | * to respond as i82365 pcmcia controllers. We don't want them to | 719 | * to respond as i82365 pcmcia controllers. We don't want them to |