From: Yongji Xie <elohimes@gmail.com>
Date: Mon, 10 Apr 2017 11:58:11 +0000 (+0800)
Subject: PCI: Fix calculation of bridge window's size and alignment
X-Git-Tag: v4.12-rc1~65^2~3^2~5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c9c75143a5962c4c26d2f2c99b7a6e06f421f5e1;p=karo-tx-linux.git

PCI: Fix calculation of bridge window's size and alignment

In case that one device's alignment is greater than its size, we may
get an incorrect size and alignment for its bus's memory window in
pbus_size_mem().  Fix this case.

Signed-off-by: Yongji Xie <elohimes@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index cb389277df41..958da7db9033 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1066,10 +1066,10 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
 				r->flags = 0;
 				continue;
 			}
-			size += r_size;
+			size += max(r_size, align);
 			/* Exclude ranges with size > align from
 			   calculation of the alignment. */
-			if (r_size == align)
+			if (r_size <= align)
 				aligns[order] += align;
 			if (order > max_order)
 				max_order = order;