prepare for pciehp_realloc it will clear the resource size for bridge -v2: patrick Keller pointed out need to export it... Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx> --- drivers/pci/setup-bus.c | 43 +++++++++++++++++++++++++++++++++++++++++++ include/linux/pci.h | 1 + 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index cc3474e..4c61b8c 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -742,6 +742,49 @@ static void __ref __pci_bridge_assign_resources(const struct pci_dev *bridge, break; } } + +void pci_bridge_release_res(struct pci_bus *bus) +{ + int idx; + bool changed = false; + struct pci_dev *dev; + struct resource *r; + + /* The root bus? */ + if (!bus->self) + return; + + /* for pci bridges res only */ + dev = bus->self; + if ((dev->class >> 8) != PCI_CLASS_BRIDGE_PCI) + return; + + for (idx = PCI_BRIDGE_RESOURCES; idx < PCI_BRIDGE_RESOURCES + 3; + idx++) { + r = &dev->resource[idx]; + if (!r->parent) + continue; + + /* if there are children under that, we should not release it */ + if (r->child) + continue; + + if (!release_resource(r)) { + dev_printk(KERN_DEBUG, &dev->dev, + "resource %d %pR released\n", idx, r); + /* old size is not kept */ + r->start = 0; + r->end = 0; + r->flags = 0; + changed = true; + } + } + + if (changed) + pci_setup_bridge(bus); +} +EXPORT_SYMBOL_GPL(pci_bridge_release_res); + static void pci_bridge_release_unused_res(struct pci_bus *bus, unsigned long type) { diff --git a/include/linux/pci.h b/include/linux/pci.h index 31fec6f..4b8d35a 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -770,6 +770,7 @@ int pci_vpd_truncate(struct pci_dev *dev, size_t size); void pci_bus_assign_resources(const struct pci_bus *bus); void pci_bus_size_bridges(struct pci_bus *bus); int pci_claim_resource(struct pci_dev *, int); +void pci_bridge_release_res(struct pci_bus *bus); void pci_assign_unassigned_resources(void); void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge); void pdev_enable_device(struct pci_dev *); -- 1.6.0.2 -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html