Commit 053eb5c1 authored by Nicholas Johnson's avatar Nicholas Johnson Committed by Bjorn Helgaas
Browse files

PCI: Rename variables 

In pci_bus_distribute_available_resources(), rename:

  io         =>  io_per_hp
  mmio       =>  mmio_per_hp
  mmio_pref  =>  mmio_pref_per_hp

No functional change; this is just to make a subsequent patch smaller.

[bhelgaas: extracted from https://lore.kernel.org/r/PSXP216MB0438587C47CBEDF365B1EA27803C0@PSXP216MB0438.KORP216.PROD.OUTLOOK.COM

]
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>
parent 3d67a2db

drivers/pci/setup-bus.c

+17 −13
Original line number Diff line number Diff line
@@ -1873,6 +1873,7 @@ static void pci_bus_distribute_available_resources(struct pci_bus *bus, 
	unsigned int normal_bridges = 0, hotplug_bridges = 0;

	struct resource *io_res, *mmio_res, *mmio_pref_res;

	struct pci_dev *dev, *bridge = bus->self;

	resource_size_t io_per_hp, mmio_per_hp, mmio_pref_per_hp;



	io_res = &bridge->resource[PCI_BRIDGE_RESOURCES + 0];

	mmio_res = &bridge->resource[PCI_BRIDGE_RESOURCES + 1];
@@ -1956,7 +1957,7 @@ static void pci_bus_distribute_available_resources(struct pci_bus *bus, 
	 * resource space between hotplug bridges.

	 */

	for_each_pci_bridge(dev, bus) {

		resource_size_t align, io, mmio, mmio_pref;

		resource_size_t align;

		struct pci_bus *b;



		b = dev->subordinate;
@@ -1969,22 +1970,25 @@ static void pci_bus_distribute_available_resources(struct pci_bus *bus, 
		 * account.

		 */

		align = pci_resource_alignment(bridge, io_res);

		io = div64_ul(available_io, hotplug_bridges);

		io = min(ALIGN(io, align), remaining_io);

		remaining_io -= io;

		io_per_hp = div64_ul(available_io, hotplug_bridges);

		io_per_hp = min(ALIGN(io_per_hp, align), remaining_io);

		remaining_io -= io_per_hp;



		align = pci_resource_alignment(bridge, mmio_res);

		mmio = div64_ul(available_mmio, hotplug_bridges);

		mmio = min(ALIGN(mmio, align), remaining_mmio);

		remaining_mmio -= mmio;

		mmio_per_hp = div64_ul(available_mmio, hotplug_bridges);

		mmio_per_hp = min(ALIGN(mmio_per_hp, align), remaining_mmio);

		remaining_mmio -= mmio_per_hp;



		align = pci_resource_alignment(bridge, mmio_pref_res);

		mmio_pref = div64_ul(available_mmio_pref, hotplug_bridges);

		mmio_pref = min(ALIGN(mmio_pref, align), remaining_mmio_pref);

		remaining_mmio_pref -= mmio_pref;



		pci_bus_distribute_available_resources(b, add_list, io, mmio,

						       mmio_pref);

		mmio_pref_per_hp = div64_ul(available_mmio_pref,

					    hotplug_bridges);

		mmio_pref_per_hp = min(ALIGN(mmio_pref_per_hp, align),

				       remaining_mmio_pref);

		remaining_mmio_pref -= mmio_pref_per_hp;



		pci_bus_distribute_available_resources(b, add_list, io_per_hp,

						       mmio_per_hp,

						       mmio_pref_per_hp);

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE