From patchwork Sat Jan 16 11:07:07 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 73378 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0GB8oXj030434 for ; Sat, 16 Jan 2010 11:08:51 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753990Ab0APLIu (ORCPT ); Sat, 16 Jan 2010 06:08:50 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754218Ab0APLIt (ORCPT ); Sat, 16 Jan 2010 06:08:49 -0500 Received: from sca-es-mail-2.Sun.COM ([192.18.43.133]:38774 "EHLO sca-es-mail-2.sun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753598Ab0APLIs (ORCPT ); Sat, 16 Jan 2010 06:08:48 -0500 Received: from fe-sfbay-09.sun.com ([192.18.43.129]) by sca-es-mail-2.sun.com (8.13.7+Sun/8.12.9) with ESMTP id o0GB8m78029414; Sat, 16 Jan 2010 03:08:48 -0800 (PST) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Received: from conversion-daemon.fe-sfbay-09.sun.com by fe-sfbay-09.sun.com (Sun Java(tm) System Messaging Server 7u2-7.04 64bit (built Jul 2 2009)) id <0KWC00L006S6XR00@fe-sfbay-09.sun.com>; Sat, 16 Jan 2010 03:08:48 -0800 (PST) Received: from localhost.localdomain ([unknown] [75.36.243.89]) by fe-sfbay-09.sun.com (Sun Java(tm) System Messaging Server 7u2-7.04 64bit (built Jul 2 2009)) with ESMTPSA id <0KWC00FJR6YF4SC0@fe-sfbay-09.sun.com>; Sat, 16 Jan 2010 03:08:48 -0800 (PST) Date: Sat, 16 Jan 2010 03:07:07 -0800 From: Yinghai Lu Subject: [PATCH 01/11] pci: add pci_bridge_release_unused_res and pci_bus_release_unused_bridge_res In-reply-to: <1263640037-24134-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: <1263640037-24134-2-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.6.4.2 References: <1263640037-24134-1-git-send-email-yinghai@kernel.org> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 52fbd42..7a18428 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -604,6 +604,101 @@ void __ref pci_bus_assign_resources(const struct pci_bus *bus) } EXPORT_SYMBOL(pci_bus_assign_resources); +static void pci_bridge_release_resources(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); + } +} + +enum release_type { + leaf_only, + whole_subtree, +}; +/* + * try to release pci bridge resources that is from leaf bridge, + * so we can allocate big new one later + */ +static void __ref pci_bus_release_bridge_resources(struct pci_bus *bus, + unsigned long type, + enum release_type rel_type) +{ + 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 (rel_type == whole_subtree) + pci_bus_release_bridge_resources(b, type, + whole_subtree); + break; + } + } + + /* The root bus? */ + if (pci_is_root_bus(bus)) + return; + + switch (bus->self->class >> 8) { + case PCI_CLASS_BRIDGE_CARDBUS: + break; + + case PCI_CLASS_BRIDGE_PCI: + default: + if (((rel_type == leaf_only) && is_leaf_bridge) || + (rel_type == whole_subtree)) + pci_bridge_release_resources(bus, type); + break; + } +} + static void pci_bus_dump_res(struct pci_bus *bus) { int i;