Commit 4e348ba2 authored by Yinghai Lu's avatar Yinghai Lu Committed by Bjorn Helgaas

mn10300/PCI: Clip bridge windows to fit in upstream windows

Every PCI-PCI bridge window should fit inside an upstream bridge window
because orphaned address space is unreachable from the primary side of the
upstream bridge.  If we inherit invalid bridge windows that overlap an
upstream window from firmware, clip them to fit and update the bridge
accordingly.

[bhelgaas: changelog]
Link: https://bugzilla.kernel.org/show_bug.cgi?id=85491Reported-by: default avatarMarek Kordik <kordikmarek@gmail.com>
Fixes: 5b285415 ("PCI: Restrict 64-bit prefetchable bridge windows to 64-bit resources")
Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
CC: David Howells <dhowells@redhat.com>
CC: Koichi Yasutake <yasutake.koichi@jp.panasonic.com>
CC: linux-am33-list@redhat.com
parent 576e4385
...@@ -106,7 +106,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list) ...@@ -106,7 +106,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list)
if (!r->flags) if (!r->flags)
continue; continue;
if (!r->start || if (!r->start ||
pci_claim_resource(dev, idx) < 0) { pci_claim_bridge_resource(dev, idx) < 0) {
printk(KERN_ERR "PCI:" printk(KERN_ERR "PCI:"
" Cannot allocate resource" " Cannot allocate resource"
" region %d of bridge %s\n", " region %d of bridge %s\n",
......
...@@ -281,42 +281,37 @@ static int __init pci_check_direct(void) ...@@ -281,42 +281,37 @@ static int __init pci_check_direct(void)
return -ENODEV; return -ENODEV;
} }
static int is_valid_resource(struct pci_dev *dev, int idx) static void pcibios_fixup_device_resources(struct pci_dev *dev)
{ {
unsigned int i, type_mask = IORESOURCE_IO | IORESOURCE_MEM; int idx;
struct resource *devr = &dev->resource[idx], *busr;
if (!dev->bus)
return;
if (dev->bus) { for (idx = 0; idx < PCI_BRIDGE_RESOURCES; idx++) {
pci_bus_for_each_resource(dev->bus, busr, i) { struct resource *r = &dev->resource[idx];
if (!busr || (busr->flags ^ devr->flags) & type_mask)
if (!r->flags || r->parent || !r->start)
continue; continue;
if (devr->start && pci_claim_resource(dev, idx);
devr->start >= busr->start &&
devr->end <= busr->end)
return 1;
} }
}
return 0;
} }
static void pcibios_fixup_device_resources(struct pci_dev *dev) static void pcibios_fixup_bridge_resources(struct pci_dev *dev)
{ {
int limit, i; int idx;
if (dev->bus->number != 0) if (!dev->bus)
return; return;
limit = (dev->hdr_type == PCI_HEADER_TYPE_NORMAL) ? for (idx = PCI_BRIDGE_RESOURCES; idx < PCI_NUM_RESOURCES; idx++) {
PCI_BRIDGE_RESOURCES : PCI_NUM_RESOURCES; struct resource *r = &dev->resource[idx];
for (i = 0; i < limit; i++) { if (!r->flags || r->parent || !r->start)
if (!dev->resource[i].flags)
continue; continue;
if (is_valid_resource(dev, i)) pci_claim_bridge_resource(dev, idx);
pci_claim_resource(dev, i);
} }
} }
...@@ -330,7 +325,7 @@ void pcibios_fixup_bus(struct pci_bus *bus) ...@@ -330,7 +325,7 @@ void pcibios_fixup_bus(struct pci_bus *bus)
if (bus->self) { if (bus->self) {
pci_read_bridge_bases(bus); pci_read_bridge_bases(bus);
pcibios_fixup_device_resources(bus->self); pcibios_fixup_bridge_resources(bus->self);
} }
list_for_each_entry(dev, &bus->devices, bus_list) list_for_each_entry(dev, &bus->devices, bus_list)
......
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