vserver 1.9.5.x5

[linux-2.6.git] / arch / x86_64 / pci / mmconfig.c

diff --git a/arch/x86_64/pci/mmconfig.c b/arch/x86_64/pci/mmconfig.c
index 7004ee8..142b9be 100644 (file)
--- a/arch/x86_64/pci/mmconfig.c
+++ b/arch/x86_64/pci/mmconfig.c
@@ -63,9 +63,6 @@ static int pci_mmcfg_write(int seg, int bus, int devfn, int reg, int len, u32 va
                break;
        }
 
-       /* Dummy read to flush PCI write */
-       readl(addr);
-
        return 0;
 }
 
@@ -81,6 +78,13 @@ static int __init pci_mmcfg_init(void)
        if (!pci_mmcfg_base_addr)
                return 0;
 
+       /* Kludge for now. Don't use mmconfig on AMD systems because
+          those have some busses where mmconfig doesn't work,
+          and we don't parse ACPI MCFG well enough to handle that. 
+          Remove when proper handling is added. */
+       if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
+               return 0; 
+
        /* RED-PEN i386 doesn't do _nocache right now */
        pci_mmcfg_virt = ioremap_nocache(pci_mmcfg_base_addr, MMCONFIG_APER_SIZE);
        if (!pci_mmcfg_virt) {