mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-08 12:58:12 -04:00
dma-mapping-fast: Align memory allocation to dma_alloc_attrs expectations
On newer kernels, memory allocated by dma_alloc_attrs() is expected to be zeroed out upon allocation. The allocation paths in fastmap do not currently account for this new requirement, so update them to zero out memory, unless the client explicitly asks for memory to not be zeroed out. Change-Id: I5c7fa81ab4b8fa98890036082883769ab12443c6 Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
This commit is contained in:
parent
4c93b2bdf0
commit
4bb0643878
1 changed files with 4 additions and 0 deletions
|
|
@ -643,6 +643,7 @@ static void *__fast_smmu_alloc_contiguous(struct device *dev, size_t size,
|
|||
coherent_addr = page_address(page);
|
||||
}
|
||||
|
||||
memset(coherent_addr, 0, size);
|
||||
*handle = iova;
|
||||
return coherent_addr;
|
||||
|
||||
|
|
@ -681,6 +682,9 @@ static void *fast_smmu_alloc(struct device *dev, size_t size,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
if (!(attrs & DMA_ATTR_SKIP_ZEROING))
|
||||
gfp |= __GFP_ZERO;
|
||||
|
||||
*handle = DMA_ERROR_CODE;
|
||||
size = ALIGN(size, SZ_4K);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue