sparc/PCI: register busn_res for root buses

Add the host bridge bus number aperture to the resource list.
Like the MMIO and I/O port apertures, this is used when assigning
resources to hot-added devices or in the case of conflicts.

[bhelgaas: changelog, fix "pci_last_busn" typo]
Acked-by: "David S. Miller" <davem@davemloft.net>
CC: sparclinux@vger.kernel.org
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index c85bfd788f74c159fac0ed83d794423428c2c14f..4f92a9aba3586a827267962407e7fe66b0a2021d 100644 (file)
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -535,7 +535,7 @@ static void __devinit of_scan_pci_bridge(struct pci_pbm_info *pbm,
        }
 
        bus->primary = dev->bus->number;
-       bus->busn_res.end = busrange[1];
+       pci_bus_insert_busn_res(bus, busrange[0], busrange[1]);
        bus->bridge_ctl = 0;
 
        /* parse ranges property, or cook one up by hand for Simba */
@@ -685,6 +685,10 @@ struct pci_bus * __devinit pci_scan_one_pbm(struct pci_pbm_info *pbm,
                                pbm->io_space.start);
        pci_add_resource_offset(&resources, &pbm->mem_space,
                                pbm->mem_space.start);
+       pbm->busn.start = pbm->pci_first_busno;
+       pbm->busn.end   = pbm->pci_last_busno;
+       pbm->busn.flags = IORESOURCE_BUS;
+       pci_add_resource(&resources, &pbm->busn);
        bus = pci_create_root_bus(parent, pbm->pci_first_busno, pbm->pci_ops,
                                  pbm, &resources);
        if (!bus) {
@@ -693,8 +697,6 @@ struct pci_bus * __devinit pci_scan_one_pbm(struct pci_pbm_info *pbm,
                pci_free_resource_list(&resources);
                return NULL;
        }
-       bus->busn_res.start = pbm->pci_first_busno;
-       bus->busn_res.end = pbm->pci_last_busno;
 
        pci_of_scan_bus(pbm, node, bus);
        pci_bus_add_devices(bus);

diff --git a/arch/sparc/kernel/pci_impl.h b/arch/sparc/kernel/pci_impl.h
index 6beb60df31d03fdd32193ad38b9245a89dd7d7ac..918a2031c8bbc855c7ee7a3eac30c82ab5f94ca4 100644 (file)
--- a/arch/sparc/kernel/pci_impl.h
+++ b/arch/sparc/kernel/pci_impl.h
@@ -97,6 +97,7 @@ struct pci_pbm_info {
        /* PBM I/O and Memory space resources. */
        struct resource                 io_space;
        struct resource                 mem_space;
+       struct resource                 busn;
 
        /* Base of PCI Config space, can be per-PBM or shared. */
        unsigned long                   config_space;