[PATCH v11 2/7] PCI: A fix for caculating bridge window's size and alignment
Bjorn Helgaas
bhelgaas at google.com
Tue Apr 18 07:36:39 AEST 2017
From: Yongji Xie <elohimes at gmail.com>
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(). This patch fixes this case.
Signed-off-by: Yongji Xie <elohimes at gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas at google.com>
---
drivers/pci/setup-bus.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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;
More information about the Linuxppc-dev
mailing list