Commit 552bc94e authored May 28, 2015 by Yinghai Lu Committed by Bjorn Helgaas Jun 01, 2015

PCI: Preserve resource size during alignment reordering



In d74b9027 ("PCI: Consider additional PF's IOV BAR alignment in sizing
and assigning"), we store additional alignment in realloc_head and take
this into consideration for assignment.

In __assign_resources_sorted(), we changed dev_res->res->start, then used
resource_start() (which depends on res->start), so the recomputed res->end
was completely bogus.  Even if we'd had the correct size, the end would
have been off by one.

Preserve the resource size when we adjust its alignment.

[bhelgaas: changelog]
Fixes: d74b9027 ("PCI: Consider additional PF's IOV BAR alignment in sizing and assigning")
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Wei Yang <weiyang@linux.vnet.ibm.com>
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>

parent a6b65983

drivers/pci/setup-bus.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -428,9 +428,10 @@ static void __assign_resources_sorted(struct list_head *head,
		* consistent.
		*/
		if (add_align > dev_res->res->start) {
		resource_size_t r_size = resource_size(dev_res->res);

		dev_res->res->start = add_align;
		dev_res->res->end = add_align +
		resource_size(dev_res->res);
		dev_res->res->end = add_align + r_size - 1;

		list_for_each_entry(dev_res2, head, list) {
		align = pci_resource_alignment(dev_res2->dev,