Commit d06cc1e3 authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Bjorn Helgaas
Browse files

PCI: Remove add_align overwrite unrelated to size0 

Commit 566f1dd5 ("PCI: Relax bridge window tail sizing rules")
relaxed bridge window tail alignment rule for the non-optional part
(size0, no add_size/add_align). The change, however, also overwrote
add_align, which is only related to case where optional size1 related
entry is added into realloc head.

Correct this by removing the add_align overwrite.

Link: https://lore.kernel.org/r/20241216175632.4175-2-ilpo.jarvinen@linux.intel.com


Fixes: 566f1dd5 ("PCI: Relax bridge window tail sizing rules")
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Tested-by: default avatarXiaochun Lee <lixc17@lenovo.com>
parent 1a596ad0

drivers/pci/setup-bus.c

+0 −1
Original line number Diff line number Diff line
@@ -1149,7 +1149,6 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, 
		min_align = 1ULL << (max_order + __ffs(SZ_1M));

		min_align = max(min_align, win_align);

		size0 = calculate_memsize(size, min_size, 0, 0, resource_size(b_res), win_align);

		add_align = win_align;

		pci_info(bus->self, "bridge window %pR to %pR requires relaxed alignment rules\n",

			 b_res, &bus->busn_res);

	}