Merge "msm: ADSPRPC: Handle Glink Rx Ack Properly" (3136c3ea) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/char/adsprpc.c

+7 −3

Original line number	Diff line number	Diff line
		@@ -2093,8 +2093,6 @@ static int fastrpc_internal_invoke(struct fastrpc_file *fl, uint32_t mode,
		if (err)
		goto bail;
		}
		if (ctx->handle)
		glink_rx_done(ctx->handle, ctx->ptr, true);
		PERF(fl->profile, GET_COUNTER(perf_counter, PERF_INVARGS),
		if (!fl->sctx->smmu.coherent)
		inv_args(ctx);
		@@ -2110,6 +2108,10 @@ static int fastrpc_internal_invoke(struct fastrpc_file *fl, uint32_t mode,
		if (err)
		goto bail;
		bail:
		if (ctx->handle) {
		glink_rx_done(ctx->handle, ctx->ptr, true);
		ctx->handle = NULL;
		}
		if (ctx && interrupted == -ERESTARTSYS)
		context_save_interrupted(ctx);
		else if (ctx)
		@@ -2958,9 +2960,11 @@ static void fastrpc_glink_notify_rx(void handle, const void priv,

		context_notify_user(me->ctxtable[index], rsp->retval);
		bail:
		if (err)
		if (err) {
		glink_rx_done(handle, ptr, true);
		pr_err("adsprpc: invalid response or context\n");
		}
		}

		static void fastrpc_glink_notify_state(void handle, const void priv,
		unsigned int event)