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

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

Merge "drivers: mailbox: rpmh: update rpmh send message trace"

parents 9c8919d1 c1937ac0

drivers/mailbox/qcom-rpmh-mailbox.c

+3 −1
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ struct tcs_mbox { 
struct rsc_drv {

	struct mbox_controller mbox;

	const char *name;

	unsigned long addr;

	void __iomem *base; /* start address of the RSC's registers */

	void __iomem *reg_base; /* start address for DRV specific register */

	int drv_id;
@@ -148,7 +149,7 @@ struct rsc_drv { 


/* Log to IPC and Ftrace */

#define log_send_msg(drv, m, n, i, a, d, c, t) do {			\

	trace_rpmh_send_msg(drv->name, m, n, i, a, d, c, t);		\

	trace_rpmh_send_msg(drv->name, drv->addr, m, n, i, a, d, c, t);	\

	ipc_log_string(drv->ipc_log_ctx,				\

		"send msg: m=%d n=%d msgid=0x%x addr=0x%x data=0x%x cmpl=%d trigger=%d", \

		m, n, i, a, d, c, t);					\
@@ -1125,6 +1126,7 @@ static int rsc_drv_probe(struct platform_device *pdev) 
	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res)

		return -EINVAL;

	drv->addr = res->start;

	drv->base = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(drv->base))

		return PTR_ERR(drv->base);

include/trace/events/rpmh.h

+9 −5
Original line number Diff line number Diff line
@@ -54,12 +54,14 @@ DEFINE_EVENT(rpmh_ack_recvd, rpmh_notify, 


TRACE_EVENT(rpmh_send_msg,



	TP_PROTO(const char *s, int m, int n, u32 h, u32 a, u32 v, bool c, bool t),

	TP_PROTO(const char *s, unsigned long b, int m, int n, u32 h, u32 a,

							u32 v, bool c, bool t),



	TP_ARGS(s, m, n, h, a, v, c, t),

	TP_ARGS(s, b, m, n, h, a, v, c, t),



	TP_STRUCT__entry(

		__field(const char*, name)

		__field(unsigned long, base)

		__field(int, m)

		__field(int, n)

		__field(u32, hdr)
@@ -71,6 +73,7 @@ TRACE_EVENT(rpmh_send_msg, 


	TP_fast_assign(

		__entry->name = s;

		__entry->base = b;

		__entry->m = m;

		__entry->n = n;

		__entry->hdr = h;
@@ -80,9 +83,10 @@ TRACE_EVENT(rpmh_send_msg, 
		__entry->trigger = t;

	),



	TP_printk("%s: send-msg: tcs(m): %d cmd(n): %d msgid: 0x%08x addr: 0x%08x data: 0x%08x complete: %d trigger: %d",

			__entry->name, __entry->m, __entry->n, __entry->hdr,

			__entry->addr, __entry->data, __entry->complete, __entry->trigger)

	TP_printk("%s: reg: 0x%08lx send-msg: tcs(m): %d cmd(n): %d msgid: 0x%08x addr: 0x%08x data: 0x%08x complete: %d trigger: %d",

			__entry->name, __entry->base, __entry->m,

			__entry->n, __entry->hdr, __entry->addr,

			__entry->data, __entry->complete, __entry->trigger)

);



TRACE_EVENT(rpmh_control_msg,