From b7b349c452ebbb07f26d563f5fc9c9583ea69486 Mon Sep 17 00:00:00 2001 From: Shiraz Hashim Date: Mon, 19 Mar 2018 20:02:23 +0530 Subject: [PATCH] arm: dma-mapping: DMA buf may not have cpu virtual addr DMA buffers may not have cpu virtual addresses when allocated using DMA_ATTR_NO_KERNEL_MAPPING attribute. Page address should therefore be looked up while searching for such dma bufs. Also fix the printk format specifier to '%pK' to print kernel pointers. Change-Id: I5754cde63ace19aed88624a36186d012309d475b Signed-off-by: Shiraz Hashim Signed-off-by: Charan Teja Reddy Signed-off-by: Vijayanand Jitta Signed-off-by: Qingqing Zhou --- arch/arm/mm/dma-mapping.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index dd76f6e85db3..7d1a39d51966 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -858,9 +858,10 @@ static void __arm_dma_free(struct device *dev, size_t size, void *cpu_addr, .page = page, .want_vaddr = ((attrs & DMA_ATTR_NO_KERNEL_MAPPING) == 0), }; + void *addr = (args.want_vaddr) ? cpu_addr : page; - buf = arm_dma_buffer_find(cpu_addr); - if (WARN(!buf, "Freeing invalid buffer %p\n", cpu_addr)) + buf = arm_dma_buffer_find(addr); + if (WARN(!buf, "Freeing invalid buffer %pK\n", addr)) return; buf->allocator->free(&args);