From a73616916773e350edb7f483a14599cb8f722035 Mon Sep 17 00:00:00 2001 From: Anmolpreet Kaur Date: Wed, 8 Jul 2020 14:41:33 +0530 Subject: [PATCH] Move from dma_buf_kmap to dma_buf_vmap for ION Support for dma_buf_kmap() in ION on msm-5.4 will be removed soon. It will support dma_buf_vmap() in lieu of dma_buf_kmap(). Making changes for the same in qseecom driver. Change-Id: I4c2d6aaef58b41975279a01181c99cdeb18fb769 Signed-off-by: Anmolpreet Kaur --- drivers/misc/qseecom.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/misc/qseecom.c b/drivers/misc/qseecom.c index affe9ae11ea2..4f737d3b693a 100644 --- a/drivers/misc/qseecom.c +++ b/drivers/misc/qseecom.c @@ -1424,9 +1424,9 @@ static int qseecom_vaddr_map(int ion_fd, *sb_length = new_sgt->sgl->length; dma_buf_begin_cpu_access(new_dma_buf, DMA_BIDIRECTIONAL); - new_va = dma_buf_kmap(new_dma_buf, 0); - if (IS_ERR_OR_NULL(new_va)) { - pr_err("dma_buf_kmap failed\n"); + new_va = dma_buf_vmap(new_dma_buf); + if (!new_va) { + pr_err("dma_buf_vmap failed\n"); ret = -ENOMEM; goto err_unmap; } @@ -1450,7 +1450,7 @@ static void qseecom_vaddr_unmap(void *vaddr, struct sg_table *sgt, { if (!dmabuf || !vaddr || !sgt || !attach) return; - dma_buf_kunmap(dmabuf, 0, vaddr); + dma_buf_vunmap(dmabuf, vaddr); dma_buf_end_cpu_access(dmabuf, DMA_BIDIRECTIONAL); qseecom_dmabuf_unmap(sgt, attach, dmabuf); }