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

Commit 055b1183 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ADSPRPC: Invalidate output buffers after receiving response"

parents 2d8031ed c432b50a

drivers/char/adsprpc.c

+7 −11
Original line number Diff line number Diff line
@@ -1381,24 +1381,14 @@ static int fastrpc_internal_invoke(struct fastrpc_file *fl, uint32_t mode, 
			goto bail;

	}



	PERF(fl->profile, fl->perf.invargs,

	if (!fl->sctx->smmu.coherent) {

	if (!fl->sctx->smmu.coherent)

		inv_args_pre(ctx);

		if (mode == FASTRPC_MODE_SERIAL)

			inv_args(ctx);

	}

	PERF_END);



	PERF(fl->profile, fl->perf.link,

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

	PERF_END);



	if (err)

		goto bail;

	PERF(fl->profile, fl->perf.invargs,

	if (mode == FASTRPC_MODE_PARALLEL && !fl->sctx->smmu.coherent)

		inv_args(ctx);

	PERF_END);

 wait:

	if (kernel)

		wait_for_completion(&ctx->work);
@@ -1408,6 +1398,12 @@ static int fastrpc_internal_invoke(struct fastrpc_file *fl, uint32_t mode, 
		if (err)

			goto bail;

	}



	PERF(fl->profile, fl->perf.invargs,

	if (!fl->sctx->smmu.coherent)

		inv_args(ctx);

	PERF_END);



	VERIFY(err, 0 == (err = ctx->retval));

	if (err)

		goto bail;