From patchwork Sun Jan 27 05:36:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v2,17/22] PCI, frv: Kill pci_root_buses in resources reservations Date: Sat, 26 Jan 2013 19:36:38 -0000 From: Yinghai Lu X-Patchwork-Id: 215959 Message-Id: <1359265003-16166-18-git-send-email-yinghai@kernel.org> To: Bjorn Helgaas , Jiang Liu , "Rafael J. Wysocki" , Taku Izumi Cc: linux-pci@vger.kernel.org, Yinghai Lu , David Howells Signed-off-by: Yinghai Lu Cc: David Howells --- arch/frv/mb93090-mb00/pci-frv.c | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/arch/frv/mb93090-mb00/pci-frv.c b/arch/frv/mb93090-mb00/pci-frv.c index c281217..2a127f9 100644 --- a/arch/frv/mb93090-mb00/pci-frv.c +++ b/arch/frv/mb93090-mb00/pci-frv.c @@ -78,27 +78,26 @@ pcibios_align_resource(void *data, const struct resource *res, * as well. */ -static void __init pcibios_allocate_bus_resources(struct list_head *bus_list) +static void __init pcibios_allocate_bridge_resources(struct pci_dev *dev) { - struct list_head *ln; - struct pci_bus *bus; - struct pci_dev *dev; int idx; struct resource *r; + for (idx = PCI_BRIDGE_RESOURCES; idx < PCI_NUM_RESOURCES; idx++) { + r = &dev->resource[idx]; + if (!r->start) + continue; + pci_claim_resource(dev, idx); + } +} +static void __init pcibios_allocate_bus_resources(struct pci_bus *bus) +{ + struct pci_bus *child; /* Depth-First Search on bus tree */ - for (ln=bus_list->next; ln != bus_list; ln=ln->next) { - bus = pci_bus_b(ln); - if ((dev = bus->self)) { - for (idx = PCI_BRIDGE_RESOURCES; idx < PCI_NUM_RESOURCES; idx++) { - r = &dev->resource[idx]; - if (!r->start) - continue; - pci_claim_resource(dev, idx); - } - } - pcibios_allocate_bus_resources(&bus->children); - } + if (bus->self) + pcibios_allocate_bridge_resources(bus->self); + list_for_each_entry(child, &bus->children, node) + pcibios_allocate_bus_resources(child); } static void __init pcibios_allocate_resources(int pass) @@ -188,8 +187,12 @@ static void __init pcibios_assign_resources(void) void __init pcibios_resource_survey(void) { + struct pci_host_bridge *host_bridge = NULL; + DBG("PCI: Allocating resources\n"); - pcibios_allocate_bus_resources(&pci_root_buses); + + for_each_pci_host_bridge(host_bridge) + pcibios_allocate_bus_resources(host_bridge->bus); pcibios_allocate_resources(0); pcibios_allocate_resources(1); pcibios_assign_resources();