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

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

frv/PCI: convert to pci_scan_root_bus() for correct root bus resources 



Convert from pci_scan_bus() to pci_scan_root_bus() and remove root bus
resource fixups.  This fixes the problem of "early" and "header" quirks
seeing incorrect root bus resources.

Note that peer root buses are scanned with pci_scan_bus() (which is now
deprecated), so they have the default ioport_resource and iomem_resource
resources.  This is unchanged from before, but these resources are
incorrect, and I don't know how to discover the correct ones.

CC: David Howells <dhowells@redhat.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 37d15909

arch/frv/mb93090-mb00/pci-vdk.c

+5 −6
Original line number Original line Diff line number Diff line
@@ -327,11 +327,6 @@ void __init pcibios_fixup_bus(struct pci_bus *bus) 
	printk("### PCIBIOS_FIXUP_BUS(%d)\n",bus->number);

	printk("### PCIBIOS_FIXUP_BUS(%d)\n",bus->number);

#endif

#endif





	if (bus->number == 0) {

		bus->resource[0] = &pci_ioport_resource;

		bus->resource[1] = &pci_iomem_resource;

	}



	pci_read_bridge_bases(bus);

	pci_read_bridge_bases(bus);





	if (bus->number == 0) {

	if (bus->number == 0) {
@@ -357,6 +352,7 @@ void __init pcibios_fixup_bus(struct pci_bus *bus) 
int __init pcibios_init(void)

int __init pcibios_init(void)

{

{

	struct pci_ops *dir = NULL;

	struct pci_ops *dir = NULL;

	LIST_HEAD(resources);





	if (!mb93090_mb00_detected)

	if (!mb93090_mb00_detected)

		return -ENXIO;

		return -ENXIO;
@@ -420,7 +416,10 @@ int __init pcibios_init(void) 
	}

	}





	printk("PCI: Probing PCI hardware\n");

	printk("PCI: Probing PCI hardware\n");

	pci_root_bus = pci_scan_bus(0, pci_root_ops, NULL);

	pci_add_resource(&resources, &pci_ioport_resource);

	pci_add_resource(&resources, &pci_iomem_resource);

	pci_root_bus = pci_scan_root_bus(NULL, 0, pci_root_ops, NULL,

					 &resources);





	pcibios_irq_init();

	pcibios_irq_init();

	pcibios_fixup_peer_bridges();

	pcibios_fixup_peer_bridges();