Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755475AbZLVXET (ORCPT ); Tue, 22 Dec 2009 18:04:19 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755377AbZLVXD6 (ORCPT ); Tue, 22 Dec 2009 18:03:58 -0500 Received: from sca-es-mail-1.Sun.COM ([192.18.43.132]:61950 "EHLO sca-es-mail-1.sun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752313AbZLVXDs (ORCPT ); Tue, 22 Dec 2009 18:03:48 -0500 MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Date: Tue, 22 Dec 2009 15:02:23 -0800 From: Yinghai Lu Subject: [PATCH 03/14] pci: add pci_bridge_release_unused_res and pci_bus_release_unused_bridge_res In-reply-to: <1261522954-12591-1-git-send-email-yinghai@kernel.org> To: Jesse Barnes , Ingo Molnar , Linus Torvalds , Ivan Kokshaysky , Kenji Kaneshige , Alex Chiang , Bjorn Helgaas Cc: linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Yinghai Lu Message-id: <1261522954-12591-4-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.6.0.2 References: <1261522954-12591-1-git-send-email-yinghai@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3433 Lines: 126 so later we could use it to release small resource before pci assign unassign res -v2: change name to release_child_resources according to Jesse -v3: according to Linus, move release_child_resources to resource.c also need to put the lock around them all to avoid recursive deep. (my test case only have one level that need to be released) -v4: seperate release_child_resources to another patch according to Bjorn, change hard code 3 to PCI_BRIDGE_RESOURCE_END Signed-off-by: Yinghai Lu --- drivers/pci/setup-bus.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 93 insertions(+), 0 deletions(-) diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 1bd41ac..7d6d393 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -604,6 +604,99 @@ void __ref pci_bus_assign_resources(const struct pci_bus *bus) } EXPORT_SYMBOL(pci_bus_assign_resources); +static void pci_bridge_release_unused_res(struct pci_bus *bus, + unsigned long type) +{ + int idx; + bool changed = false; + struct pci_dev *dev; + struct resource *r; + unsigned long type_mask = IORESOURCE_IO | IORESOURCE_MEM | + IORESOURCE_PREFETCH; + + dev = bus->self; + for (idx = PCI_BRIDGE_RESOURCES; idx <= PCI_BRIDGE_RESOURCE_END; + idx++) { + r = &dev->resource[idx]; + if ((r->flags & type_mask) != type) + continue; + if (!r->parent) + continue; + /* + * if there are children under that, we should release them + * all + */ + release_child_resources(r); + if (!release_resource(r)) { + dev_printk(KERN_DEBUG, &dev->dev, + "resource %d %pR released\n", idx, r); + /* keep the old size */ + r->end = resource_size(r) - 1; + r->start = 0; + r->flags = 0; + changed = true; + } + } + + if (changed) { + if (type & IORESOURCE_PREFETCH) { + /* avoiding touch the one without PREF */ + type = IORESOURCE_PREFETCH; + } + __pci_setup_bridge(bus, type); + } +} + +/* + * try to release pci bridge resources that is from leaf bridge, + * so we can allocate big new one later + * check: + * 0: only release the bridge and only the bridge is leaf + * 1: release all down side bridge for third shoot + */ +static void __ref pci_bus_release_unused_bridge_res(struct pci_bus *bus, + unsigned long type, + int check_leaf) +{ + struct pci_dev *dev; + bool is_leaf_bridge = true; + + list_for_each_entry(dev, &bus->devices, bus_list) { + struct pci_bus *b = dev->subordinate; + if (!b) + continue; + + switch (dev->class >> 8) { + case PCI_CLASS_BRIDGE_CARDBUS: + is_leaf_bridge = false; + break; + + case PCI_CLASS_BRIDGE_PCI: + default: + is_leaf_bridge = false; + if (!check_leaf) + pci_bus_release_unused_bridge_res(b, type, + check_leaf); + break; + } + } + + /* The root bus? */ + if (!bus->self) + return; + + switch (bus->self->class >> 8) { + case PCI_CLASS_BRIDGE_CARDBUS: + break; + + case PCI_CLASS_BRIDGE_PCI: + default: + if ((check_leaf && is_leaf_bridge) || !check_leaf) + pci_bridge_release_unused_res(bus, type); + break; + } +} + static void pci_bus_dump_res(struct pci_bus *bus) { int i; -- 1.6.0.2 -- 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/