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

Commit 462d9303 authored by Gavin Shan's avatar Gavin Shan Committed by Bjorn Helgaas
Browse files

PCI: Align P2P windows using pcibios_window_alignment() 



This patch changes pbus_size_io() and pbus_size_mem() to do window (I/O,
memory and prefetchable memory) reassignment based on the minimal
alignments for the P2P bridge, which was retrieved by window_alignment().

[bhelgaas: changelog]
Signed-off-by: default avatarGavin Shan <shangw@linux.vnet.ibm.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent ac5ad93e

drivers/pci/setup-bus.c

+6 −9
Original line number Diff line number Diff line
@@ -749,17 +749,12 @@ static void pbus_size_io(struct pci_bus *bus, resource_size_t min_size, 
	struct resource *b_res = find_free_bus_resource(bus, IORESOURCE_IO);

	unsigned long size = 0, size0 = 0, size1 = 0;

	resource_size_t children_add_size = 0;

	resource_size_t min_align = 4096, align;

	resource_size_t min_align, io_align, align;



	if (!b_res)

 		return;



	/*

	 * Per spec, I/O windows are 4K-aligned, but some bridges have an

	 * extension to support 1K alignment.

	 */

	if (bus->self->io_window_1k)

		min_align = 1024;

	io_align = min_align = window_alignment(bus, IORESOURCE_IO);

	list_for_each_entry(dev, &bus->devices, bus_list) {

		int i;
@@ -786,8 +781,8 @@ static void pbus_size_io(struct pci_bus *bus, resource_size_t min_size, 
		}

	}



	if (min_align > 4096)

		min_align = 4096;

	if (min_align > io_align)

		min_align = io_align;



	size0 = calculate_iosize(size, min_size, size1,

			resource_size(b_res), min_align);
@@ -909,6 +904,8 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, 
			min_align = align1 >> 1;

		align += aligns[order];

	}



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

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

	if (children_add_size > add_size)

		add_size = children_add_size;