[U-Boot] [PATCH] fdt: Fix fdt_pci_dma_ranges handling of 64-bit ranges

[U-Boot] [PATCH] fdt: Fix fdt_pci_dma_ranges handling of 64-bit ranges

[Kumar Gala]

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>
---
 common/fdt_support.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/fdt_support.c b/common/fdt_support.c
index fc077e8..89164a1 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;
-- 
1.6.0.6

[U-Boot] [PATCH] fdt: Fix fdt_pci_dma_ranges handling of 64-bit ranges

[Kumar Gala]

On Aug 5, 2009, at 9:03 AM, Kumar Gala wrote:

> 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>
> ---
> common/fdt_support.c |    4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)

Can you look at picking this up as a fix for v2009.08.  Its a pretty  
trivial change.

- k

>
> diff --git a/common/fdt_support.c b/common/fdt_support.c
> index fc077e8..89164a1 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;
> -- 
> 1.6.0.6
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH] fdt: Fix fdt_pci_dma_ranges handling of 64-bit ranges

[Wolfgang Denk]

Dear Kumar Gala,

In message <1249481034-21936-1-git-send-email-galak@kernel.crashing.org> you wrote:
> 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>
> ---
>  common/fdt_support.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)

Applied, thanks.

Hope this is OK, Jerry.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
A conservative is a man with two perfectly good legs  who  has  never
learned to walk.                              - Franklin D. Roosevelt

[U-Boot] [PATCH] fdt: Fix fdt_pci_dma_ranges handling of 64-bit ranges

[Jerry Van Baren]

Wolfgang Denk wrote:
> Dear Kumar Gala,
> 
> In message <1249481034-21936-1-git-send-email-galak@kernel.crashing.org> you wrote:
>> 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>
>> ---
>>  common/fdt_support.c |    4 ++--
>>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> Applied, thanks.
> 
> Hope this is OK, Jerry.
> 
> Best regards,
> 
> Wolfgang Denk

Yes, no problem.  It is only peripherally related to fdt (fdt is the 
mechanism used, the logic is Kumar's bailiwick).

gvb