Merge "msm: ipa3: Adding trace in lan path" (68c091ef) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/platform/msm/ipa/ipa_v3/ipa_dp.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -2885,7 +2885,7 @@ static int ipa3_lan_rx_pyld_hdlr(struct sk_buff *skb,
		unsigned long ptr;

		IPA_DUMP_BUFF(skb->data, 0, skb->len);

		trace_ipa3_lan_rx_pyld_hdlr_entry(skb,sys->ep->client);
		if (skb->len == 0) {
		IPAERR("ZLT packet arrived to AP\n");
		goto out;
		@@ -3167,6 +3167,7 @@ static int ipa3_lan_rx_pyld_hdlr(struct sk_buff *skb,

		out:
		ipa3_skb_recycle(skb);
		trace_ipa3_lan_rx_pyld_hdlr_exit(sys->ep->client);
		return 0;
		}

		@@ -3433,6 +3434,7 @@ void ipa3_lan_rx_cb(void *priv, enum ipa_dp_evt_type evt, unsigned long data)
		void *client_priv;

		ipahal_pkt_status_parse_thin(rx_skb->data, &status);
		trace_ipa3_lan_rx_cb_entry(status.endp_src_idx);
		src_pipe = status.endp_src_idx;
		metadata = status.metadata;
		ucp = status.ucp;
		@@ -3474,6 +3476,7 @@ void ipa3_lan_rx_cb(void *priv, enum ipa_dp_evt_type evt, unsigned long data)
		dev_kfree_skb_any(rx_skb);
		}

		trace_ipa3_lan_rx_cb_exit(status.endp_src_idx);
		}

		static void ipa3_recycle_rx_wrapper(struct ipa3_rx_pkt_wrapper *rx_pkt)
		@@ -5246,6 +5249,7 @@ int ipa3_lan_rx_poll(u32 clnt_hdl, int weight)
		return cnt;
		}
		ep = &ipa3_ctx->ep[clnt_hdl];
		trace_ipa3_napi_poll_entry(ep->client);

		start_poll:
		/*
		@@ -5285,6 +5289,7 @@ int ipa3_lan_rx_poll(u32 clnt_hdl, int weight)
		IPA_ACTIVE_CLIENTS_DEC_EP_NO_BLOCK(ep->client);
		}

		trace_ipa3_napi_poll_exit(ep->client, cnt, ep->sys->len);
		return cnt;
		}

		@@ -5387,7 +5392,7 @@ int ipa3_rx_poll(u32 clnt_hdl, int weight)
		IPADBG_LOW("Client = %d not replenished free descripotrs\n",
		ep->client);
		}
		trace_ipa3_napi_poll_exit(ep->client);
		trace_ipa3_napi_poll_exit(ep->client, cnt, ep->sys->len);
		return cnt;
		}

drivers/platform/msm/ipa/ipa_v3/ipa_trace.h

+85 −3

Original line number	Diff line number	Diff line
		@@ -230,19 +230,23 @@ TRACE_EVENT(
		TRACE_EVENT(
		ipa3_napi_poll_exit,

		TP_PROTO(unsigned long client),
		TP_PROTO(unsigned long client, u32 cnt, u32 len),

		TP_ARGS(client),
		TP_ARGS(client, cnt, len),

		TP_STRUCT__entry(
		__field(unsigned long, client)
		__field(unsigned int, cnt)
		__field(unsigned int, len)
		),

		TP_fast_assign(
		__entry->client = client;
		__entry->cnt = cnt;
		__entry->len = len;
		),

		TP_printk("client=%lu", __entry->client)
		TP_printk("client=%lu napi weight cnt = %d sys->len = %d", __entry->client, __entry->cnt, __entry->len)
		);

		TRACE_EVENT(
		@@ -297,6 +301,84 @@ TRACE_EVENT(
		TP_printk("client=%lu", __entry->client)
		);

		TRACE_EVENT(
		ipa3_lan_rx_pyld_hdlr_entry,

		TP_PROTO(const struct sk_buff *skb, unsigned long client),

		TP_ARGS(skb, client),

		TP_STRUCT__entry(
		__field(unsigned int, len)
		__field(unsigned int, data_len)
		__field(unsigned long, client)
		),

		TP_fast_assign(
		__entry->len = skb->len;
		__entry->data_len = skb->data_len;
		__entry->client = client;
		),

		TP_printk("len=%u data_len=%u client=%lu",
		__entry->len,
		__entry->data_len,
		__entry->client)
		);

		TRACE_EVENT(
		ipa3_lan_rx_pyld_hdlr_exit,

		TP_PROTO(unsigned long client),

		TP_ARGS(client),

		TP_STRUCT__entry(
		__field(unsigned long, client)
		),

		TP_fast_assign(
		__entry->client = client;
		),

		TP_printk("client=%lu", __entry->client)
		);

		TRACE_EVENT(
		ipa3_lan_rx_cb_entry,

		TP_PROTO(unsigned long client),

		TP_ARGS(client),

		TP_STRUCT__entry(
		__field(unsigned long, client)
		),

		TP_fast_assign(
		__entry->client = client;
		),

		TP_printk("client=%lu", __entry->client)
		);

		TRACE_EVENT(
		ipa3_lan_rx_cb_exit,

		TP_PROTO(unsigned long client),

		TP_ARGS(client),

		TP_STRUCT__entry(
		__field(unsigned long, client)
		),

		TP_fast_assign(
		__entry->client = client;
		),

		TP_printk("client=%lu", __entry->client)
		);
		#endif /* _IPA_TRACE_H */

		/* This part must be outside protection */