evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

parisc/PCI: lba: convert to pci_create_root_bus() for correct root bus resources

Browse source 
Supply root bus resources to pci_create_root_bus() so they're correct
immediately.  This fixes the problem of "early" and "header" quirks seeing
incorrect root bus resources.

CC: linux-parisc@vger.kernel.org
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Bjorn Helgaas 2011-10-28 16:27:27 -06:00 • committed by Jesse Barnes
parent 42605fa666
commit dc7dce280a
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
drivers/parisc/lba_pci.c
View file

@ -653,7 +653,7 @@ lba_fixup_bus(struct pci_bus *bus)
} }
} else { } else {
/* Host-PCI Bridge */ /* Host-PCI Bridge */
int err, i; int err;
DBG("lba_fixup_bus() %s [%lx/%lx]/%lx\n", DBG("lba_fixup_bus() %s [%lx/%lx]/%lx\n",
ldev->hba.io_space.name, ldev->hba.io_space.name,
@ -669,9 +669,6 @@ lba_fixup_bus(struct pci_bus *bus)
lba_dump_res(&ioport_resource, 2); lba_dump_res(&ioport_resource, 2);
BUG(); BUG();
} }
/* advertize Host bridge resources to PCI bus */
bus->resource[0] = &(ldev->hba.io_space);
i = 1;
if (ldev->hba.elmmio_space.start) { if (ldev->hba.elmmio_space.start) {
err = request_resource(&iomem_resource, err = request_resource(&iomem_resource,
@ -685,8 +682,7 @@ lba_fixup_bus(struct pci_bus *bus)
/* lba_dump_res(&iomem_resource, 2); */ /* lba_dump_res(&iomem_resource, 2); */
/* BUG(); */ /* BUG(); */
} else }
bus->resource[i++] = &(ldev->hba.elmmio_space);
} }
if (ldev->hba.lmmio_space.flags) { if (ldev->hba.lmmio_space.flags) {
@ -696,8 +692,7 @@ lba_fixup_bus(struct pci_bus *bus)
"lmmio_space [%lx/%lx]\n", "lmmio_space [%lx/%lx]\n",
(long)ldev->hba.lmmio_space.start, (long)ldev->hba.lmmio_space.start,
(long)ldev->hba.lmmio_space.end); (long)ldev->hba.lmmio_space.end);
} else }
bus->resource[i++] = &(ldev->hba.lmmio_space);
} }
#ifdef CONFIG_64BIT #ifdef CONFIG_64BIT
@ -712,7 +707,6 @@ lba_fixup_bus(struct pci_bus *bus)
lba_dump_res(&iomem_resource, 2); lba_dump_res(&iomem_resource, 2);
BUG(); BUG();
} }
bus->resource[i++] = &(ldev->hba.gmmio_space);
} }
#endif #endif
@ -1388,6 +1382,7 @@ static int __init
lba_driver_probe(struct parisc_device *dev) lba_driver_probe(struct parisc_device *dev)
{ {
struct lba_device *lba_dev; struct lba_device *lba_dev;
LIST_HEAD(resources);
struct pci_bus *lba_bus; struct pci_bus *lba_bus;
struct pci_ops *cfg_ops; struct pci_ops *cfg_ops;
u32 func_class; u32 func_class;
@ -1519,12 +1514,22 @@ lba_driver_probe(struct parisc_device *dev)
lba_dev->hba.lmmio_space.flags = 0; lba_dev->hba.lmmio_space.flags = 0;
} }
pci_add_resource(&resources, &lba_dev->hba.io_space);
if (lba_dev->hba.elmmio_space.start)
pci_add_resource(&resources, &lba_dev->hba.elmmio_space);
if (lba_dev->hba.lmmio_space.flags)
pci_add_resource(&resources, &lba_dev->hba.lmmio_space);
if (lba_dev->hba.gmmio_space.flags)
pci_add_resource(&resources, &lba_dev->hba.gmmio_space);
dev->dev.platform_data = lba_dev; dev->dev.platform_data = lba_dev;
lba_bus = lba_dev->hba.hba_bus = lba_bus = lba_dev->hba.hba_bus =
pci_create_bus(&dev->dev, lba_dev->hba.bus_num.start, pci_create_root_bus(&dev->dev, lba_dev->hba.bus_num.start,
cfg_ops, NULL); cfg_ops, NULL, &resources);
if (!lba_bus) if (!lba_bus) {
pci_free_resource_list(&resources);
return 0; return 0;
}
lba_bus->subordinate = pci_scan_child_bus(lba_bus); lba_bus->subordinate = pci_scan_child_bus(lba_bus);