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

Commit 3ad94b0d authored by Wei Yang's avatar Wei Yang Committed by Bjorn Helgaas
Browse files

PCI: Pass type, width, and prefetchability for window alignment 



When calculating window_alignment(), type information like IORESOURCE_MEM
and IORESOURCE_PREFETCH may not be enough.  For example, on powernv, we
need to know whether the window is 64-bit or not.

This patch passes the full resource type (res->flags) for window alignment.

[bhelgaas: changelog]
Signed-off-by: default avatarWei Yang <weiyang@linux.vnet.ibm.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarGavin Shan <shangw@linux.vnet.ibm.com>
parent 77a0dfcd

drivers/pci/setup-bus.c

+1 −1
Original line number Diff line number Diff line
@@ -982,7 +982,7 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, 
	}



	min_align = calculate_mem_align(aligns, max_order);

	min_align = max(min_align, window_alignment(bus, b_res->flags & mask));

	min_align = max(min_align, window_alignment(bus, b_res->flags));

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

	if (children_add_size > add_size)

		add_size = children_add_size;