If the bridge does not support 64bit pref mmio, we should still
keep align to be 2G as old time.
So add mmio64 mask checking, keep that 2G checking in the loop.
Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
---
drivers/pci/setup-bus.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
Index: linux-2.6/drivers/pci/setup-bus.c
===================================================================
--- linux-2.6.orig/drivers/pci/setup-bus.c
+++ linux-2.6/drivers/pci/setup-bus.c
@@ -930,10 +930,17 @@ static int pbus_size_mem(struct pci_bus
struct resource *b_res = find_free_bus_resource(bus,
mask | IORESOURCE_PREFETCH, type);
resource_size_t children_add_size = 0;
+ unsigned int mem64_mask;
if (!b_res)
return -ENOSPC;
+ mem64_mask = b_res->flags & IORESOURCE_MEM_64;
+
+ /* kernel does not support 64bit res */
+ if (sizeof(resource_size_t) == 4)
+ mem64_mask &= ~IORESOURCE_MEM_64;
+
memset(aligns, 0, sizeof(aligns));
max_order = 0;
size = 0;
@@ -970,12 +977,14 @@ static int pbus_size_mem(struct pci_bus
order = __ffs(align) - 20;
if (order < 0)
order = 0;
- if (order >= ARRAY_SIZE(aligns)) {
+ if (order >= ARRAY_SIZE(aligns) ||
+ (!mem64_mask && order > 11 /* 2Gb */)) {
dev_warn(&dev->dev, "disabling BAR %d: %pR (bad alignment %#llx)\n",
i, r, (unsigned long long) align);
r->flags = 0;
continue;
}
+
size += r_size;
/* Exclude ranges with size > align from
calculation of the alignment. */
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
