From: Kumar Gala <galak@kernel.crashing.org>
Date: Wed, 5 Aug 2009 14:03:54 +0000 (-0500)
Subject: fdt: Fix fdt_pci_dma_ranges handling of 64-bit ranges
X-Git-Tag: v2009.08-rc2~10
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cfd700be9f5ed289fd57a9bd61e266319badcb0d;p=oweals%2Fu-boot.git

fdt: Fix fdt_pci_dma_ranges handling of 64-bit ranges

If the size of a region equal to 4G it can't be represnted in a 32-bit
BAR so we should have marked that case as MEM64.

Additionally bump the number of inbound windows up to 4 to handle the
fact that Freescale PPCs that have an implicit window for CCSRBAR.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---

diff --git a/common/fdt_support.c b/common/fdt_support.c
index fc077e8292..89164a12d7 100644
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -625,7 +625,7 @@ int fdt_resize(void *blob)
 }
 
 #ifdef CONFIG_PCI
-#define CONFIG_SYS_PCI_NR_INBOUND_WIN 3
+#define CONFIG_SYS_PCI_NR_INBOUND_WIN 4
 
 #define FDT_PCI_PREFETCH	(0x40000000)
 #define FDT_PCI_MEM32		(0x02000000)
@@ -655,7 +655,7 @@ int fdt_pci_dma_ranges(void *blob, int phb_off, struct pci_controller *hose) {
 		size = (u64)hose->regions[r].size;
 
 		dma_range[0] = 0;
-		if (size > 0x100000000ull)
+		if (size >= 0x100000000ull)
 			dma_range[0] |= FDT_PCI_MEM64;
 		else
 			dma_range[0] |= FDT_PCI_MEM32;