Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7c94823 authored by Tharun Kumar Merugu's avatar Tharun Kumar Merugu Committed by Gerrit - the friendly Code Review server
Browse files

msm: adsprpc: Skip CPU sync during map 



Do not flush the cache while mapping the dma buf. Also, update the
direction to TO_DEVICE while flushing the cache and to FROM_DEVICE
during invalidation.

Change-Id: Ifb187cfc466ff6f7859faabb424a0f38996a4192
Acked-by: default avatarVishnu Karthik D <vikarthi@qti.qualcomm.com>
Signed-off-by: default avatarTharun Kumar Merugu <mtharu@codeaurora.org>
parent a9c50a83

drivers/char/adsprpc.c

+14 −8
Original line number Diff line number Diff line
@@ -881,6 +881,12 @@ static int fastrpc_mmap_create(struct fastrpc_file *fl, int fd, 
				DMA_ATTR_SKIP_CPU_SYNC;

		else if (map->attr & FASTRPC_ATTR_COHERENT)

			map->attach->dma_map_attrs |= DMA_ATTR_FORCE_COHERENT;

		/*

		 * Skip CPU sync if IO Cohernecy is not supported

		 * as we flush later

		 */

		else if (!sess->smmu.coherent)

			map->attach->dma_map_attrs |= DMA_ATTR_SKIP_CPU_SYNC;



		VERIFY(err, !IS_ERR_OR_NULL(map->table =

			dma_buf_map_attachment(map->attach,
@@ -1618,9 +1624,9 @@ static int get_args(uint32_t kernel, struct smq_invoke_ctx *ctx) 
			ctx->overps[oix]->mstart) {

			if (map && map->buf) {

				dma_buf_begin_cpu_access(map->buf,

					DMA_BIDIRECTIONAL);

					DMA_TO_DEVICE);

				dma_buf_end_cpu_access(map->buf,

					DMA_BIDIRECTIONAL);

					DMA_TO_DEVICE);

			} else

				dmac_flush_range(uint64_to_ptr(rpra[i].buf.pv),

					uint64_to_ptr(rpra[i].buf.pv
@@ -1724,9 +1730,9 @@ static void inv_args_pre(struct smq_invoke_ctx *ctx) 
				uint64_to_ptr(rpra[i].buf.pv))) {

			if (map && map->buf) {

				dma_buf_begin_cpu_access(map->buf,

					DMA_BIDIRECTIONAL);

					DMA_TO_DEVICE);

				dma_buf_end_cpu_access(map->buf,

					DMA_BIDIRECTIONAL);

					DMA_TO_DEVICE);

			} else

				dmac_flush_range(

					uint64_to_ptr(rpra[i].buf.pv), (char *)
@@ -1738,9 +1744,9 @@ static void inv_args_pre(struct smq_invoke_ctx *ctx) 
		if (!IS_CACHE_ALIGNED(end)) {

			if (map && map->buf) {

				dma_buf_begin_cpu_access(map->buf,

					DMA_BIDIRECTIONAL);

					DMA_TO_DEVICE);

				dma_buf_end_cpu_access(map->buf,

					DMA_BIDIRECTIONAL);

					DMA_TO_DEVICE);

			} else

				dmac_flush_range((char *)end,

					(char *)end + 1);
@@ -1775,9 +1781,9 @@ static void inv_args(struct smq_invoke_ctx *ctx) 
		}

		if (map && map->buf) {

			dma_buf_begin_cpu_access(map->buf,

				DMA_BIDIRECTIONAL);

				DMA_FROM_DEVICE);

			dma_buf_end_cpu_access(map->buf,

				DMA_BIDIRECTIONAL);

				DMA_FROM_DEVICE);

		} else

			dmac_inv_range((char *)uint64_to_ptr(rpra[i].buf.pv),

				(char *)uint64_to_ptr(rpra[i].buf.pv