All of lore.kernel.org
 help / color / mirror / Atom feed
From: Cristian Marussi <cristian.marussi@arm.com>
To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Cc: sudeep.holla@arm.com, james.quinlan@broadcom.com,
	f.fainelli@gmail.com, vincent.guittot@linaro.org,
	peng.fan@oss.nxp.com, michal.simek@amd.com,
	quic_sibis@quicinc.com, quic_nkela@quicinc.com,
	Cristian Marussi <cristian.marussi@arm.com>
Subject: [PATCH 2/4] firmware: arm_scmi: Add message dump traces for bad and unexpected replies
Date: Wed, 28 Feb 2024 19:32:36 +0000	[thread overview]
Message-ID: <20240228193238.2102157-3-cristian.marussi@arm.com> (raw)
In-Reply-To: <20240228193238.2102157-1-cristian.marussi@arm.com>

Use trace_scmi_msg_dump also to account for late-timed-out, out-of-order
and unexpected replies.

Signed-off-by: Cristian Marussi <cristian.marussi@arm.com>
---
 drivers/firmware/arm_scmi/driver.c | 36 +++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
index 34d77802c990..a3182199f123 100644
--- a/drivers/firmware/arm_scmi/driver.c
+++ b/drivers/firmware/arm_scmi/driver.c
@@ -822,6 +822,13 @@ scmi_xfer_command_acquire(struct scmi_chan_info *cinfo, u32 msg_hdr)
 			"Message for %d type %d is not expected!\n",
 			xfer_id, msg_type);
 		spin_unlock_irqrestore(&minfo->xfer_lock, flags);
+
+		trace_scmi_msg_dump(info->id, cinfo->id,
+				    MSG_XTRACT_PROT_ID(msg_hdr),
+				    MSG_XTRACT_ID(msg_hdr),
+				    !msg_type ? "_!RESP" : "_!DLYD",
+				    xfer_id, 0, NULL, 0);
+
 		return xfer;
 	}
 	refcount_inc(&xfer->users);
@@ -846,6 +853,13 @@ scmi_xfer_command_acquire(struct scmi_chan_info *cinfo, u32 msg_hdr)
 		dev_err(cinfo->dev,
 			"Invalid message type:%d for %d - HDR:0x%X  state:%d\n",
 			msg_type, xfer_id, msg_hdr, xfer->state);
+
+		trace_scmi_msg_dump(info->id, cinfo->id,
+				    MSG_XTRACT_PROT_ID(msg_hdr),
+				    MSG_XTRACT_ID(msg_hdr),
+				    !msg_type ? "_!RESP" : "_!DLYD",
+				    xfer_id, 0, NULL, 0);
+
 		/* On error the refcount incremented above has to be dropped */
 		__scmi_xfer_put(minfo, xfer);
 		xfer = ERR_PTR(-EINVAL);
@@ -882,6 +896,12 @@ static void scmi_handle_notification(struct scmi_chan_info *cinfo,
 	if (IS_ERR(xfer)) {
 		dev_err(dev, "failed to get free message slot (%ld)\n",
 			PTR_ERR(xfer));
+
+		trace_scmi_msg_dump(info->id, cinfo->id,
+				    MSG_XTRACT_PROT_ID(msg_hdr),
+				    MSG_XTRACT_ID(msg_hdr), "_!NOTI",
+				    MSG_XTRACT_TOKEN(msg_hdr), 0, NULL, 0);
+
 		scmi_clear_channel(info, cinfo);
 		return;
 	}
@@ -923,10 +943,18 @@ static void scmi_handle_response(struct scmi_chan_info *cinfo,
 
 	xfer = scmi_xfer_command_acquire(cinfo, msg_hdr);
 	if (IS_ERR(xfer)) {
+		u8 msg_type = MSG_XTRACT_TYPE(msg_hdr);
+
+		trace_scmi_msg_dump(info->id, cinfo->id,
+				    MSG_XTRACT_PROT_ID(msg_hdr),
+				    MSG_XTRACT_ID(msg_hdr),
+				    !msg_type ? "_!RESP" : "_!DLYD",
+				    MSG_XTRACT_TOKEN(msg_hdr), 0, NULL, 0);
+
 		if (IS_ENABLED(CONFIG_ARM_SCMI_RAW_MODE_SUPPORT))
 			scmi_raw_error_report(info->raw, cinfo, msg_hdr, priv);
 
-		if (MSG_XTRACT_TYPE(msg_hdr) == MSG_TYPE_DELAYED_RESP)
+		if (msg_type == MSG_TYPE_DELAYED_RESP)
 			scmi_clear_channel(info, cinfo);
 		return;
 	}
@@ -990,6 +1018,7 @@ static void scmi_handle_response(struct scmi_chan_info *cinfo,
 void scmi_rx_callback(struct scmi_chan_info *cinfo, u32 msg_hdr, void *priv)
 {
 	u8 msg_type = MSG_XTRACT_TYPE(msg_hdr);
+	struct scmi_info *info = handle_to_scmi_info(cinfo->handle);
 
 	switch (msg_type) {
 	case MSG_TYPE_NOTIFICATION:
@@ -1001,6 +1030,11 @@ void scmi_rx_callback(struct scmi_chan_info *cinfo, u32 msg_hdr, void *priv)
 		break;
 	default:
 		WARN_ONCE(1, "received unknown msg_type:%d\n", msg_type);
+		trace_scmi_msg_dump(info->id, cinfo->id,
+				    MSG_XTRACT_PROT_ID(msg_hdr),
+				    MSG_XTRACT_ID(msg_hdr), "_!UNKN",
+				    MSG_XTRACT_TOKEN(msg_hdr), 0, NULL, 0);
+
 		break;
 	}
 }
-- 
2.43.0


WARNING: multiple messages have this Message-ID (diff)
From: Cristian Marussi <cristian.marussi@arm.com>
To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Cc: sudeep.holla@arm.com, james.quinlan@broadcom.com,
	f.fainelli@gmail.com, vincent.guittot@linaro.org,
	peng.fan@oss.nxp.com, michal.simek@amd.com,
	quic_sibis@quicinc.com, quic_nkela@quicinc.com,
	Cristian Marussi <cristian.marussi@arm.com>
Subject: [PATCH 2/4] firmware: arm_scmi: Add message dump traces for bad and unexpected replies
Date: Wed, 28 Feb 2024 19:32:36 +0000	[thread overview]
Message-ID: <20240228193238.2102157-3-cristian.marussi@arm.com> (raw)
In-Reply-To: <20240228193238.2102157-1-cristian.marussi@arm.com>

Use trace_scmi_msg_dump also to account for late-timed-out, out-of-order
and unexpected replies.

Signed-off-by: Cristian Marussi <cristian.marussi@arm.com>
---
 drivers/firmware/arm_scmi/driver.c | 36 +++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
index 34d77802c990..a3182199f123 100644
--- a/drivers/firmware/arm_scmi/driver.c
+++ b/drivers/firmware/arm_scmi/driver.c
@@ -822,6 +822,13 @@ scmi_xfer_command_acquire(struct scmi_chan_info *cinfo, u32 msg_hdr)
 			"Message for %d type %d is not expected!\n",
 			xfer_id, msg_type);
 		spin_unlock_irqrestore(&minfo->xfer_lock, flags);
+
+		trace_scmi_msg_dump(info->id, cinfo->id,
+				    MSG_XTRACT_PROT_ID(msg_hdr),
+				    MSG_XTRACT_ID(msg_hdr),
+				    !msg_type ? "_!RESP" : "_!DLYD",
+				    xfer_id, 0, NULL, 0);
+
 		return xfer;
 	}
 	refcount_inc(&xfer->users);
@@ -846,6 +853,13 @@ scmi_xfer_command_acquire(struct scmi_chan_info *cinfo, u32 msg_hdr)
 		dev_err(cinfo->dev,
 			"Invalid message type:%d for %d - HDR:0x%X  state:%d\n",
 			msg_type, xfer_id, msg_hdr, xfer->state);
+
+		trace_scmi_msg_dump(info->id, cinfo->id,
+				    MSG_XTRACT_PROT_ID(msg_hdr),
+				    MSG_XTRACT_ID(msg_hdr),
+				    !msg_type ? "_!RESP" : "_!DLYD",
+				    xfer_id, 0, NULL, 0);
+
 		/* On error the refcount incremented above has to be dropped */
 		__scmi_xfer_put(minfo, xfer);
 		xfer = ERR_PTR(-EINVAL);
@@ -882,6 +896,12 @@ static void scmi_handle_notification(struct scmi_chan_info *cinfo,
 	if (IS_ERR(xfer)) {
 		dev_err(dev, "failed to get free message slot (%ld)\n",
 			PTR_ERR(xfer));
+
+		trace_scmi_msg_dump(info->id, cinfo->id,
+				    MSG_XTRACT_PROT_ID(msg_hdr),
+				    MSG_XTRACT_ID(msg_hdr), "_!NOTI",
+				    MSG_XTRACT_TOKEN(msg_hdr), 0, NULL, 0);
+
 		scmi_clear_channel(info, cinfo);
 		return;
 	}
@@ -923,10 +943,18 @@ static void scmi_handle_response(struct scmi_chan_info *cinfo,
 
 	xfer = scmi_xfer_command_acquire(cinfo, msg_hdr);
 	if (IS_ERR(xfer)) {
+		u8 msg_type = MSG_XTRACT_TYPE(msg_hdr);
+
+		trace_scmi_msg_dump(info->id, cinfo->id,
+				    MSG_XTRACT_PROT_ID(msg_hdr),
+				    MSG_XTRACT_ID(msg_hdr),
+				    !msg_type ? "_!RESP" : "_!DLYD",
+				    MSG_XTRACT_TOKEN(msg_hdr), 0, NULL, 0);
+
 		if (IS_ENABLED(CONFIG_ARM_SCMI_RAW_MODE_SUPPORT))
 			scmi_raw_error_report(info->raw, cinfo, msg_hdr, priv);
 
-		if (MSG_XTRACT_TYPE(msg_hdr) == MSG_TYPE_DELAYED_RESP)
+		if (msg_type == MSG_TYPE_DELAYED_RESP)
 			scmi_clear_channel(info, cinfo);
 		return;
 	}
@@ -990,6 +1018,7 @@ static void scmi_handle_response(struct scmi_chan_info *cinfo,
 void scmi_rx_callback(struct scmi_chan_info *cinfo, u32 msg_hdr, void *priv)
 {
 	u8 msg_type = MSG_XTRACT_TYPE(msg_hdr);
+	struct scmi_info *info = handle_to_scmi_info(cinfo->handle);
 
 	switch (msg_type) {
 	case MSG_TYPE_NOTIFICATION:
@@ -1001,6 +1030,11 @@ void scmi_rx_callback(struct scmi_chan_info *cinfo, u32 msg_hdr, void *priv)
 		break;
 	default:
 		WARN_ONCE(1, "received unknown msg_type:%d\n", msg_type);
+		trace_scmi_msg_dump(info->id, cinfo->id,
+				    MSG_XTRACT_PROT_ID(msg_hdr),
+				    MSG_XTRACT_ID(msg_hdr), "_!UNKN",
+				    MSG_XTRACT_TOKEN(msg_hdr), 0, NULL, 0);
+
 		break;
 	}
 }
-- 
2.43.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2024-02-28 19:33 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-28 19:32 [PATCH 0/4] SCMI misc small-updates Cristian Marussi
2024-02-28 19:32 ` Cristian Marussi
2024-02-28 19:32 ` [PATCH 1/4] include: trace: Widen the tag buffer in trace_scmi_dump_msg Cristian Marussi
2024-02-28 19:32   ` Cristian Marussi
2024-02-28 19:32 ` Cristian Marussi [this message]
2024-02-28 19:32   ` [PATCH 2/4] firmware: arm_scmi: Add message dump traces for bad and unexpected replies Cristian Marussi
2024-02-28 19:32 ` [PATCH 3/4] firmware: arm_scmi: Simplify scmi_devm_notifier_unregister Cristian Marussi
2024-02-28 19:32   ` Cristian Marussi
2024-02-28 19:32 ` [PATCH 4/4] firmware: arm_scmi: Use dev_err_probe to bail out Cristian Marussi
2024-02-28 19:32   ` Cristian Marussi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240228193238.2102157-3-cristian.marussi@arm.com \
    --to=cristian.marussi@arm.com \
    --cc=f.fainelli@gmail.com \
    --cc=james.quinlan@broadcom.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=michal.simek@amd.com \
    --cc=peng.fan@oss.nxp.com \
    --cc=quic_nkela@quicinc.com \
    --cc=quic_sibis@quicinc.com \
    --cc=sudeep.holla@arm.com \
    --cc=vincent.guittot@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.