Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2161c248 authored by Santosh Shilimkar's avatar Santosh Shilimkar
Browse files

ARM: dma: use phys_addr_t in __dma_page_[cpu_to_dev/dev_to_cpu] 



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>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
parent 812b99e4

arch/arm/mm/dma-mapping.c

+2 −2
Original line number Diff line number Diff line
@@ -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 */