diff options
author | Yinghai Lu <yinghai@kernel.org> | 2012-09-17 22:13:41 -0700 |
---|---|---|
committer | Yinghai Lu <yinghai@kernel.org> | 2012-09-17 22:13:41 -0700 |
commit | e938bc595de39c48b570337ce925c67afc076cee (patch) | |
tree | 0a51722c227cdf61a8084ed1c2e60d9280385a4a | |
parent | 394c6dc530a31280dccd3ffe0cd4da4aa6a22bf2 (diff) | |
download | linux-yinghai-e938bc595de39c48b570337ce925c67afc076cee.tar.gz |
x86, PCI: Separate rom resource claim out
So could use it with hot-added root bus.
-v2: remove extra functions.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
-rw-r--r-- | arch/x86/pci/i386.c | 52 |
1 files changed, 35 insertions, 17 deletions
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c index 84696ed1f0e976..42dd7555235189 100644 --- a/arch/x86/pci/i386.c +++ b/arch/x86/pci/i386.c @@ -298,27 +298,45 @@ static void __init pcibios_allocate_resources(struct pci_bus *bus, int pass) } } -static int __init pcibios_assign_resources(void) +static void __init pcibios_allocate_dev_rom_resource(struct pci_dev *dev) { - struct pci_dev *dev = NULL; struct resource *r; - if (!(pci_probe & PCI_ASSIGN_ROMS)) { - /* - * Try to use BIOS settings for ROMs, otherwise let - * pci_assign_unassigned_resources() allocate the new - * addresses. - */ - for_each_pci_dev(dev) { - r = &dev->resource[PCI_ROM_RESOURCE]; - if (!r->flags || !r->start) - continue; - if (pci_claim_resource(dev, PCI_ROM_RESOURCE) < 0) { - r->end -= r->start; - r->start = 0; - } - } + /* + * Try to use BIOS settings for ROMs, otherwise let + * pci_assign_unassigned_resources() allocate the new + * addresses. + */ + r = &dev->resource[PCI_ROM_RESOURCE]; + if (!r->flags || !r->start) + return; + + if (pci_claim_resource(dev, PCI_ROM_RESOURCE) < 0) { + r->end -= r->start; + r->start = 0; } +} +static void __init pcibios_allocate_rom_resources(struct pci_bus *bus) +{ + struct pci_dev *dev; + struct pci_bus *child; + + list_for_each_entry(dev, &bus->devices, bus_list) { + pcibios_allocate_dev_rom_resource(dev); + + child = dev->subordinate; + if (child) + pcibios_allocate_rom_resources(child); + } +} + +static int __init pcibios_assign_resources(void) +{ + struct pci_bus *bus; + + if (!(pci_probe & PCI_ASSIGN_ROMS)) + list_for_each_entry(bus, &pci_root_buses, node) + pcibios_allocate_rom_resources(bus); pci_assign_unassigned_resources(); pcibios_fw_addr_list_del(); |