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

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

msm: ADSPRPC: Use msm_ion_do_cache_op to flush userspace buffers 



Remove the use of dmac_flush_range for userspace buffers and add
msm_ion_do_cache_op for flushing user space buffers.

Change-Id: Ice73eafac840bd1cabee0a2bfc8a641832a7d0c8
Acked-by: default avatarBharath Kumar <bkumar@qti.qualcomm.com>
Signed-off-by: default avatarTharun Kumar Merugu <mtharu@codeaurora.org>
parent 028be1cf

drivers/char/adsprpc.c

+44 −16
Original line number Diff line number Diff line
@@ -1108,9 +1108,18 @@ static int get_args(uint32_t kernel, struct smq_invoke_ctx *ctx) 
		struct fastrpc_mmap *map = ctx->maps[i];

		if (map && map->uncached)

			continue;

		if (rpra[i].buf.len && ctx->overps[oix]->mstart)

		if (rpra[i].buf.len && ctx->overps[oix]->mstart) {

			if (map && map->handle)

				msm_ion_do_cache_op(ctx->fl->apps->client,

					map->handle,

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

					rpra[i].buf.len,

					ION_IOC_CLEAN_INV_CACHES);

			else

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

			uint64_to_ptr(rpra[i].buf.pv + rpra[i].buf.len));

					uint64_to_ptr(rpra[i].buf.pv

						+ rpra[i].buf.len));

		}

	}

	inh = inbufs + outbufs;

	for (i = 0; i < REMOTE_SCALARS_INHANDLES(sc); i++) {
@@ -1118,7 +1127,7 @@ static int get_args(uint32_t kernel, struct smq_invoke_ctx *ctx) 
		rpra[inh + i].buf.len = ctx->lpra[inh + i].buf.len;

		rpra[inh + i].h = ctx->lpra[inh + i].h;

	}

	dmac_flush_range((char *)rpra, (char *)rpra + ctx->used);



 bail:

	return err;

}
@@ -1157,36 +1166,57 @@ static int put_args(uint32_t kernel, struct smq_invoke_ctx *ctx, 
	return err;

}



static void inv_args_pre(uint32_t sc, remote_arg64_t *rpra)

static void inv_args_pre(struct smq_invoke_ctx *ctx)

{

	int i, inbufs, outbufs;

	uint32_t sc = ctx->sc;

	remote_arg64_t *rpra = ctx->rpra;

	uintptr_t end;



	inbufs = REMOTE_SCALARS_INBUFS(sc);

	outbufs = REMOTE_SCALARS_OUTBUFS(sc);

	for (i = inbufs; i < inbufs + outbufs; ++i) {

		struct fastrpc_mmap *map = ctx->maps[i];



		if (!rpra[i].buf.len)

			continue;

		if (buf_page_start(ptr_to_uint64((void *)rpra)) ==

				buf_page_start(rpra[i].buf.pv))

			continue;

		if (!IS_CACHE_ALIGNED((uintptr_t)uint64_to_ptr(rpra[i].buf.pv)))

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

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

		if (!IS_CACHE_ALIGNED((uintptr_t)

				uint64_to_ptr(rpra[i].buf.pv))) {

			if (map && map->handle)

				msm_ion_do_cache_op(ctx->fl->apps->client,

					map->handle,

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

					sizeof(uintptr_t),

					ION_IOC_CLEAN_INV_CACHES);

			else

				dmac_flush_range(

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

					uint64_to_ptr(rpra[i].buf.pv + 1));

		}

		end = (uintptr_t)uint64_to_ptr(rpra[i].buf.pv +

							rpra[i].buf.len);

		if (!IS_CACHE_ALIGNED(end))

		if (!IS_CACHE_ALIGNED(end)) {

			if (map && map->handle)

				msm_ion_do_cache_op(ctx->fl->apps->client,

						map->handle,

						uint64_to_ptr(end),

						sizeof(uintptr_t),

						ION_IOC_CLEAN_INV_CACHES);

			else

				dmac_flush_range((char *)end,

					(char *)end + 1);

		}

	}

}



static void inv_args(struct smq_invoke_ctx *ctx)

{

	int i, inbufs, outbufs;

	uint32_t sc = ctx->sc;

	remote_arg64_t *rpra = ctx->rpra;

	int used = ctx->used;

	int inv = 0;



	inbufs = REMOTE_SCALARS_INBUFS(sc);
@@ -1204,7 +1234,7 @@ static void inv_args(struct smq_invoke_ctx *ctx) 
		}

		if (map && map->handle)

			msm_ion_do_cache_op(ctx->fl->apps->client, map->handle,

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

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

				rpra[i].buf.len, ION_IOC_INV_CACHES);

		else

			dmac_inv_range((char *)uint64_to_ptr(rpra[i].buf.pv),
@@ -1212,8 +1242,6 @@ static void inv_args(struct smq_invoke_ctx *ctx) 
						 + rpra[i].buf.len));

	}



	if (inv || REMOTE_SCALARS_OUTHANDLES(sc))

		dmac_inv_range(rpra, (char *)rpra + used);

}



static int fastrpc_invoke_send(struct smq_invoke_ctx *ctx,
@@ -1342,7 +1370,7 @@ static int fastrpc_internal_invoke(struct fastrpc_file *fl, uint32_t mode, 
			goto bail;

	}



	inv_args_pre(ctx->sc, ctx->rpra);

	inv_args_pre(ctx);

	if (FASTRPC_MODE_SERIAL == mode)

		inv_args(ctx);

	VERIFY(err, 0 == fastrpc_invoke_send(ctx, kernel, invoke->handle));