FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-20 08:22:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sparc/PCI: register busn_res for root buses

Browse Source 
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>
This commit is contained in:
Yinghai Lu 2012-05-17 18:51:12 -07:00 committed by Bjorn Helgaas
parent 2661b819a1
commit 3f1b540d46
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/sparc/kernel/pci.c
View File

@ -535,7 +535,7 @@ static void __devinit of_scan_pci_bridge(struct pci_pbm_info *pbm,
} }
bus->primary = dev->bus->number; 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; bus->bridge_ctl = 0;
/* parse ranges property, or cook one up by hand for Simba */ /* 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); pbm->io_space.start);
pci_add_resource_offset(&resources, &pbm->mem_space, pci_add_resource_offset(&resources, &pbm->mem_space,
pbm->mem_space.start); 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, bus = pci_create_root_bus(parent, pbm->pci_first_busno, pbm->pci_ops,
pbm, &resources); pbm, &resources);
if (!bus) { if (!bus) {
@ -693,8 +697,6 @@ struct pci_bus * __devinit pci_scan_one_pbm(struct pci_pbm_info *pbm,
pci_free_resource_list(&resources); pci_free_resource_list(&resources);
return NULL; 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_of_scan_bus(pbm, node, bus);
pci_bus_add_devices(bus); pci_bus_add_devices(bus);

1
arch/sparc/kernel/pci_impl.h
View File

@ -97,6 +97,7 @@ struct pci_pbm_info {
/* PBM I/O and Memory space resources. */ /* PBM I/O and Memory space resources. */
struct resource io_space; struct resource io_space;
struct resource mem_space; struct resource mem_space;
struct resource busn;
/* Base of PCI Config space, can be per-PBM or shared. */ /* Base of PCI Config space, can be per-PBM or shared. */
unsigned long config_space; unsigned long config_space;