If sizeof(long) is 4 bytes but sizeof(phys_addr_t) is 8 bytes, don't
fail to configure a bridge for PCI prefetchable memory space that
extends beyond 4GB. The problem was encountered on an embedded system
using a Freescale MPC8536 PowerPC processor. The problem is possible
on x86-32 systems with PAE, although it has not been observed in the
wild.
This patch preserves the current behavior for any oddball systems on
which sizeof(long) is 8 bytes and sizeof(phys_addr_t) is 4 bytes.
Signed-off-by: Andrew Klossner <andrew@xxxxxxxxxxxxxxxxxxx>
---
drivers/pci/probe.c | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 795c902..1385bd3 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -316,7 +316,11 @@ static void __devinit pci_read_bridge_mmio_pref(struct pci_bus *child)
{
struct pci_dev *dev = child->self;
u16 mem_base_lo, mem_limit_lo;
+#if defined CONFIG_PHYS_ADDR_T_64BIT & BITS_PER_LONG != 64
+ phys_addr_t base, limit;
+#else
unsigned long base, limit;
+#endif
struct resource *res;
res = child->resource[2];
@@ -339,6 +343,9 @@ static void __devinit pci_read_bridge_mmio_pref(struct pci_bus *child)
#if BITS_PER_LONG == 64
base |= ((long) mem_base_hi) << 32;
limit |= ((long) mem_limit_hi) << 32;
+#elif defined CONFIG_PHYS_ADDR_T_64BIT
+ base |= ((phys_addr_t) mem_base_hi) << 32;
+ limit |= ((phys_addr_t) mem_limit_hi) << 32;
#else
if (mem_base_hi || mem_limit_hi) {
dev_err(&dev->dev, "can't handle 64-bit "
--
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
