@@ -487,45 +487,57 @@ int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
return 0;
}
-static int is_valid_resource(struct pci_dev *dev, int idx)
+void pcibios_fixup_device_resources(struct pci_dev *dev)
{
- unsigned int i, type_mask = IORESOURCE_IO | IORESOURCE_MEM;
- struct resource *devr = &dev->resource[idx], *busr;
+ int idx;
if (!dev->bus)
- return 0;
+ return;
- pci_bus_for_each_resource(dev->bus, busr, i) {
- if (!busr || ((busr->flags ^ devr->flags) & type_mask))
+ for (idx = 0; idx < PCI_BRIDGE_RESOURCES; idx++) {
+ struct resource *r = &dev->resource[idx];
+
+ if (!r->flags || r->parent || !r->start)
continue;
- if ((devr->start) && (devr->start >= busr->start) &&
- (devr->end <= busr->end))
- return 1;
+
+ if (pci_claim_resource(dev, idx) >= 0)
+ continue;
+
+ /* try again with clip */
+ if (pci_bus_clip_resource(dev, r)) {
+ pci_update_resource(dev, idx);
+ pci_claim_resource(dev, idx);
+ }
}
- return 0;
}
+EXPORT_SYMBOL_GPL(pcibios_fixup_device_resources);
-static void pcibios_fixup_resources(struct pci_dev *dev, int start, int limit)
+static bool pcibios_fixup_bridge_resources(struct pci_dev *dev)
{
- int i;
+ int idx;
+ bool changed = false;
+
+ if (!dev->bus)
+ return changed;
+
+ for (idx = PCI_BRIDGE_RESOURCES; idx < PCI_NUM_RESOURCES; idx++) {
+ struct resource *r = &dev->resource[idx];
- for (i = start; i < limit; i++) {
- if (!dev->resource[i].flags)
+ if (!r->flags || r->parent || !r->start)
continue;
- if ((is_valid_resource(dev, i)))
- pci_claim_resource(dev, i);
- }
-}
-void pcibios_fixup_device_resources(struct pci_dev *dev)
-{
- pcibios_fixup_resources(dev, 0, PCI_BRIDGE_RESOURCES);
-}
-EXPORT_SYMBOL_GPL(pcibios_fixup_device_resources);
+ if (pci_claim_resource(dev, idx) >= 0)
+ continue;
-static void pcibios_fixup_bridge_resources(struct pci_dev *dev)
-{
- pcibios_fixup_resources(dev, PCI_BRIDGE_RESOURCES, PCI_NUM_RESOURCES);
+ /* try again after clip for pci bridge*/
+ if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI &&
+ pci_bus_clip_resource(dev, r)) {
+ changed = true;
+ pci_claim_resource(dev, idx);
+ }
+ }
+
+ return changed;
}
/*
@@ -536,9 +548,14 @@ void pcibios_fixup_bus(struct pci_bus *b)
struct pci_dev *dev;
if (b->self) {
+ bool changed;
+
pci_read_bridge_bases(b);
- pcibios_fixup_bridge_resources(b->self);
+ changed = pcibios_fixup_bridge_resources(b->self);
+ if (changed)
+ pci_setup_bridge(b);
}
+
list_for_each_entry(dev, &b->devices, bus_list)
pcibios_fixup_device_resources(dev);
platform_pci_fixup_bus(b);
Some bios put range that is not fully coverred by root bus resources. Try to clip them and update them in pci bridge bars. We'd like to fix other arches instead of just x86. Link: https://bugzilla.kernel.org/show_bug.cgi?id=85491 Reported-by: Marek Kordik <kordikmarek@gmail.com> Fixes: 5b28541552ef ("PCI: Restrict 64-bit prefetchable bridge windows to 64-bit resources") Signed-off-by: Yinghai Lu <yinghai@kernel.org> Cc: Tony Luck <tony.luck@intel.com> Cc: Fenghua Yu <fenghua.yu@intel.com> Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com> Cc: linux-ia64@vger.kernel.org --- arch/ia64/pci/pci.c | 71 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 27 deletions(-)