From patchwork Wed Oct 28 19:20:50 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 56342 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9SJLe2U021724 for ; Wed, 28 Oct 2009 19:21:40 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752947AbZJ1TVe (ORCPT ); Wed, 28 Oct 2009 15:21:34 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753085AbZJ1TVe (ORCPT ); Wed, 28 Oct 2009 15:21:34 -0400 Received: from hera.kernel.org ([140.211.167.34]:38096 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752935AbZJ1TVd (ORCPT ); Wed, 28 Oct 2009 15:21:33 -0400 Received: from [10.6.76.26] (sca-ea-fw-1.Sun.COM [192.18.43.225]) (authenticated bits=0) by hera.kernel.org (8.14.3/8.14.3) with ESMTP id n9SJL0Nf028737 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 28 Oct 2009 19:21:04 GMT X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.95.2 at hera.kernel.org Message-ID: <4AE89992.3010801@kernel.org> Date: Wed, 28 Oct 2009 12:20:50 -0700 From: Yinghai Lu User-Agent: Thunderbird 2.0.0.23 (X11/20090817) MIME-Version: 1.0 To: "Eric W. Biederman" , Kenji Kaneshige , Jesse Barnes , Alex Chiang , Bjorn Helgaas , Ingo Molnar CC: "linux-kernel@vger.kernel.org" , "linux-pci@vger.kernel.org" , Ivan Kokshaysky Subject: [PATCH 2/2] pci: only release that resource index is less than 3 -v5 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> <4AE89933.8030809@kernel.org> In-Reply-To: <4AE89933.8030809@kernel.org> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org 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 @@ -319,6 +319,42 @@ static void pci_bridge_check_ranges(stru } } +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) { + if (!r->parent) + continue; + /* + * if there is no child under that, we should release + * and use it. + */ + if (!r->child && !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); +} +EXPORT_SYMBOL(pci_bridge_release_not_used_res); + /* Helper function for sizing routines: find first available bus resource of a given type. Note: we intentionally skip the bus resources which have already been assigned (that is, @@ -576,6 +612,48 @@ void __ref pci_bus_size_bridges(struct p } EXPORT_SYMBOL(pci_bus_size_bridges); + +/* only release those resources that is on leaf bridge */ +void __ref pci_bus_release_bridges_not_used_res(struct pci_bus *bus) +{ + 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; + pci_bus_release_bridges_not_used_res(b); + 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 (is_leaf_bridge) + pci_bridge_release_not_used_res(bus); + break; + } +} +EXPORT_SYMBOL(pci_bus_release_bridges_not_used_res); + void __ref pci_bridge_assign_resources(const struct pci_dev *bridge) { struct pci_bus *b; @@ -644,7 +722,8 @@ static void pci_bus_dump_res(struct pci_ 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); Index: linux-2.6/drivers/pci/hotplug/pciehp_pci.c =================================================================== --- linux-2.6.orig/drivers/pci/hotplug/pciehp_pci.c +++ linux-2.6/drivers/pci/hotplug/pciehp_pci.c @@ -98,6 +98,7 @@ int pciehp_configure_device(struct slot pci_dev_put(dev); } + pci_bridge_release_not_used_res(parent); pci_bus_size_bridges(parent); pci_clear_master(bridge); pci_bridge_assign_resources(bridge); @@ -171,6 +172,7 @@ int pciehp_unconfigure_device(struct slo } pci_dev_put(temp); } + pci_bridge_release_not_used_res(parent); return rc; } Index: linux-2.6/include/linux/pci.h =================================================================== --- linux-2.6.orig/include/linux/pci.h +++ linux-2.6/include/linux/pci.h @@ -759,6 +759,8 @@ int pci_vpd_truncate(struct pci_dev *dev void pci_bridge_assign_resources(const struct pci_dev *bridge); 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); +void pci_bridge_release_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 *); Index: linux-2.6/arch/x86/pci/i386.c =================================================================== --- linux-2.6.orig/arch/x86/pci/i386.c +++ linux-2.6/arch/x86/pci/i386.c @@ -194,6 +194,7 @@ static void __init pcibios_allocate_reso static int __init pcibios_assign_resources(void) { struct pci_dev *dev = NULL; + struct pci_bus *bus; struct resource *r; if (!(pci_probe & PCI_ASSIGN_ROMS)) { @@ -213,6 +214,11 @@ static int __init pcibios_assign_resourc } } + /* Try to release bridge 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); + } + pci_assign_unassigned_resources(); return 0;