Commit 5c6bcc34 authored by Nicholas Johnson's avatar Nicholas Johnson Committed by Bjorn Helgaas
Browse files

PCI: Simplify pci_bus_distribute_available_resources() 

Reorder pci_bus_distribute_available_resources() to group related code
together.  No functional change intended.

Link: https://lore.kernel.org/r/PS2P216MB0642C7A485649D2D787A1C6F80000@PS2P216MB0642.KORP216.PROD.OUTLOOK.COM
Link: https://lore.kernel.org/r/20190622210310.180905-2-helgaas@kernel.org


Signed-off-by: default avatarNicholas Johnson <nicholas.johnson-opensource@outlook.com.au>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: default avatarLogan Gunthorpe <logang@deltatee.com>
parent 85dc0413

drivers/pci/setup-bus.c

+25 −25
Original line number Diff line number Diff line
@@ -1865,16 +1865,6 @@ static void pci_bus_distribute_available_resources(struct pci_bus *bus, 
	extend_bridge_window(bridge, mmio_pref_res, add_list,

			     available_mmio_pref);



	/*

	 * Calculate the total amount of extra resource space we can

	 * pass to bridges below this one.  This is basically the

	 * extra space reduced by the minimal required space for the

	 * non-hotplug bridges.

	 */

	remaining_io = available_io;

	remaining_mmio = available_mmio;

	remaining_mmio_pref = available_mmio_pref;



	/*

	 * Calculate how many hotplug bridges and normal bridges there

	 * are on this bus.  We will distribute the additional available
@@ -1887,6 +1877,31 @@ static void pci_bus_distribute_available_resources(struct pci_bus *bus, 
			normal_bridges++;

	}



	/*

	 * There is only one bridge on the bus so it gets all available

	 * resources which it can then distribute to the possible hotplug

	 * bridges below.

	 */

	if (hotplug_bridges + normal_bridges == 1) {

		dev = list_first_entry(&bus->devices, struct pci_dev, bus_list);

		if (dev->subordinate) {

			pci_bus_distribute_available_resources(dev->subordinate,

				add_list, available_io, available_mmio,

				available_mmio_pref);

		}

		return;

	}



	/*

	 * Calculate the total amount of extra resource space we can

	 * pass to bridges below this one.  This is basically the

	 * extra space reduced by the minimal required space for the

	 * non-hotplug bridges.

	 */

	remaining_io = available_io;

	remaining_mmio = available_mmio;

	remaining_mmio_pref = available_mmio_pref;



	for_each_pci_bridge(dev, bus) {

		const struct resource *res;
@@ -1910,21 +1925,6 @@ static void pci_bus_distribute_available_resources(struct pci_bus *bus, 
			remaining_mmio_pref -= resource_size(res);

	}



	/*

	 * There is only one bridge on the bus so it gets all available

	 * resources which it can then distribute to the possible hotplug

	 * bridges below.

	 */

	if (hotplug_bridges + normal_bridges == 1) {

		dev = list_first_entry(&bus->devices, struct pci_dev, bus_list);

		if (dev->subordinate) {

			pci_bus_distribute_available_resources(dev->subordinate,

				add_list, available_io, available_mmio,

				available_mmio_pref);

		}

		return;

	}



	/*

	 * Go over devices on this bus and distribute the remaining

	 * resource space between hotplug bridges.

CRA Git | Maintained and supported by SUSTech CRA and CCSE