PCI: Remove add_align overwrite unrelated to size0

[ Upstream commit d06cc1e3809040e8250f69a4c656e3717e6b963c ]

Commit 566f1dd52816 ("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: 566f1dd52816 ("PCI: Relax bridge window tail sizing rules")
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Tested-by: Xiaochun Lee <lixc17@lenovo.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index a6e653a4f5b1a21ff89aa2942e13086f36daa7a3..f16c7ce3bf3fc8ecdc0cad52d9ed403dfbcc6b67 100644 (file)
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1150,7 +1150,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);
        }