From: Laura Abbott lauraa@codeaurora.org
dma_alloc_from_contiguous takes number of pages for a size. Align up the dma size passed in to page size to avoid truncation and allocation failures on sizes less than PAGE_SIZE.
Cc: Will Deacon will.deacon@arm.com Signed-off-by: Laura Abbott lauraa@codeaurora.org Signed-off-by: Catalin Marinas catalin.marinas@arm.com (cherry picked from commit ccc9e244eb1b9654915634827322932cbafd8244) Signed-off-by: Alex Shi alex.shi@linaro.org --- arch/arm64/mm/dma-mapping.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index 7821d01..550873a 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -40,6 +40,7 @@ static void *__dma_alloc_coherent(struct device *dev, size_t size, if (IS_ENABLED(CONFIG_DMA_CMA)) { struct page *page;
+ size = PAGE_ALIGN(size); page = dma_alloc_from_contiguous(dev, size >> PAGE_SHIFT, get_order(size)); if (!page)