On Fri, 22 Aug 2008 11:43:35 +0400
Ilya Yanok <[EMAIL PROTECTED]> wrote:
> 1. total_memory should be phys_addr_t not unsigned long
> 2. is_power_of_2() works with u32 so I just inlined (size & (size-1)) != 0
> instead.
> Also this patch fixes default initialization: res->end should be 0x7fffffff
> not 0x80000000.
>
> Signed-off-by: Ilya Yanok <[EMAIL PROTECTED]>
Ben, any comments here? Looks right to me.
josh
> ---
> arch/powerpc/sysdev/ppc4xx_pci.c | 11 ++++++-----
> 1 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/arch/powerpc/sysdev/ppc4xx_pci.c
> b/arch/powerpc/sysdev/ppc4xx_pci.c
> index e1c7df9..645b2c9 100644
> --- a/arch/powerpc/sysdev/ppc4xx_pci.c
> +++ b/arch/powerpc/sysdev/ppc4xx_pci.c
> @@ -36,7 +36,7 @@
> static int dma_offset_set;
>
> /* Move that to a useable header */
> -extern unsigned long total_memory;
> +extern phys_addr_t total_memory;
>
> #define U64_TO_U32_LOW(val) ((u32)((val) & 0x00000000ffffffffULL))
> #define U64_TO_U32_HIGH(val) ((u32)((val) >> 32))
> @@ -105,7 +105,8 @@ static int __init ppc4xx_parse_dma_ranges(struct
> pci_controller *hose,
>
> /* Default */
> res->start = 0;
> - res->end = size = 0x80000000;
> + size = 0x80000000;
> + res->end = size - 1;
> res->flags = IORESOURCE_MEM | IORESOURCE_PREFETCH;
>
> /* Get dma-ranges property */
> @@ -167,13 +168,13 @@ static int __init ppc4xx_parse_dma_ranges(struct
> pci_controller *hose,
> */
> if (size < total_memory) {
> printk(KERN_ERR "%s: dma-ranges too small "
> - "(size=%llx total_memory=%lx)\n",
> - hose->dn->full_name, size, total_memory);
> + "(size=%llx total_memory=%llx)\n",
> + hose->dn->full_name, size, (u64)total_memory);
> return -ENXIO;
> }
>
> /* Check we are a power of 2 size and that base is a multiple of size*/
> - if (!is_power_of_2(size) ||
> + if ((size & (size - 1)) != 0 ||
> (res->start & (size - 1)) != 0) {
> printk(KERN_ERR "%s: dma-ranges unaligned\n",
> hose->dn->full_name);
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev
