Commit 1193725f authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/yinghai-assign-unassigned-v6' into next 

* pci/yinghai-assign-unassigned-v6:
  PCI: Assign resources for hot-added host bridge more aggressively
  PCI: Move resource reallocation code to non-__init
  PCI: Delay enabling bridges until they're needed
  PCI: Assign resources on a per-bus basis
  PCI: Enable unassigned resource reallocation on per-bus basis
  PCI: Turn on reallocation for unassigned resources with host bridge offset
  PCI: Look for unassigned resources on per-bus basis
  PCI: Drop temporary variable in pci_assign_unassigned_resources()
parents 7d8c4a2c 39772038

arch/arm/kernel/bios32.c

+0 −5
Original line number Diff line number Diff line
@@ -525,11 +525,6 @@ void pci_common_init_dev(struct device *parent, struct hw_pci *hw) 
			 * Assign resources.

			 */

			pci_bus_assign_resources(bus);



			/*

			 * Enable bridges

			 */

			pci_enable_bridges(bus);

		}



		/*

arch/m68k/platform/coldfire/pci.c

+0 −1
Original line number Diff line number Diff line
@@ -319,7 +319,6 @@ static int __init mcf_pci_init(void) 
	pci_fixup_irqs(pci_common_swizzle, mcf_pci_map_irq);

	pci_bus_size_bridges(rootbus);

	pci_bus_assign_resources(rootbus);

	pci_enable_bridges(rootbus);

	return 0;

}

arch/mips/pci/pci.c

+0 −1
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ static void pcibios_scanbus(struct pci_controller *hose) 
		if (!pci_has_flag(PCI_PROBE_ONLY)) {

			pci_bus_size_bridges(bus);

			pci_bus_assign_resources(bus);

			pci_enable_bridges(bus);

		}

	}

}

arch/sh/drivers/pci/pci.c

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ static void pcibios_scanbus(struct pci_channel *hose) 


		pci_bus_size_bridges(bus);

		pci_bus_assign_resources(bus);

		pci_enable_bridges(bus);

	} else {

		pci_free_resource_list(&resources);

	}

drivers/acpi/pci_root.c

+1 −4
Original line number Diff line number Diff line
@@ -526,10 +526,7 @@ static int acpi_pci_root_add(struct acpi_device *device, 


	if (system_state != SYSTEM_BOOTING) {

		pcibios_resource_survey_bus(root->bus);

		pci_assign_unassigned_bus_resources(root->bus);



		/* need to after hot-added ioapic is registered */

		pci_enable_bridges(root->bus);

		pci_assign_unassigned_root_bus_resources(root->bus);

	}



	pci_bus_add_devices(root->bus);

CRA Git | Maintained and supported by SUSTech CRA and CCSE