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

Commit cbb47b18 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: adsprpc: add traces for context allocation, free and complete"

parents da7d60cf bbf92678

drivers/char/adsprpc.c

+24 −24
Original line number Diff line number Diff line
@@ -1380,7 +1380,8 @@ static int context_alloc(struct fastrpc_file *fl, uint32_t kernel, 
		pr_err("adsprpc: out of context memory\n");

		goto bail;

	}



	trace_fastrpc_context_alloc((uint64_t)ctx,

		ctx->ctxid | fl->pd, ctx->handle, ctx->sc);

	*po = ctx;

bail:

	if (ctx && err)
@@ -1424,7 +1425,8 @@ static void context_free(struct smq_invoke_ctx *ctx) 
		}

	}

	spin_unlock(&me->ctxlock);



	trace_fastrpc_context_free((uint64_t)ctx,

		ctx->msg.invoke.header.ctx, ctx->handle, ctx->sc);

	kfree(ctx);

}
@@ -1455,6 +1457,8 @@ static void context_notify_user(struct smq_invoke_ctx *ctx, 
	}

	ctx->rspFlags = (enum fastrpc_response_flags)rspFlags;

	fastrpc_pm_awake(ctx->fl->wake_enable, &ctx->pm_awake_voted);

	trace_fastrpc_context_complete(ctx->fl->cid, (uint64_t)ctx, retval,

		ctx->msg.invoke.header.ctx, ctx->handle, ctx->sc);

	complete(&ctx->work);

}
@@ -2022,7 +2026,7 @@ static int fastrpc_invoke_send(struct smq_invoke_ctx *ctx, 
		goto bail;

	}

	err = rpmsg_send(channel_ctx->rpdev->ept, (void *)msg, sizeof(*msg));

	trace_fastrpc_rpmsg_send(channel_ctx->subsys, msg->invoke.header.ctx,

	trace_fastrpc_rpmsg_send(fl->cid, (uint64_t)ctx, msg->invoke.header.ctx,

		handle, ctx->sc, msg->invoke.page.addr, msg->invoke.page.size);

	LOG_FASTRPC_GLINK_MSG(channel_ctx->ipc_log_ctx,

		"sent pkt %pK (sz %d): ctx 0x%llx, handle 0x%x, sc 0x%x (rpmsg err %d)",
@@ -2222,7 +2226,7 @@ static int fastrpc_internal_invoke(struct fastrpc_file *fl, uint32_t mode, 
		if (err)

			goto bail;

		if (ctx) {

			trace_fastrpc_context_restore(gcinfo[cid].subsys,

			trace_fastrpc_context_restore(cid, (uint64_t)ctx,

				ctx->msg.invoke.header.ctx,

				ctx->handle, ctx->sc);

			goto wait;
@@ -2285,7 +2289,7 @@ static int fastrpc_internal_invoke(struct fastrpc_file *fl, uint32_t mode, 
		goto bail;

 bail:

	if (ctx && interrupted == -ERESTARTSYS) {

		trace_fastrpc_context_interrupt(gcinfo[cid].subsys,

		trace_fastrpc_context_interrupt(cid, (uint64_t)ctx,

			ctx->msg.invoke.header.ctx, ctx->handle, ctx->sc);

		context_save_interrupted(ctx);

	}
@@ -3370,10 +3374,7 @@ static int fastrpc_rpmsg_callback(struct rpmsg_device *rpdev, void *data, 
	struct smq_invoke_rspv2 *rspv2 = NULL;

	struct fastrpc_apps *me = &gfa;

	uint32_t index, rspFlags = 0, earlyWakeTime = 0;

	int err = 0;

#if IS_ENABLED(CONFIG_ADSPRPC_DEBUG)

	int cid = -1;

#endif

	int err = 0, cid = -1;



	VERIFY(err, (rsp && len >= sizeof(*rsp)));

	if (err)
@@ -3386,11 +3387,10 @@ static int fastrpc_rpmsg_callback(struct rpmsg_device *rpdev, void *data, 
		earlyWakeTime = rspv2->earlyWakeTime;

		rspFlags = rspv2->flags;

	}

	if (!IS_ERR_OR_NULL(rpdev))

		trace_fastrpc_rpmsg_response(rpdev->dev.parent->of_node->name,

			rsp->ctx, rsp->retval, rspFlags, earlyWakeTime);

#if IS_ENABLED(CONFIG_ADSPRPC_DEBUG)

	cid = get_cid_from_rpdev(rpdev);

	trace_fastrpc_rpmsg_response(cid, rsp->ctx,

		rsp->retval, rspFlags, earlyWakeTime);

#if IS_ENABLED(CONFIG_ADSPRPC_DEBUG)

	if (cid >= 0 && cid < NUM_CHANNELS) {

		LOG_FASTRPC_GLINK_MSG(gcinfo[cid].ipc_log_ctx,

		"recvd pkt %pK (sz %d): ctx 0x%llx, retVal %d, flags %u, earlyWake %u",
@@ -4283,7 +4283,7 @@ static int fastrpc_restart_notifier_cb(struct notifier_block *nb, 
	ctx = container_of(nb, struct fastrpc_channel_ctx, nb);

	cid = ctx - &me->channel[0];

	if (code == SUBSYS_BEFORE_SHUTDOWN) {

		pr_debug("adsprpc: %s: %s subsystem is restarting\n",

		pr_info("adsprpc: %s: %s subsystem is restarting\n",

			__func__, gcinfo[cid].subsys);

		mutex_lock(&me->channel[cid].smd_mutex);

		ctx->ssrcount++;
@@ -4298,10 +4298,10 @@ static int fastrpc_restart_notifier_cb(struct notifier_block *nb, 
				me->channel[RH_CID].ramdumpenabled = 1;

			}

		}

		pr_debug("adsprpc: %s: received RAMDUMP notification for %s\n",

		pr_info("adsprpc: %s: received RAMDUMP notification for %s\n",

			__func__, gcinfo[cid].subsys);

	} else if (code == SUBSYS_AFTER_POWERUP) {

		pr_debug("adsprpc: %s: %s subsystem is up\n",

		pr_info("adsprpc: %s: %s subsystem is up\n",

			__func__, gcinfo[cid].subsys);

		ctx->issubsystemup = 1;

	}
@@ -4318,7 +4318,7 @@ static int fastrpc_pdr_notifier_cb(struct notifier_block *pdrnb, 


	spd = container_of(pdrnb, struct fastrpc_static_pd, pdrnb);

	if (code == SERVREG_NOTIF_SERVICE_STATE_DOWN_V01) {

		pr_debug("adsprpc: %s: %s (%s) is down for PDR on %s\n",

		pr_info("adsprpc: %s: %s (%s) is down for PDR on %s\n",

			__func__, spd->spdname, spd->servloc_name,

			gcinfo[spd->cid].subsys);

		mutex_lock(&me->channel[spd->cid].smd_mutex);
@@ -4336,11 +4336,11 @@ static int fastrpc_pdr_notifier_cb(struct notifier_block *pdrnb, 
				me->channel[RH_CID].ramdumpenabled = 1;

			}

		}

		pr_debug("adsprpc: %s: received %s RAMDUMP notification for %s (%s)\n",

		pr_info("adsprpc: %s: received %s RAMDUMP notification for %s (%s)\n",

			__func__, gcinfo[spd->cid].subsys,

			spd->spdname, spd->servloc_name);

	} else if (code == SERVREG_NOTIF_SERVICE_STATE_UP_V01) {

		pr_debug("adsprpc: %s: %s (%s) is up on %s\n",

		pr_info("adsprpc: %s: %s (%s) is up on %s\n",

			__func__, spd->spdname, spd->servloc_name,

			gcinfo[spd->cid].subsys);

		spd->ispdup = 1;
@@ -4406,12 +4406,12 @@ static int fastrpc_get_service_location_notify(struct notifier_block *nb, 
	}



	if (curr_state == SERVREG_NOTIF_SERVICE_STATE_UP_V01) {

		pr_debug("adsprpc: %s: %s (%s) PDR service for %s is up\n",

		pr_info("adsprpc: %s: %s (%s) PDR service for %s is up\n",

			__func__, spd->servloc_name, pdr->domain_list[i].name,

			gcinfo[spd->cid].subsys);

		spd->ispdup = 1;

	} else if (curr_state == SERVREG_NOTIF_SERVICE_STATE_UNINIT_V01) {

		pr_debug("adsprpc: %s: %s (%s) PDR service for %s is uninitialized\n",

		pr_info("adsprpc: %s: %s (%s) PDR service for %s is uninitialized\n",

			__func__, spd->servloc_name, pdr->domain_list[i].name,

			gcinfo[spd->cid].subsys);

	}
@@ -4670,7 +4670,7 @@ static int fastrpc_probe(struct platform_device *pdev) 
				__func__, ret, AUDIO_PDR_ADSP_SERVICE_NAME,

				AUDIO_PDR_SERVICE_LOCATION_CLIENT_NAME);

		else

			pr_debug("adsprpc: %s: service location enabled for %s (%s)\n",

			pr_info("adsprpc: %s: service location enabled for %s (%s)\n",

				__func__, AUDIO_PDR_ADSP_SERVICE_NAME,

				AUDIO_PDR_SERVICE_LOCATION_CLIENT_NAME);

	}
@@ -4691,7 +4691,7 @@ static int fastrpc_probe(struct platform_device *pdev) 
				__func__, ret, SENSORS_PDR_SLPI_SERVICE_NAME,

				SENSORS_PDR_ADSP_SERVICE_LOCATION_CLIENT_NAME);

		else

			pr_debug("adsprpc: %s: service location enabled for %s (%s)\n",

			pr_info("adsprpc: %s: service location enabled for %s (%s)\n",

				__func__, SENSORS_PDR_SLPI_SERVICE_NAME,

				SENSORS_PDR_ADSP_SERVICE_LOCATION_CLIENT_NAME);

	}
@@ -4712,7 +4712,7 @@ static int fastrpc_probe(struct platform_device *pdev) 
				__func__, ret, SENSORS_PDR_SLPI_SERVICE_NAME,

				SENSORS_PDR_SLPI_SERVICE_LOCATION_CLIENT_NAME);

		else

			pr_debug("adsprpc: %s: service location enabled for %s (%s)\n",

			pr_info("adsprpc: %s: service location enabled for %s (%s)\n",

				__func__, SENSORS_PDR_SLPI_SERVICE_NAME,

				SENSORS_PDR_SLPI_SERVICE_LOCATION_CLIENT_NAME);

	}

include/trace/events/fastrpc.h

+115 −24
Original line number Diff line number Diff line
@@ -12,13 +12,15 @@ 


TRACE_EVENT(fastrpc_rpmsg_send,



	TP_PROTO(char *subsys, uint64_t ctx, uint32_t handle,

	TP_PROTO(int cid, uint64_t smq_ctx,

		uint64_t ctx, uint32_t handle,

		uint32_t sc, uint64_t addr, uint64_t size),



	TP_ARGS(subsys, ctx, handle, sc, addr, size),

	TP_ARGS(cid, smq_ctx, ctx, handle, sc, addr, size),



	TP_STRUCT__entry(

		__string(subsys, subsys)

		__field(int, cid)

		__field(uint64_t, smq_ctx)

		__field(uint64_t, ctx)

		__field(uint32_t, handle)

		__field(uint32_t, sc)
@@ -27,7 +29,8 @@ TRACE_EVENT(fastrpc_rpmsg_send, 
	),



	TP_fast_assign(

		__assign_str(subsys, subsys);

		__entry->cid = cid;

		__entry->smq_ctx = smq_ctx;

		__entry->ctx = ctx;

		__entry->handle = handle;

		__entry->sc = sc;
@@ -35,20 +38,20 @@ TRACE_EVENT(fastrpc_rpmsg_send, 
		__entry->size = size;

	),



	TP_printk("to %s: ctx 0x%llx, handle 0x%x, sc 0x%x, addr 0x%llx, size %llu",

		__get_str(subsys), __entry->ctx, __entry->handle,

	TP_printk("to cid %d: smq_ctx 0x%llx, ctx 0x%llx, handle 0x%x, sc 0x%x, addr 0x%llx, size %llu",

		__entry->cid, __entry->smq_ctx, __entry->ctx, __entry->handle,

		__entry->sc, __entry->addr, __entry->size)

);



TRACE_EVENT(fastrpc_rpmsg_response,



	TP_PROTO(const char *subsys, uint64_t ctx, int retval,

	TP_PROTO(int cid, uint64_t ctx, int retval,

		uint32_t rspFlags, uint32_t earlyWakeTime),



	TP_ARGS(subsys, ctx, retval, rspFlags, earlyWakeTime),

	TP_ARGS(cid, ctx, retval, rspFlags, earlyWakeTime),



	TP_STRUCT__entry(

		__string(subsys, subsys)

		__field(int, cid)

		__field(uint64_t, ctx)

		__field(int, retval)

		__field(uint32_t, rspFlags)
@@ -56,64 +59,72 @@ TRACE_EVENT(fastrpc_rpmsg_response, 
	),



	TP_fast_assign(

		__assign_str(subsys, subsys);

		__entry->cid = cid;

		__entry->ctx = ctx;

		__entry->retval = retval;

		__entry->rspFlags = rspFlags;

		__entry->earlyWakeTime = earlyWakeTime;

	),



	TP_printk("from %s: ctx 0x%llx, retval 0x%x, rspFlags %u, earlyWakeTime %u",

		__get_str(subsys), __entry->ctx, __entry->retval,

	TP_printk("from cid %d: ctx 0x%llx, retval 0x%x, rspFlags %u, earlyWakeTime %u",

		__entry->cid, __entry->ctx, __entry->retval,

		__entry->rspFlags, __entry->earlyWakeTime)

);



TRACE_EVENT(fastrpc_context_interrupt,



	TP_PROTO(char *subsys, uint64_t ctx, uint32_t handle, uint32_t sc),

	TP_PROTO(int cid, uint64_t smq_ctx, uint64_t ctx,

		uint32_t handle, uint32_t sc),



	TP_ARGS(subsys, ctx, handle, sc),

	TP_ARGS(cid, smq_ctx, ctx, handle, sc),



	TP_STRUCT__entry(

		__string(subsys, subsys)

		__field(int, cid)

		__field(uint64_t, smq_ctx)

		__field(uint64_t, ctx)

		__field(uint32_t, handle)

		__field(uint32_t, sc)

	),



	TP_fast_assign(

		__assign_str(subsys, subsys);

		__entry->cid = cid;

		__entry->smq_ctx = smq_ctx;

		__entry->ctx = ctx;

		__entry->handle = handle;

		__entry->sc = sc;

	),



	TP_printk("to %s: ctx 0x%llx, handle 0x%x, sc 0x%x",

		__get_str(subsys), __entry->ctx, __entry->handle, __entry->sc)

	TP_printk("to cid %d: smq_ctx 0x%llx, ctx 0x%llx, handle 0x%x, sc 0x%x",

		__entry->cid, __entry->smq_ctx,

		__entry->ctx, __entry->handle, __entry->sc)

);



TRACE_EVENT(fastrpc_context_restore,



	TP_PROTO(char *subsys, uint64_t ctx, uint32_t handle, uint32_t sc),

	TP_PROTO(int cid, uint64_t smq_ctx, uint64_t ctx,

		uint32_t handle, uint32_t sc),



	TP_ARGS(subsys, ctx, handle, sc),

	TP_ARGS(cid, smq_ctx, ctx, handle, sc),



	TP_STRUCT__entry(

		__string(subsys, subsys)

		__field(int, cid)

		__field(uint64_t, smq_ctx)

		__field(uint64_t, ctx)

		__field(uint32_t, handle)

		__field(uint32_t, sc)

	),



	TP_fast_assign(

		__assign_str(subsys, subsys);

		__entry->cid = cid;

		__entry->smq_ctx = smq_ctx;

		__entry->ctx = ctx;

		__entry->handle = handle;

		__entry->sc = sc;

	),



	TP_printk("for %s: ctx 0x%llx, handle 0x%x, sc 0x%x",

		__get_str(subsys), __entry->ctx, __entry->handle, __entry->sc)

	TP_printk("for cid %d: smq_ctx 0x%llx, ctx 0x%llx, handle 0x%x, sc 0x%x",

		__entry->cid, __entry->smq_ctx,

		__entry->ctx, __entry->handle, __entry->sc)

);



TRACE_EVENT(fastrpc_dma_map,
@@ -220,6 +231,86 @@ TRACE_EVENT(fastrpc_dma_free, 
		__entry->cid, __entry->phys, __entry->size)

);



TRACE_EVENT(fastrpc_context_complete,



	TP_PROTO(int cid, uint64_t smq_ctx, int retval,

		uint64_t ctx, uint32_t handle, uint32_t sc),



	TP_ARGS(cid, smq_ctx, retval, ctx, handle, sc),



	TP_STRUCT__entry(

		__field(int, cid)

		__field(uint64_t, smq_ctx)

		__field(int, retval)

		__field(uint64_t, ctx)

		__field(uint32_t, handle)

		__field(uint32_t, sc)

	),



	TP_fast_assign(

		__entry->cid = cid;

		__entry->smq_ctx = smq_ctx;

		__entry->retval = retval;

		__entry->ctx = ctx;

		__entry->handle = handle;

		__entry->sc = sc;

	),



	TP_printk("from cid %d: smq_ctx 0x%llx, retval 0x%x, ctx 0x%llx, handle 0x%x, sc 0x%x",

		__entry->cid, __entry->smq_ctx, __entry->retval,

		__entry->ctx, __entry->handle, __entry->sc)

);



TRACE_EVENT(fastrpc_context_alloc,



	TP_PROTO(uint64_t smq_ctx, uint64_t ctx,

		uint32_t handle, uint32_t sc),



	TP_ARGS(smq_ctx, ctx, handle, sc),



	TP_STRUCT__entry(

		__field(uint64_t, smq_ctx)

		__field(uint64_t, ctx)

		__field(uint32_t, handle)

		__field(uint32_t, sc)

	),



	TP_fast_assign(

		__entry->smq_ctx = smq_ctx;

		__entry->ctx = ctx;

		__entry->handle = handle;

		__entry->sc = sc;

	),



	TP_printk("for: smq_ctx 0x%llx, ctx 0x%llx, handle 0x%x, sc 0x%x",

		__entry->smq_ctx, __entry->ctx, __entry->handle, __entry->sc)

);



TRACE_EVENT(fastrpc_context_free,



	TP_PROTO(uint64_t smq_ctx, uint64_t ctx,

		uint32_t handle, uint32_t sc),



	TP_ARGS(smq_ctx, ctx, handle, sc),



	TP_STRUCT__entry(

		__field(uint64_t, smq_ctx)

		__field(uint64_t, ctx)

		__field(uint32_t, handle)

		__field(uint32_t, sc)

	),



	TP_fast_assign(

		__entry->smq_ctx = smq_ctx;

		__entry->ctx = ctx;

		__entry->handle = handle;

		__entry->sc = sc;

	),



	TP_printk("for: smq_ctx 0x%llx, ctx 0x%llx, handle 0x%x, sc 0x%x",

		__entry->smq_ctx, __entry->ctx, __entry->handle, __entry->sc)

);



#endif



/* This part must be outside protection */