diff options
author | Yijing Wang <wangyijing@huawei.com> | 2015-03-09 10:33:58 +0800 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2015-03-12 15:04:01 -0500 |
commit | c90570d9511d42421c85709b46bffd366185d835 (patch) | |
tree | 63febf1d38c816fa7c540a8238f7436a9a483813 /arch/unicore32 | |
parent | c517d838eb7d07bbe9507871fab3931deccff539 (diff) | |
download | linux-c90570d9511d42421c85709b46bffd366185d835.tar.gz linux-c90570d9511d42421c85709b46bffd366185d835.tar.bz2 linux-c90570d9511d42421c85709b46bffd366185d835.zip |
PCI: Assign resources before drivers claim devices (pci_scan_bus())
Previously, pci_scan_bus() created a root PCI bus, enumerated the devices
on it, and called pci_bus_add_devices(), which made the devices available
for drivers to claim them.
Most callers assigned resources to devices after pci_scan_bus() returns,
which may be after drivers have claimed the devices. This is incorrect;
the PCI core should not change device resources while a driver is managing
the device.
Remove pci_bus_add_devices() from pci_scan_bus() and do it after any
resource assignment in the callers.
[bhelgaas: changelog, check for failure in mcf_pci_init()]
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: "David S. Miller" <davem@davemloft.net>
CC: Geert Uytterhoeven <geert@linux-m68k.org>
CC: Guan Xuetao <gxt@mprc.pku.edu.cn>
CC: Richard Henderson <rth@twiddle.net>
CC: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
CC: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'arch/unicore32')
-rw-r--r-- | arch/unicore32/kernel/pci.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/unicore32/kernel/pci.c b/arch/unicore32/kernel/pci.c index 374a055a8e6b..d45fa5f3e9c4 100644 --- a/arch/unicore32/kernel/pci.c +++ b/arch/unicore32/kernel/pci.c @@ -266,17 +266,10 @@ static int __init pci_common_init(void) pci_fixup_irqs(pci_common_swizzle, pci_puv3_map_irq); if (!pci_has_flag(PCI_PROBE_ONLY)) { - /* - * Size the bridge windows. - */ pci_bus_size_bridges(puv3_bus); - - /* - * Assign resources. - */ pci_bus_assign_resources(puv3_bus); } - + pci_bus_add_devices(puv3_bus); return 0; } subsys_initcall(pci_common_init); |