lkml.org 
[lkml]   [2014]   [Apr]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 7/7] ARM: dma: use phys_addr_t in __dma_page_[cpu_to_dev/dev_to_cpu]
    Date
    On a 32 bit ARM architecture with LPAE extension physical addresses
    cannot fit into unsigned long variable.

    So fix it by using phys_addr_t instead of unsigned long.

    Cc: Nicolas Pitre <nicolas.pitre@linaro.org>
    Cc: Russell King - ARM Linux <linux@arm.linux.org.uk>
    Cc: Catalin Marinas <catalin.marinas@arm.com>
    Cc: Will Deacon <will.deacon@arm.com>
    Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
    ---
    arch/arm/mm/dma-mapping.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
    index f62aa06..5260f43 100644
    --- a/arch/arm/mm/dma-mapping.c
    +++ b/arch/arm/mm/dma-mapping.c
    @@ -885,7 +885,7 @@ static void dma_cache_maint_page(struct page *page, unsigned long offset,
    static void __dma_page_cpu_to_dev(struct page *page, unsigned long off,
    size_t size, enum dma_data_direction dir)
    {
    - unsigned long paddr;
    + phys_addr_t paddr;

    dma_cache_maint_page(page, off, size, dir, dmac_map_area);

    @@ -901,7 +901,7 @@ static void __dma_page_cpu_to_dev(struct page *page, unsigned long off,
    static void __dma_page_dev_to_cpu(struct page *page, unsigned long off,
    size_t size, enum dma_data_direction dir)
    {
    - unsigned long paddr = page_to_phys(page) + off;
    + phys_addr_t paddr = page_to_phys(page) + off;

    /* FIXME: non-speculating: not required */
    /* don't bother invalidating if DMA to device */
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2014-04-24 18:21    [W:2.817 / U:0.520 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site