diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2008-01-12 18:23:26 -0500 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2008-01-23 20:30:28 -0500 |
commit | 96d69c31c5115341c6c1163aa3d591c2da687a76 (patch) | |
tree | 03355a2f450786734aa193097278ac85917a09fd /arch/powerpc/kernel/pci-common.c | |
parent | f98eeb4eb1c52de89dcefeb538029bcecc6dd42d (diff) |
[POWERPC] Ensure we only handle PowerMac PCI bus fixup for memory resources
The fixup code that handles the case for PowerMac's that leave bridge
windows open over an inaccessible region should only be applied to
memory resources (IORESOURCE_MEM). If not we can get it trying to fixup
IORESOURCE_IO on some systems since the other conditions that are used to
detect the case can easily match for IORESOURCE_IO.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel/pci-common.c')
-rw-r--r-- | arch/powerpc/kernel/pci-common.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index d394d41b61d5..7d0afd47b3e0 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c | |||
@@ -806,7 +806,8 @@ static void __devinit __pcibios_fixup_bus(struct pci_bus *bus) | |||
806 | * equal to the pci_mem_offset of the host bridge and | 806 | * equal to the pci_mem_offset of the host bridge and |
807 | * their size is smaller than 1M. | 807 | * their size is smaller than 1M. |
808 | */ | 808 | */ |
809 | if (res->start == hose->pci_mem_offset && | 809 | if (res->flags & IORESOURCE_MEM && |
810 | res->start == hose->pci_mem_offset && | ||
810 | res->end < 0x100000) { | 811 | res->end < 0x100000) { |
811 | printk(KERN_INFO | 812 | printk(KERN_INFO |
812 | "PCI: Closing bogus Apple Firmware" | 813 | "PCI: Closing bogus Apple Firmware" |