Skip to content

Commit 372e387

Browse files
ij-intelgregkh
authored andcommitted
PCI: Remove add_align overwrite unrelated to size0
[ Upstream commit d06cc1e ] Commit 566f1dd ("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: 566f1dd ("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>
1 parent 254f771 commit 372e387

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

drivers/pci/setup-bus.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1150,7 +1150,6 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
11501150
min_align = 1ULL << (max_order + __ffs(SZ_1M));
11511151
min_align = max(min_align, win_align);
11521152
size0 = calculate_memsize(size, min_size, 0, 0, resource_size(b_res), win_align);
1153-
add_align = win_align;
11541153
pci_info(bus->self, "bridge window %pR to %pR requires relaxed alignment rules\n",
11551154
b_res, &bus->busn_res);
11561155
}

0 commit comments

Comments
 (0)