Commit 0dc78f85 authored by Suzuki K. Poulose's avatar Suzuki K. Poulose Committed by Luis Henriques

arm64: Honor __GFP_ZERO in dma allocations

commit 7132813c upstream.

Current implementation doesn't zero out the pages allocated.
Honor the __GFP_ZERO flag and zero out if set.
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarSuzuki K. Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
[ luis: backported to 3.16: based on Suzuki's 3.14 backport ]
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent 0de30d00
...@@ -55,6 +55,7 @@ static void *__dma_alloc_coherent(struct device *dev, size_t size, ...@@ -55,6 +55,7 @@ static void *__dma_alloc_coherent(struct device *dev, size_t size,
flags |= GFP_DMA; flags |= GFP_DMA;
if (IS_ENABLED(CONFIG_DMA_CMA)) { if (IS_ENABLED(CONFIG_DMA_CMA)) {
struct page *page; struct page *page;
void *addr;
size = PAGE_ALIGN(size); size = PAGE_ALIGN(size);
page = dma_alloc_from_contiguous(dev, size >> PAGE_SHIFT, page = dma_alloc_from_contiguous(dev, size >> PAGE_SHIFT,
...@@ -63,7 +64,10 @@ static void *__dma_alloc_coherent(struct device *dev, size_t size, ...@@ -63,7 +64,10 @@ static void *__dma_alloc_coherent(struct device *dev, size_t size,
return NULL; return NULL;
*dma_handle = phys_to_dma(dev, page_to_phys(page)); *dma_handle = phys_to_dma(dev, page_to_phys(page));
return page_address(page); addr = page_address(page);
if (flags & __GFP_ZERO)
memset(addr, 0, size);
return addr;
} else { } else {
return swiotlb_alloc_coherent(dev, size, dma_handle, flags); return swiotlb_alloc_coherent(dev, size, dma_handle, flags);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment