hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Nicholas Johnson <nicholas.johnson-opensource@outlook.com.au>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
This commit is contained in:
Nicholas Johnson 2020-01-28 14:59:23 -06:00 committed by Bjorn Helgaas
parent 3d67a2dbdb
commit 053eb5c150
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/pci/setup-bus.c
View File

@ -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;
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, mmio,
mmio_pref);
pci_bus_distribute_available_resources(b, add_list, io_per_hp,
mmio_per_hp,
mmio_pref_per_hp);
}
}