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

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

parisc/PCI: dino: 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 c4e06576

drivers/parisc/dino.c

+12 −15
Original line number Original line Diff line number Diff line
@@ -562,19 +562,6 @@ dino_fixup_bus(struct pci_bus *bus) 
	/* Firmware doesn't set up card-mode dino, so we have to */

	/* Firmware doesn't set up card-mode dino, so we have to */

	if (is_card_dino(&dino_dev->hba.dev->id)) {

	if (is_card_dino(&dino_dev->hba.dev->id)) {

		dino_card_setup(bus, dino_dev->hba.base_addr);

		dino_card_setup(bus, dino_dev->hba.base_addr);

	} else if(bus->parent == NULL) {

		/* must have a dino above it, reparent the resources

		 * into the dino window */

		int i;

		struct resource *res = &dino_dev->hba.lmmio_space;



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

		for(i = 0; i < DINO_MAX_LMMIO_RESOURCES; i++) {

			if(res[i].flags == 0)

				break;

			bus->resource[i+1] = &res[i];

		}



	} else if (bus->parent) {

	} else if (bus->parent) {

		int i;

		int i;
@@ -927,6 +914,7 @@ static int __init dino_probe(struct parisc_device *dev) 
	const char *version = "unknown";

	const char *version = "unknown";

	char *name;

	char *name;

	int is_cujo = 0;

	int is_cujo = 0;

	LIST_HEAD(resources);

	struct pci_bus *bus;

	struct pci_bus *bus;

	unsigned long hpa = dev->hpa.start;

	unsigned long hpa = dev->hpa.start;
@@ -1003,15 +991,24 @@ static int __init dino_probe(struct parisc_device *dev) 




	dev->dev.platform_data = dino_dev;

	dev->dev.platform_data = dino_dev;





	pci_add_resource(&resources, &dino_dev->hba.io_space);

	if (dino_dev->hba.lmmio_space.flags)

		pci_add_resource(&resources, &dino_dev->hba.lmmio_space);

	if (dino_dev->hba.elmmio_space.flags)

		pci_add_resource(&resources, &dino_dev->hba.elmmio_space);

	if (dino_dev->hba.gmmio_space.flags)

		pci_add_resource(&resources, &dino_dev->hba.gmmio_space);



	/*

	/*

	** It's not used to avoid chicken/egg problems

	** It's not used to avoid chicken/egg problems

	** with configuration accessor functions.

	** with configuration accessor functions.

	*/

	*/

	dino_dev->hba.hba_bus = bus = pci_create_bus(&dev->dev,

	dino_dev->hba.hba_bus = bus = pci_create_root_bus(&dev->dev,

			 dino_current_bus, &dino_cfg_ops, NULL);

			 dino_current_bus, &dino_cfg_ops, NULL, &resources);

	if (!bus) {

	if (!bus) {

		printk(KERN_ERR "ERROR: failed to scan PCI bus on %s (duplicate bus number %d?)\n",

		printk(KERN_ERR "ERROR: failed to scan PCI bus on %s (duplicate bus number %d?)\n",

		       dev_name(&dev->dev), dino_current_bus);

		       dev_name(&dev->dev), dino_current_bus);

		pci_free_resource_list(&resources);

		/* increment the bus number in case of duplicates */

		/* increment the bus number in case of duplicates */

		dino_current_bus++;

		dino_current_bus++;

		return 0;

		return 0;