Commit d7814fa5 authored by Jeff Garzik's avatar Jeff Garzik

Merge AMD7xx PCI compliance quirk fix from 2.4.18.

parent b324327d
...@@ -444,13 +444,15 @@ static void __init quirk_amd_ioapic(struct pci_dev *dev) ...@@ -444,13 +444,15 @@ static void __init quirk_amd_ioapic(struct pci_dev *dev)
static void __init quirk_amd_ordering(struct pci_dev *dev) static void __init quirk_amd_ordering(struct pci_dev *dev)
{ {
u32 pcic; u32 pcic;
pci_read_config_dword(dev, 0x4C, &pcic);
pci_read_config_dword(dev, 0x42, &pcic); if((pcic&6)!=6)
if((pcic&2)==0)
{ {
pcic |= 2; pcic |= 6;
printk(KERN_WARNING "BIOS disabled PCI ordering compliance, so we enabled it again.\n"); printk(KERN_WARNING "BIOS failed to enable PCI standards compliance, fixing this error.\n");
pci_write_config_dword(dev, 0x42, pcic); pci_write_config_dword(dev, 0x4C, pcic);
pci_read_config_dword(dev, 0x84, &pcic);
pcic |= (1<<23); /* Required in this mode */
pci_write_config_dword(dev, 0x84, pcic);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment