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

Commit 8d7d8186 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

x86/PCI: Use pcibios_scan_root() instead of pci_scan_bus_with_sysdata() 



pci_scan_bus_with_sysdata() and pcibios_scan_root() are quite similar:

  pci_scan_bus_with_sysdata
    pci_scan_bus_on_node(..., &pci_root_ops, -1)

  pcibios_scan_root
    pci_scan_bus_on_node(..., &pci_root_ops, get_mp_bus_to_node(busnum))

get_mp_bus_to_node() returns -1 if it couldn't find the node number, so
this removes pci_scan_bus_with_sysdata() and uses pcibios_scan_root()
instead.

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent f19e8482

arch/x86/include/asm/pci.h

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ extern int noioapicreroute; 
/* scan a bus after allocating a pci_sysdata for it */

extern struct pci_bus *pci_scan_bus_on_node(int busno, struct pci_ops *ops,

					    int node);

extern struct pci_bus *pci_scan_bus_with_sysdata(int busno);



#ifdef CONFIG_PCI

arch/x86/pci/common.c

+0 −5
Original line number Diff line number Diff line
@@ -697,11 +697,6 @@ struct pci_bus *pci_scan_bus_on_node(int busno, struct pci_ops *ops, int node) 
	return bus;

}



struct pci_bus *pci_scan_bus_with_sysdata(int busno)

{

	return pci_scan_bus_on_node(busno, &pci_root_ops, -1);

}



/*

 * NUMA info for PCI busses

 *

arch/x86/pci/fixup.c

+3 −3
Original line number Diff line number Diff line
@@ -25,9 +25,9 @@ static void pci_fixup_i450nx(struct pci_dev *d) 
		dev_dbg(&d->dev, "i450NX PXB %d: %02x/%02x/%02x\n", pxb, busno,

			suba, subb);

		if (busno)

			pci_scan_bus_with_sysdata(busno);	/* Bus A */

			pcibios_scan_root(busno);	/* Bus A */

		if (suba < subb)

			pci_scan_bus_with_sysdata(suba+1);	/* Bus B */

			pcibios_scan_root(suba+1);	/* Bus B */

	}

	pcibios_last_bus = -1;

}
@@ -42,7 +42,7 @@ static void pci_fixup_i450gx(struct pci_dev *d) 
	u8 busno;

	pci_read_config_byte(d, 0x4a, &busno);

	dev_info(&d->dev, "i440KX/GX host bridge; secondary bus %02x\n", busno);

	pci_scan_bus_with_sysdata(busno);

	pcibios_scan_root(busno);

	pcibios_last_bus = -1;

}

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82454GX, pci_fixup_i450gx);

arch/x86/pci/numaq_32.c

+3 −3
Original line number Diff line number Diff line
@@ -135,11 +135,11 @@ static void pci_fixup_i450nx(struct pci_dev *d) 
			pxb, busno, suba, subb);

		if (busno) {

			/* Bus A */

			pci_scan_bus_with_sysdata(QUADLOCAL2BUS(quad, busno));

			pcibios_scan_root(QUADLOCAL2BUS(quad, busno));

		}

		if (suba < subb) {

			/* Bus B */

			pci_scan_bus_with_sysdata(QUADLOCAL2BUS(quad, suba+1));

			pcibios_scan_root(QUADLOCAL2BUS(quad, suba+1));

		}

	}

	pcibios_last_bus = -1;
@@ -159,7 +159,7 @@ int __init pci_numaq_init(void) 
				continue;

			printk("Scanning PCI bus %d for quad %d\n", 

				QUADLOCAL2BUS(quad,0), quad);

			pci_scan_bus_with_sysdata(QUADLOCAL2BUS(quad, 0));

			pcibios_scan_root(QUADLOCAL2BUS(quad, 0));

		}

	return 0;

}

arch/x86/pci/visws.c

+2 −2
Original line number Diff line number Diff line
@@ -78,8 +78,8 @@ int __init pci_visws_init(void) 
		"bridge B (PIIX4) bus: %u\n", pci_bus1, pci_bus0);



	raw_pci_ops = &pci_direct_conf1;

	pci_scan_bus_with_sysdata(pci_bus0);

	pci_scan_bus_with_sysdata(pci_bus1);

	pcibios_scan_root(pci_bus0);

	pcibios_scan_root(pci_bus1);

	pci_fixup_irqs(pci_common_swizzle, visws_map_irq);

	pcibios_resource_survey();

	/* Request bus scan */