Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
pci: fix PCI bus allocation alignment handling
In commit 13583b16592a ("PCI: refactor io size calculation code") Ram
had a thinko in the refactorization of the code: the end result used the
variable 'align' for the bus alignment, but the original code used
'min_align'.
Since then, another use of that 'align' variable got introduced by
commit c8adf9a3e873 ("PCI: pre-allocate additional resources to devices
only after successful allocation of essential resources.")
Fix both of those uses to use 'min_align' as they should.
Daniel Hellstrom <daniel@gaisler.com>
Acked-by: Ram Pai <linuxram@us.ibm.com>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+2
-2
+2
-2
drivers/pci/setup-bus.c
+2
-2
drivers/pci/setup-bus.c
···
676
676
min_align = align1 >> 1;
677
677
align += aligns[order];
678
678
}
679
-
size0 = calculate_memsize(size, min_size, 0, resource_size(b_res), align);
679
+
size0 = calculate_memsize(size, min_size, 0, resource_size(b_res), min_align);
680
680
size1 = !add_size ? size :
681
681
calculate_memsize(size, min_size+add_size, 0,
682
-
resource_size(b_res), align);
682
+
resource_size(b_res), min_align);
683
683
if (!size0 && !size1) {
684
684
if (b_res->start || b_res->end)
685
685
dev_info(&bus->self->dev, "disabling bridge window "