Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc7dce28 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Jesse Barnes
Browse files

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



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: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 42605fa6

drivers/parisc/lba_pci.c

+17 −12
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@ lba_fixup_bus(struct pci_bus *bus) 
		}

	} else {

		/* Host-PCI Bridge */

		int err, i;

		int err;



		DBG("lba_fixup_bus() %s [%lx/%lx]/%lx\n",

			ldev->hba.io_space.name,
@@ -669,9 +669,6 @@ lba_fixup_bus(struct pci_bus *bus) 
			lba_dump_res(&ioport_resource, 2);

			BUG();

		}

		/* advertize Host bridge resources to PCI bus */

		bus->resource[0] = &(ldev->hba.io_space);

		i = 1;



		if (ldev->hba.elmmio_space.start) {

			err = request_resource(&iomem_resource,
@@ -685,8 +682,7 @@ lba_fixup_bus(struct pci_bus *bus) 


				/* lba_dump_res(&iomem_resource, 2); */

				/* BUG(); */

			} else

				bus->resource[i++] = &(ldev->hba.elmmio_space);

			}

		}



		if (ldev->hba.lmmio_space.flags) {
@@ -696,8 +692,7 @@ lba_fixup_bus(struct pci_bus *bus) 
					"lmmio_space [%lx/%lx]\n",

					(long)ldev->hba.lmmio_space.start,

					(long)ldev->hba.lmmio_space.end);

			} else

				bus->resource[i++] = &(ldev->hba.lmmio_space);

			}

		}



#ifdef CONFIG_64BIT
@@ -712,7 +707,6 @@ lba_fixup_bus(struct pci_bus *bus) 
				lba_dump_res(&iomem_resource, 2);

				BUG();

			}

			bus->resource[i++] = &(ldev->hba.gmmio_space);

		}

#endif
@@ -1388,6 +1382,7 @@ static int __init 
lba_driver_probe(struct parisc_device *dev)

{

	struct lba_device *lba_dev;

	LIST_HEAD(resources);

	struct pci_bus *lba_bus;

	struct pci_ops *cfg_ops;

	u32 func_class;
@@ -1519,12 +1514,22 @@ lba_driver_probe(struct parisc_device *dev) 
		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;

	lba_bus = lba_dev->hba.hba_bus =

		pci_create_bus(&dev->dev, lba_dev->hba.bus_num.start,

			       cfg_ops, NULL);

	if (!lba_bus)

		pci_create_root_bus(&dev->dev, lba_dev->hba.bus_num.start,

				    cfg_ops, NULL, &resources);

	if (!lba_bus) {

		pci_free_resource_list(&resources);

		return 0;

	}



	lba_bus->subordinate = pci_scan_child_bus(lba_bus);