PCI: Preserve resource size during alignment reordering

552bc94e · Yinghai Lu <[email protected]> · 2015-05-28 22:40:00 -07:00

In d74b9027a4da ("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: d74b9027a4da ("PCI: Consider additional PF's IOV BAR alignment in sizing and assigning")
Signed-off-by: Yinghai Lu <[email protected]>
Signed-off-by: Bjorn Helgaas <[email protected]>
Acked-by: Wei Yang <[email protected]>
CC: Benjamin Herrenschmidt <[email protected]>

Commit: 552bc94ebeeb189d0ac682dae95cf05e6b72d7fd
Parents: a6b65983

Changes

1 files changed · +3 −2

File	Status	Add	Del	Content
drivers/pci/setup-bus.c	modified	+3	−2	View file

drivers/pci/setup-bus.c

View file

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index aa281d9..508cc56 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -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,