All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tero Kristo <t-kristo@ti.com>
To: bjorn.andersson@linaro.org, ohad@wizery.com,
	linux-remoteproc@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org,
	s-anna@ti.com, Tero Kristo <t-kristo@ti.com>
Subject: [PATCH 11/17] remoteproc/omap: Check for undefined mailbox messages
Date: Mon, 28 Oct 2019 14:42:32 +0200	[thread overview]
Message-ID: <20191028124238.19224-12-t-kristo@ti.com> (raw)
In-Reply-To: <20191028124238.19224-1-t-kristo@ti.com>

From: Suman Anna <s-anna@ti.com>

Add some checks in the mailbox callback function to limit
any processing in the mailbox callback function to only
certain currently valid messages, and drop all the remaining
messages. A debug message is added to print any such invalid
messages when the appropriate trace control is enabled.

Signed-off-by: Subramaniam Chanderashekarapuram <subramaniam.ca@ti.com>
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Tero Kristo <t-kristo@ti.com>
---
 drivers/remoteproc/omap_remoteproc.c | 6 ++++++
 drivers/remoteproc/omap_remoteproc.h | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/drivers/remoteproc/omap_remoteproc.c b/drivers/remoteproc/omap_remoteproc.c
index e46bb4c790d7..016d5beda195 100644
--- a/drivers/remoteproc/omap_remoteproc.c
+++ b/drivers/remoteproc/omap_remoteproc.c
@@ -124,6 +124,12 @@ static void omap_rproc_mbox_callback(struct mbox_client *client, void *data)
 		dev_info(dev, "received echo reply from %s\n", name);
 		break;
 	default:
+		if (msg >= RP_MBOX_READY && msg < RP_MBOX_END_MSG)
+			return;
+		if (msg > oproc->rproc->max_notifyid) {
+			dev_dbg(dev, "dropping unknown message 0x%x", msg);
+			return;
+		}
 		/* msg contains the index of the triggered vring */
 		if (rproc_vq_interrupt(oproc->rproc, msg) == IRQ_NONE)
 			dev_dbg(dev, "no message was found in vqid %d\n", msg);
diff --git a/drivers/remoteproc/omap_remoteproc.h b/drivers/remoteproc/omap_remoteproc.h
index 1e6fef753c4f..18f522617683 100644
--- a/drivers/remoteproc/omap_remoteproc.h
+++ b/drivers/remoteproc/omap_remoteproc.h
@@ -31,6 +31,12 @@
  *
  * @RP_MBOX_ABORT_REQUEST: a "please crash" request, used for testing the
  * recovery mechanism (to some extent).
+ *
+ * Introduce new message definitions if any here.
+ *
+ * @RP_MBOX_END_MSG: Indicates end of known/defined messages from remote core
+ * This should be the last definition.
+ *
  */
 enum omap_rp_mbox_messages {
 	RP_MBOX_READY		= 0xFFFFFF00,
@@ -39,6 +45,7 @@ enum omap_rp_mbox_messages {
 	RP_MBOX_ECHO_REQUEST	= 0xFFFFFF03,
 	RP_MBOX_ECHO_REPLY	= 0xFFFFFF04,
 	RP_MBOX_ABORT_REQUEST	= 0xFFFFFF05,
+	RP_MBOX_END_MSG		= 0xFFFFFF06,
 };
 
 #endif /* _OMAP_RPMSG_H */
-- 
2.17.1

--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

WARNING: multiple messages have this Message-ID (diff)
From: Tero Kristo <t-kristo@ti.com>
To: <bjorn.andersson@linaro.org>, <ohad@wizery.com>,
	<linux-remoteproc@vger.kernel.org>
Cc: <linux-kernel@vger.kernel.org>, <linux-omap@vger.kernel.org>,
	<s-anna@ti.com>, Tero Kristo <t-kristo@ti.com>
Subject: [PATCH 11/17] remoteproc/omap: Check for undefined mailbox messages
Date: Mon, 28 Oct 2019 14:42:32 +0200	[thread overview]
Message-ID: <20191028124238.19224-12-t-kristo@ti.com> (raw)
In-Reply-To: <20191028124238.19224-1-t-kristo@ti.com>

From: Suman Anna <s-anna@ti.com>

Add some checks in the mailbox callback function to limit
any processing in the mailbox callback function to only
certain currently valid messages, and drop all the remaining
messages. A debug message is added to print any such invalid
messages when the appropriate trace control is enabled.

Signed-off-by: Subramaniam Chanderashekarapuram <subramaniam.ca@ti.com>
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Tero Kristo <t-kristo@ti.com>
---
 drivers/remoteproc/omap_remoteproc.c | 6 ++++++
 drivers/remoteproc/omap_remoteproc.h | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/drivers/remoteproc/omap_remoteproc.c b/drivers/remoteproc/omap_remoteproc.c
index e46bb4c790d7..016d5beda195 100644
--- a/drivers/remoteproc/omap_remoteproc.c
+++ b/drivers/remoteproc/omap_remoteproc.c
@@ -124,6 +124,12 @@ static void omap_rproc_mbox_callback(struct mbox_client *client, void *data)
 		dev_info(dev, "received echo reply from %s\n", name);
 		break;
 	default:
+		if (msg >= RP_MBOX_READY && msg < RP_MBOX_END_MSG)
+			return;
+		if (msg > oproc->rproc->max_notifyid) {
+			dev_dbg(dev, "dropping unknown message 0x%x", msg);
+			return;
+		}
 		/* msg contains the index of the triggered vring */
 		if (rproc_vq_interrupt(oproc->rproc, msg) == IRQ_NONE)
 			dev_dbg(dev, "no message was found in vqid %d\n", msg);
diff --git a/drivers/remoteproc/omap_remoteproc.h b/drivers/remoteproc/omap_remoteproc.h
index 1e6fef753c4f..18f522617683 100644
--- a/drivers/remoteproc/omap_remoteproc.h
+++ b/drivers/remoteproc/omap_remoteproc.h
@@ -31,6 +31,12 @@
  *
  * @RP_MBOX_ABORT_REQUEST: a "please crash" request, used for testing the
  * recovery mechanism (to some extent).
+ *
+ * Introduce new message definitions if any here.
+ *
+ * @RP_MBOX_END_MSG: Indicates end of known/defined messages from remote core
+ * This should be the last definition.
+ *
  */
 enum omap_rp_mbox_messages {
 	RP_MBOX_READY		= 0xFFFFFF00,
@@ -39,6 +45,7 @@ enum omap_rp_mbox_messages {
 	RP_MBOX_ECHO_REQUEST	= 0xFFFFFF03,
 	RP_MBOX_ECHO_REPLY	= 0xFFFFFF04,
 	RP_MBOX_ABORT_REQUEST	= 0xFFFFFF05,
+	RP_MBOX_END_MSG		= 0xFFFFFF06,
 };
 
 #endif /* _OMAP_RPMSG_H */
-- 
2.17.1

--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

  parent reply	other threads:[~2019-10-28 12:42 UTC|newest]

Thread overview: 102+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-28 12:42 [PATCH 00/17] remoteproc: omap changes on top of v5.4-rc1 Tero Kristo
2019-10-28 12:42 ` Tero Kristo
2019-10-28 12:42 ` [PATCH 01/17] dt-bindings: remoteproc: Add OMAP remoteproc bindings Tero Kristo
2019-10-28 12:42   ` Tero Kristo
2019-11-06  3:27   ` Rob Herring
2019-11-06  3:27     ` Rob Herring
2019-11-06 12:44     ` Tero Kristo
2019-11-06 12:44       ` Tero Kristo
2019-11-06 13:27       ` Rob Herring
2019-11-06 13:27         ` Rob Herring
2019-11-06 13:50         ` Tero Kristo
2019-11-06 13:50           ` Tero Kristo
2019-11-07 14:05   ` [PATCHv2 " Tero Kristo
2019-11-07 14:05     ` Tero Kristo
2019-11-13 14:25     ` Rob Herring
2019-10-28 12:42 ` [PATCH 02/17] remoteproc/omap: Switch to SPDX license identifiers Tero Kristo
2019-10-28 12:42   ` Tero Kristo
2019-11-09  1:03   ` Bjorn Andersson
2019-11-09  1:03     ` Bjorn Andersson
2019-11-12  8:16     ` Tero Kristo
2019-11-12  8:16       ` Tero Kristo
2019-12-20  3:30       ` Suman Anna
2019-12-20  3:30         ` Suman Anna
2019-10-28 12:42 ` [PATCH 03/17] remoteproc/omap: Add device tree support Tero Kristo
2019-10-28 12:42   ` Tero Kristo
2019-11-11 23:16   ` Bjorn Andersson
2019-11-11 23:16     ` Bjorn Andersson
2019-11-12  8:14     ` Tero Kristo
2019-11-12  8:14       ` Tero Kristo
2019-10-28 12:42 ` [PATCH 04/17] remoteproc/omap: Add a sanity check for DSP boot address alignment Tero Kristo
2019-10-28 12:42   ` Tero Kristo
2019-11-11 23:18   ` Bjorn Andersson
2019-11-11 23:18     ` Bjorn Andersson
2019-10-28 12:42 ` [PATCH 05/17] remoteproc/omap: Add support to parse internal memories from DT Tero Kristo
2019-10-28 12:42   ` Tero Kristo
2019-11-11 23:21   ` Bjorn Andersson
2019-11-11 23:21     ` Bjorn Andersson
2019-11-12  8:21     ` Tero Kristo
2019-11-12  8:21       ` Tero Kristo
2019-10-28 12:42 ` [PATCH 06/17] remoteproc/omap: Add the rproc ops .da_to_va() implementation Tero Kristo
2019-10-28 12:42   ` Tero Kristo
2019-11-11 23:22   ` Bjorn Andersson
2019-11-11 23:22     ` Bjorn Andersson
2019-11-12  8:22     ` Tero Kristo
2019-11-12  8:22       ` Tero Kristo
2019-10-28 12:42 ` [PATCH 07/17] remoteproc/omap: Initialize and assign reserved memory node Tero Kristo
2019-10-28 12:42   ` Tero Kristo
2019-11-11 23:23   ` Bjorn Andersson
2019-11-11 23:23     ` Bjorn Andersson
2019-10-28 12:42 ` [PATCH 08/17] remoteproc/omap: Add support for DRA7xx remote processors Tero Kristo
2019-10-28 12:42   ` Tero Kristo
2019-11-11 23:37   ` Bjorn Andersson
2019-11-11 23:37     ` Bjorn Andersson
2019-11-12  8:37     ` Tero Kristo
2019-11-12  8:37       ` Tero Kristo
2019-11-12 18:13       ` Bjorn Andersson
2019-11-12 18:13         ` Bjorn Andersson
2019-11-13  8:08         ` Tero Kristo
2019-11-13  8:08           ` Tero Kristo
2019-10-28 12:42 ` [PATCH 09/17] remoteproc/omap: Remove the unused fields from platform data Tero Kristo
2019-10-28 12:42   ` Tero Kristo
2019-11-11 23:37   ` Bjorn Andersson
2019-11-11 23:37     ` Bjorn Andersson
2019-10-28 12:42 ` [PATCH 10/17] remoteproc/omap: Remove the omap_rproc_reserve_cma declaration Tero Kristo
2019-10-28 12:42   ` Tero Kristo
2019-11-11 23:37   ` Bjorn Andersson
2019-11-11 23:37     ` Bjorn Andersson
2019-10-28 12:42 ` Tero Kristo [this message]
2019-10-28 12:42   ` [PATCH 11/17] remoteproc/omap: Check for undefined mailbox messages Tero Kristo
2019-11-11 23:39   ` Bjorn Andersson
2019-11-11 23:39     ` Bjorn Andersson
2019-11-12  8:38     ` Tero Kristo
2019-11-12  8:38       ` Tero Kristo
2019-10-28 12:42 ` [PATCH 12/17] remoteproc/omap: Request a timer(s) for remoteproc usage Tero Kristo
2019-10-28 12:42   ` Tero Kristo
2019-11-12  4:13   ` Bjorn Andersson
2019-11-12  4:13     ` Bjorn Andersson
2019-11-12  8:42     ` Tero Kristo
2019-11-12  8:42       ` Tero Kristo
2019-10-28 12:42 ` [PATCH 13/17] remoteproc/omap: add support for system suspend/resume Tero Kristo
2019-10-28 12:42   ` Tero Kristo
2019-10-30  4:01   ` kbuild test robot
2019-11-12  6:15   ` Bjorn Andersson
2019-11-12  6:15     ` Bjorn Andersson
2019-11-12  8:45     ` Tero Kristo
2019-11-12  8:45       ` Tero Kristo
2019-11-12 18:06       ` Bjorn Andersson
2019-11-12 18:06         ` Bjorn Andersson
2019-10-28 12:42 ` [PATCH 14/17] remoteproc/omap: add support for runtime auto-suspend/resume Tero Kristo
2019-10-28 12:42   ` Tero Kristo
2019-10-28 12:42 ` [PATCH 15/17] remoteproc/omap: report device exceptions and trigger recovery Tero Kristo
2019-10-28 12:42   ` Tero Kristo
2019-11-12  6:26   ` Bjorn Andersson
2019-11-12  6:26     ` Bjorn Andersson
2019-11-12  8:46     ` Tero Kristo
2019-11-12  8:46       ` Tero Kristo
2019-10-28 12:42 ` [PATCH 16/17] remoteproc/omap: add watchdog functionality for remote processors Tero Kristo
2019-10-28 12:42   ` Tero Kristo
2019-10-28 12:42 ` [PATCH 17/17] remoteproc/omap: fix auto-suspend failure warning during crashed state Tero Kristo
2019-10-28 12:42   ` Tero Kristo
2019-11-12  6:28   ` Bjorn Andersson
2019-11-12  6:28     ` Bjorn Andersson

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=20191028124238.19224-12-t-kristo@ti.com \
    --to=t-kristo@ti.com \
    --cc=bjorn.andersson@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux-remoteproc@vger.kernel.org \
    --cc=ohad@wizery.com \
    --cc=s-anna@ti.com \
    /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.