From patchwork Mon Oct 26 21:23:39 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 55980 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 n9QLP1kd025422 for ; Mon, 26 Oct 2009 21:25:01 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753717AbZJZVX4 (ORCPT ); Mon, 26 Oct 2009 17:23:56 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753730AbZJZVX4 (ORCPT ); Mon, 26 Oct 2009 17:23:56 -0400 Received: from hera.kernel.org ([140.211.167.34]:46344 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752803AbZJZVXz (ORCPT ); Mon, 26 Oct 2009 17:23:55 -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 n9QLNnbV015600 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 26 Oct 2009 21:23:49 GMT X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.95.2 at hera.kernel.org Message-ID: <4AE6135B.2070003@kernel.org> Date: Mon, 26 Oct 2009 14:23:39 -0700 From: Yinghai Lu User-Agent: Thunderbird 2.0.0.23 (X11/20090817) MIME-Version: 1.0 To: Jesse Barnes CC: Bjorn Helgaas , "linux-pci@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Ingo Molnar Subject: Re: [PATCH] pci: only release that resource index is less than 3 References: <4AE2C827.8040905@kernel.org> <200910261032.58231.bjorn.helgaas@hp.com> <20091026101942.578f41b2@jbarnes-g45> In-Reply-To: <20091026101942.578f41b2@jbarnes-g45> 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 @@ -322,33 +322,54 @@ static void pci_bridge_check_ranges(stru } } -/* 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, - have non-NULL parent resource). */ -static struct resource *find_free_bus_resource(struct pci_bus *bus, unsigned long type) +void pci_bridge_release_not_used_res(struct pci_bus *bus) { int i; struct resource *r; unsigned long type_mask = IORESOURCE_IO | IORESOURCE_MEM | IORESOURCE_PREFETCH; - for (i = 0; i < PCI_BUS_NUM_RESOURCES; i++) { + /* for pci bridges res only */ + for (i = 0; i < 3; i++) { r = bus->resource[i]; - if (r == &ioport_resource || r == &iomem_resource) - continue; - if (r && (r->flags & type_mask) == type) { + if (r && (r->flags & type_mask)) { if (!r->parent) - return r; + continue; /* * if there is no child under that, we should release * and use it. don't need to reset it, pbus_size_* will * set it again */ if (!r->child && !release_resource(r)) - return r; + dev_printk(KERN_DEBUG, &bus->dev, + "resource %d %s %pR released\n", i, + (r->flags & IORESOURCE_IO) ? "io: " : + ((r->flags & IORESOURCE_PREFETCH)? + "pref mem":"mem:"), + r); } } +} +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, + have non-NULL parent resource). */ +static struct resource *find_free_bus_resource(struct pci_bus *bus, unsigned long type) +{ + int i; + struct resource *r; + unsigned long type_mask = IORESOURCE_IO | IORESOURCE_MEM | + IORESOURCE_PREFETCH; + + for (i = 0; i < PCI_BUS_NUM_RESOURCES; i++) { + r = bus->resource[i]; + if (r == &ioport_resource || r == &iomem_resource) + continue; + if (r && (r->flags & type_mask) == type && !r->parent) + return r; + } return NULL; } @@ -588,6 +609,41 @@ void __ref pci_bus_size_bridges(struct p } EXPORT_SYMBOL(pci_bus_size_bridges); +static void pci_bus_release_bridges_not_used_res(struct pci_bus *bus) +{ + struct pci_dev *dev; + + 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: + break; + + case PCI_CLASS_BRIDGE_PCI: + default: + 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: + pci_bridge_release_not_used_res(bus); + break; + } +} + void __ref pci_bridge_assign_resources(const struct pci_dev *bridge) { struct pci_bus *b; @@ -687,6 +743,11 @@ pci_assign_unassigned_resources(void) { struct pci_bus *bus; + /* 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); + } + /* Depth first, calculate sizes and alignments of all subordinate buses. */ list_for_each_entry(bus, &pci_root_buses, node) { 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 @@ -171,6 +171,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,7 @@ 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_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 *);