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: [PATCHv2 10/15] remoteproc/omap: Check for undefined mailbox messages Date: Tue, 19 Nov 2019 16:16:40 +0200 [thread overview] Message-ID: <20191119141645.19777-11-t-kristo@ti.com> (raw) In-Reply-To: <20191119141645.19777-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. Co-developed-by: Subramaniam Chanderashekarapuram <subramaniam.ca@ti.com> 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> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> --- 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 4af55d1f2702..62734eaafaad 100644 --- a/drivers/remoteproc/omap_remoteproc.c +++ b/drivers/remoteproc/omap_remoteproc.c @@ -127,6 +127,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: [PATCHv2 10/15] remoteproc/omap: Check for undefined mailbox messages Date: Tue, 19 Nov 2019 16:16:40 +0200 [thread overview] Message-ID: <20191119141645.19777-11-t-kristo@ti.com> (raw) In-Reply-To: <20191119141645.19777-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. Co-developed-by: Subramaniam Chanderashekarapuram <subramaniam.ca@ti.com> 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> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> --- 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 4af55d1f2702..62734eaafaad 100644 --- a/drivers/remoteproc/omap_remoteproc.c +++ b/drivers/remoteproc/omap_remoteproc.c @@ -127,6 +127,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
next prev parent reply other threads:[~2019-11-19 14:16 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-19 14:16 [PATCHv2 00/15] Remoteproc: updates for OMAP remoteproc support Tero Kristo 2019-11-19 14:16 ` Tero Kristo 2019-11-19 14:16 ` [PATCHv2.5 01/15] dt-bindings: remoteproc: Add OMAP remoteproc bindings Tero Kristo 2019-11-19 14:16 ` Tero Kristo 2019-11-19 14:16 ` [PATCHv2 02/15] remoteproc/omap: Add device tree support Tero Kristo 2019-11-19 14:16 ` Tero Kristo 2019-11-19 14:16 ` [PATCHv2 03/15] remoteproc/omap: Add a sanity check for DSP boot address alignment Tero Kristo 2019-11-19 14:16 ` Tero Kristo 2019-11-19 14:16 ` [PATCHv2 04/15] remoteproc/omap: Add support to parse internal memories from DT Tero Kristo 2019-11-19 14:16 ` Tero Kristo 2019-11-19 14:16 ` [PATCHv2 05/15] remoteproc/omap: Add the rproc ops .da_to_va() implementation Tero Kristo 2019-11-19 14:16 ` Tero Kristo 2019-11-19 14:16 ` [PATCHv2 06/15] remoteproc/omap: Initialize and assign reserved memory node Tero Kristo 2019-11-19 14:16 ` Tero Kristo 2019-11-19 14:16 ` [PATCHv2 07/15] remoteproc/omap: Add support for DRA7xx remote processors Tero Kristo 2019-11-19 14:16 ` Tero Kristo 2019-11-19 14:16 ` [PATCHv2 08/15] remoteproc/omap: Remove the unused fields from platform data Tero Kristo 2019-11-19 14:16 ` Tero Kristo 2019-11-19 14:16 ` [PATCHv2 09/15] remoteproc/omap: Remove the omap_rproc_reserve_cma declaration Tero Kristo 2019-11-19 14:16 ` Tero Kristo 2019-11-19 14:16 ` Tero Kristo [this message] 2019-11-19 14:16 ` [PATCHv2 10/15] remoteproc/omap: Check for undefined mailbox messages Tero Kristo 2019-11-19 14:16 ` [PATCHv2 11/15] remoteproc/omap: Request a timer(s) for remoteproc usage Tero Kristo 2019-11-19 14:16 ` Tero Kristo 2019-11-19 14:16 ` [PATCHv2 12/15] remoteproc/omap: add support for system suspend/resume Tero Kristo 2019-11-19 14:16 ` Tero Kristo 2019-11-19 14:16 ` [PATCHv2 13/15] remoteproc/omap: add support for runtime auto-suspend/resume Tero Kristo 2019-11-19 14:16 ` Tero Kristo 2019-11-19 14:16 ` [PATCHv2 14/15] remoteproc/omap: report device exceptions and trigger recovery Tero Kristo 2019-11-19 14:16 ` Tero Kristo 2019-11-19 14:16 ` [PATCHv2 15/15] remoteproc/omap: add watchdog functionality for remote processors Tero Kristo 2019-11-19 14:16 ` Tero Kristo 2019-11-19 17:31 ` [PATCHv2 00/15] Remoteproc: updates for OMAP remoteproc support Mathieu Poirier 2019-11-19 18:07 ` Mathieu Poirier 2019-11-20 11:28 ` Tero Kristo 2019-11-20 11:28 ` Tero Kristo
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=20191119141645.19777-11-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: linkBe 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.