From 6d2fa8f360cca83024e2088cf6b6d8de27c54d33 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Thu, 20 Dec 2007 14:55:04 +1100 Subject: [PATCH] --- yaml --- r: 81126 b: refs/heads/master c: be8cbcd8896670a01ead7a29e33ffe29604ed734 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/pci-common.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7e36523fd87a..c4d42961dd63 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d0264ce796e4e3d77fdadf72d6625f8e6c1c96bd +refs/heads/master: be8cbcd8896670a01ead7a29e33ffe29604ed734 diff --git a/trunk/arch/powerpc/kernel/pci-common.c b/trunk/arch/powerpc/kernel/pci-common.c index b6d4767e4e27..1037b3a093ee 100644 --- a/trunk/arch/powerpc/kernel/pci-common.c +++ b/trunk/arch/powerpc/kernel/pci-common.c @@ -776,6 +776,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pcibios_fixup_resources); static void __devinit __pcibios_fixup_bus(struct pci_bus *bus) { + struct pci_controller *hose = pci_bus_to_host(bus); struct pci_dev *dev = bus->self; pr_debug("PCI: Fixup bus %d (%s)\n", bus->number, dev ? pci_name(dev) : "PHB"); @@ -793,6 +794,27 @@ static void __devinit __pcibios_fixup_bus(struct pci_bus *bus) if (!res->flags || bus->self->transparent) continue; + /* On PowerMac, Apple leaves bridge windows open over + * an inaccessible region of memory space (0...fffff) + * which is somewhat bogus, but that's what they think + * means disabled... + * + * We clear those to force them to be reallocated later + * + * We detect such regions by the fact that the base is + * equal to the pci_mem_offset of the host bridge and + * their size is smaller than 1M. + */ + if (res->start == hose->pci_mem_offset && + res->end < 0x100000) { + printk(KERN_INFO + "PCI: Closing bogus Apple Firmware" + " region %d on bus 0x%02x\n", + i, bus->number); + res->flags = 0; + continue; + } + pr_debug("PCI:%s Bus rsrc %d %016llx-%016llx [%x] fixup...\n", pci_name(dev), i, (unsigned long long)res->start,\