Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b42282e5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

pci: fix PCI bus allocation alignment handling 



In commit 13583b16 ("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 c8adf9a3 ("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: default avatarRam Pai <linuxram@us.ibm.com>
Acked-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c44eaf41

drivers/pci/setup-bus.c

+2 −2
Original line number Diff line number Diff line
@@ -676,10 +676,10 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, 
			min_align = align1 >> 1;

		align += aligns[order];

	}

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

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

	size1 = !add_size ? size :

		calculate_memsize(size, min_size+add_size, 0,

				resource_size(b_res), align);

				resource_size(b_res), min_align);

	if (!size0 && !size1) {

		if (b_res->start || b_res->end)

			dev_info(&bus->self->dev, "disabling bridge window "