Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753668AbZJ2Jwt (ORCPT ); Thu, 29 Oct 2009 05:52:49 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753405AbZJ2Jws (ORCPT ); Thu, 29 Oct 2009 05:52:48 -0400 Received: from hera.kernel.org ([140.211.167.34]:44182 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752550AbZJ2Jwr (ORCPT ); Thu, 29 Oct 2009 05:52:47 -0400 Message-ID: <4AE965C0.30206@kernel.org> Date: Thu, 29 Oct 2009 02:52:00 -0700 From: Yinghai Lu User-Agent: Thunderbird 2.0.0.23 (X11/20090817) MIME-Version: 1.0 To: Kenji Kaneshige , "Eric W. Biederman" , Jesse Barnes , Alex Chiang , Bjorn Helgaas , Ingo Molnar CC: "linux-kernel@vger.kernel.org" , "linux-pci@vger.kernel.org" , Ivan Kokshaysky Subject: [PATCH 1/2] pci: release that leaf bridge' resource index is not used -v6 References: <4ADEB601.8020200@kernel.org> <4AE52B68.3070501@jp.fujitsu.com> <4AE53883.3070709@kernel.org> <4AE5545E.1020900@jp.fujitsu.com> <4AE55D12.30403@kernel.org> <4AE57976.4060107@jp.fujitsu.com> <4AE5E37F.8070707@kernel.org> <4AE5EFDB.2060908@kernel.org> <4AE80170.6030402@jp.fujitsu.com> <4AE88305.8020207@kernel.org> <4AE899A0.3020006@kernel.org> <4AE95247.8080401@jp.fujitsu.com> <4AE952B9.1010603@kernel.org> <4AE9588E.90708@jp.fujitsu.com> In-Reply-To: <4AE9588E.90708@jp.fujitsu.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4200 Lines: 129 only for index < 3 v2: Jesse doesn't like it is in find_free_bus_resource... try to move out of pci_bus_size_bridges loop. need to apply after: [PATCH] pci: pciehp update the slot bridge res to get big range for pcie devices - v4 v3: add pci_setup_bridge calling after pci_bridge_release_not_used_res. only clear release those res for x86. v4: Bjorn want to release use dev instead of bus. v5: Kenji pointed out it will have problem with several level bridge. so let only handle leaf bridge. v6: address Kenji's request (new pci_bus_release...). and change applying order move back release to pci_assign_unassigned_resource Signed-off-by: Yinghai Lu --- drivers/pci/setup-bus.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++- include/linux/pci.h | 1 2 files changed, 65 insertions(+), 1 deletion(-) Index: linux-2.6/drivers/pci/setup-bus.c =================================================================== --- linux-2.6.orig/drivers/pci/setup-bus.c +++ linux-2.6/drivers/pci/setup-bus.c @@ -573,13 +573,68 @@ void __ref pci_bus_assign_resources(cons } EXPORT_SYMBOL(pci_bus_assign_resources); +static void pci_bridge_release_not_used_res(struct pci_bus *bus) +{ + int idx; + bool changed = false; + struct pci_dev *dev; + struct resource *r; + unsigned long type_mask = IORESOURCE_IO | IORESOURCE_MEM | + IORESOURCE_PREFETCH; + + /* for pci bridges res only */ + dev = bus->self; + for (idx = PCI_BRIDGE_RESOURCES; idx < PCI_BRIDGE_RESOURCES + 3; + idx++) { + r = &dev->resource[idx]; + if (!(r->flags & type_mask)) + continue; + if (!r->parent) + continue; + /* if there is no child under that, we should release it */ + if (r->child) + continue; + if (!release_resource(r)) { + dev_info(&dev->dev, "resource %d %pRt released\n", + idx, r); + r->flags = 0; + changed = true; + } + } + + if (changed) + pci_setup_bridge(bus); +} + +void __ref pci_bus_release_bridges_not_used_res(struct pci_bus *bus) +{ + struct pci_bus *b; + + /* If the bus is cardbus, do nothing */ + if (bus->self && (bus->self->class >> 8) == PCI_CLASS_BRIDGE_CARDBUS) + return; + + /* We only release the resources under the leaf bridge */ + if (list_empty(&bus->children)) { + if (!pci_is_root_bus(bus)) + pci_bridge_release_not_used_res(bus); + return; + } + + /* Scan child buses if the bus is not leaf */ + list_for_each_entry(b, &bus->children, node) + pci_bus_release_bridges_not_used_res(b); +} +EXPORT_SYMBOL(pci_bus_release_bridges_not_used_res); + static void pci_bus_dump_res(struct pci_bus *bus) { int i; for (i = 0; i < PCI_BUS_NUM_RESOURCES; i++) { struct resource *res = bus->resource[i]; - if (!res || !res->end) + + if (!res || !res->end || !res->flags) continue; dev_printk(KERN_DEBUG, &bus->dev, "resource %d %pRt\n", i, res); @@ -608,6 +663,14 @@ pci_assign_unassigned_resources(void) { struct pci_bus *bus; + /* + * Try to release leaf bridge's resources that there is not child + * under it + */ + list_for_each_entry(bus, &pci_root_buses, node) { + pci_bus_release_bridges_not_used_res(bus); + } + /* Depth first, calculate sizes and alignments of all subordinate buses. */ list_for_each_entry(bus, &pci_root_buses, node) { Index: linux-2.6/include/linux/pci.h =================================================================== --- linux-2.6.orig/include/linux/pci.h +++ linux-2.6/include/linux/pci.h @@ -758,6 +758,7 @@ int pci_vpd_truncate(struct pci_dev *dev /* Helper functions for low-level code (drivers/pci/setup-[bus,res].c) */ void pci_bus_assign_resources(const struct pci_bus *bus); void pci_bus_size_bridges(struct pci_bus *bus); +void pci_bus_release_bridges_not_used_res(struct pci_bus *bus); int pci_claim_resource(struct pci_dev *, int); void pci_assign_unassigned_resources(void); void pdev_enable_device(struct pci_dev *); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/