Commit 4d17e851 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'topic/yinghai-busn-alloc' into next 

* topic/yinghai-busn-alloc: (33 commits)
  PCI: hotplug: remove pci_do_scan_bus()
  PCI: sgihp: use generic pci_hp_add_bridge()
  PCI: ibmhp: use generic pci_hp_add_bridge()
  PCI: cpqhp: use generic pci_hp_add_bridge()
  PCI: shpchp: use generic pci_hp_add_bridge()
  PCI: cpci_hotplug: use generic pci_hp_add_bridge()
  PCI: pciehp: use generic pci_hp_add_bridge()
  PCI: add generic pci_hp_add_bridge()
  PCI: sgihp: register busn_res
  PCI: ibmhp: register busn_res
  PCI: cpqhp: register busn_res
  PCI: shpchp: register busn_res
  PCI: cpci_hotplug: register busn_res
  PCI: insert busn_res for child bus
  PCI: register busn_res for iov bus
  tile/PCI: use pci_scan_root_bus instead pci_scan_bus
  parisc/PCI: register busn_res for root buses
  powerpc/PCI: register busn_res for root buses
  sparc/PCI: register busn_res for root buses
  ia64/PCI: register busn_res for root buses
  ...
parents cfaf0251 06aef8ce

arch/alpha/kernel/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ common_init_pci(void) 
					hose, &resources);

		hose->bus = bus;

		hose->need_domain_info = need_domain_info;

		next_busno = bus->subordinate + 1;

		next_busno = bus->busn_res.end + 1;

		/* Don't allow 8-bit bus number overflow inside the hose -

		   reserve some space for bridges. */ 

		if (next_busno > 224) {

arch/arm/kernel/bios32.c

+1 −1
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ static void __init pcibios_init_hw(struct hw_pci *hw, struct list_head *head) 
			if (!sys->bus)

				panic("PCI: unable to scan bus!");



			busnr = sys->bus->subordinate + 1;

			busnr = sys->bus->busn_res.end + 1;



			list_add(&sys->node, head);

		} else {

arch/ia64/pci/pci.c

+3 −1
Original line number Diff line number Diff line
@@ -351,6 +351,8 @@ pci_acpi_scan_root(struct acpi_pci_root *root) 
#endif



	INIT_LIST_HEAD(&info.resources);

	/* insert busn resource at first */

	pci_add_resource(&info.resources, &root->secondary);

	acpi_walk_resources(device->handle, METHOD_NAME__CRS, count_window,

			&windows);

	if (windows) {
@@ -384,7 +386,7 @@ pci_acpi_scan_root(struct acpi_pci_root *root) 
		return NULL;

	}



	pbus->subordinate = pci_scan_child_bus(pbus);

	pci_scan_child_bus(pbus);

	return pbus;



out3:

arch/microblaze/pci/pci-common.c

+2 −2
Original line number Diff line number Diff line
@@ -1506,10 +1506,10 @@ static void __devinit pcibios_scan_phb(struct pci_controller *hose) 
		pci_free_resource_list(&resources);

		return;

	}

	bus->secondary = hose->first_busno;

	bus->busn_res.start = hose->first_busno;

	hose->bus = bus;



	hose->last_busno = bus->subordinate;

	hose->last_busno = bus->busn_res.end;

}



static int __init pcibios_init(void)

arch/mips/pci/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static void __devinit pcibios_scanbus(struct pci_controller *hose) 
	need_domain_info = need_domain_info || hose->index;

	hose->need_domain_info = need_domain_info;

	if (bus) {

		next_busno = bus->subordinate + 1;

		next_busno = bus->busn_res.end + 1;

		/* Don't allow 8-bit bus number overflow inside the hose -

		   reserve some space for bridges. */

		if (next_busno > 224) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE