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, mathieu.poirier@linaro.org, s-anna@ti.com, linux-omap@vger.kernel.org, Tero Kristo <t-kristo@ti.com> Subject: [PATCHv5 03/14] remoteproc/omap: Add a sanity check for DSP boot address alignment Date: Thu, 16 Jan 2020 15:53:21 +0200 [thread overview] Message-ID: <20200116135332.7819-4-t-kristo@ti.com> (raw) In-Reply-To: <20200116135332.7819-1-t-kristo@ti.com> From: Suman Anna <s-anna@ti.com> The DSP remote processors on OMAP SoCs require a boot register to be programmed with a boot address, and this boot address needs to be on a 1KB boundary. The current code is simply masking the boot address appropriately without performing any sanity checks before releasing the resets. An unaligned boot address results in an undefined execution behavior and can result in various bus errors like MMU Faults or L3 NoC errors. Such errors are hard to debug and can be easily avoided by adding a sanity check for the alignment before booting a DSP remote processor. 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> --- v5: no changes drivers/remoteproc/omap_remoteproc.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/remoteproc/omap_remoteproc.c b/drivers/remoteproc/omap_remoteproc.c index 6c603c2cd895..2935a8edb3a6 100644 --- a/drivers/remoteproc/omap_remoteproc.c +++ b/drivers/remoteproc/omap_remoteproc.c @@ -122,13 +122,22 @@ static void omap_rproc_kick(struct rproc *rproc, int vqid) * * Set boot address for a supported DSP remote processor. */ -static void omap_rproc_write_dsp_boot_addr(struct rproc *rproc) +static int omap_rproc_write_dsp_boot_addr(struct rproc *rproc) { + struct device *dev = rproc->dev.parent; struct omap_rproc *oproc = rproc->priv; struct omap_rproc_boot_data *bdata = oproc->boot_data; u32 offset = bdata->boot_reg; + if (rproc->bootaddr & (SZ_1K - 1)) { + dev_err(dev, "invalid boot address 0x%x, must be aligned on a 1KB boundary\n", + rproc->bootaddr); + return -EINVAL; + } + regmap_write(bdata->syscon, offset, rproc->bootaddr); + + return 0; } /* @@ -145,8 +154,11 @@ static int omap_rproc_start(struct rproc *rproc) int ret; struct mbox_client *client = &oproc->client; - if (oproc->boot_data) - omap_rproc_write_dsp_boot_addr(rproc); + if (oproc->boot_data) { + ret = omap_rproc_write_dsp_boot_addr(rproc); + if (ret) + return ret; + } client->dev = dev; client->tx_done = NULL; -- 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>, <mathieu.poirier@linaro.org>, <s-anna@ti.com>, <linux-omap@vger.kernel.org>, Tero Kristo <t-kristo@ti.com> Subject: [PATCHv5 03/14] remoteproc/omap: Add a sanity check for DSP boot address alignment Date: Thu, 16 Jan 2020 15:53:21 +0200 [thread overview] Message-ID: <20200116135332.7819-4-t-kristo@ti.com> (raw) In-Reply-To: <20200116135332.7819-1-t-kristo@ti.com> From: Suman Anna <s-anna@ti.com> The DSP remote processors on OMAP SoCs require a boot register to be programmed with a boot address, and this boot address needs to be on a 1KB boundary. The current code is simply masking the boot address appropriately without performing any sanity checks before releasing the resets. An unaligned boot address results in an undefined execution behavior and can result in various bus errors like MMU Faults or L3 NoC errors. Such errors are hard to debug and can be easily avoided by adding a sanity check for the alignment before booting a DSP remote processor. 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> --- v5: no changes drivers/remoteproc/omap_remoteproc.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/remoteproc/omap_remoteproc.c b/drivers/remoteproc/omap_remoteproc.c index 6c603c2cd895..2935a8edb3a6 100644 --- a/drivers/remoteproc/omap_remoteproc.c +++ b/drivers/remoteproc/omap_remoteproc.c @@ -122,13 +122,22 @@ static void omap_rproc_kick(struct rproc *rproc, int vqid) * * Set boot address for a supported DSP remote processor. */ -static void omap_rproc_write_dsp_boot_addr(struct rproc *rproc) +static int omap_rproc_write_dsp_boot_addr(struct rproc *rproc) { + struct device *dev = rproc->dev.parent; struct omap_rproc *oproc = rproc->priv; struct omap_rproc_boot_data *bdata = oproc->boot_data; u32 offset = bdata->boot_reg; + if (rproc->bootaddr & (SZ_1K - 1)) { + dev_err(dev, "invalid boot address 0x%x, must be aligned on a 1KB boundary\n", + rproc->bootaddr); + return -EINVAL; + } + regmap_write(bdata->syscon, offset, rproc->bootaddr); + + return 0; } /* @@ -145,8 +154,11 @@ static int omap_rproc_start(struct rproc *rproc) int ret; struct mbox_client *client = &oproc->client; - if (oproc->boot_data) - omap_rproc_write_dsp_boot_addr(rproc); + if (oproc->boot_data) { + ret = omap_rproc_write_dsp_boot_addr(rproc); + if (ret) + return ret; + } client->dev = dev; client->tx_done = NULL; -- 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:[~2020-01-16 13:53 UTC|newest] Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-01-16 13:53 [PATCHv5 00/14] remoteproc: updates for omap remoteproc support Tero Kristo 2020-01-16 13:53 ` Tero Kristo 2020-01-16 13:53 ` [PATCHv5 01/14] dt-bindings: remoteproc: Add OMAP remoteproc bindings Tero Kristo 2020-01-16 13:53 ` Tero Kristo 2020-01-16 13:53 ` Tero Kristo 2020-01-22 2:34 ` Rob Herring 2020-01-22 2:34 ` Rob Herring 2020-01-22 2:34 ` Rob Herring 2020-01-16 13:53 ` [PATCHv5 02/14] remoteproc/omap: Add device tree support Tero Kristo 2020-01-16 13:53 ` Tero Kristo 2020-01-16 13:53 ` Tero Kristo [this message] 2020-01-16 13:53 ` [PATCHv5 03/14] remoteproc/omap: Add a sanity check for DSP boot address alignment Tero Kristo 2020-01-16 13:53 ` [PATCHv5 04/14] remoteproc/omap: Add support to parse internal memories from DT Tero Kristo 2020-01-16 13:53 ` Tero Kristo 2020-01-16 13:53 ` [PATCHv5 05/14] remoteproc/omap: Add the rproc ops .da_to_va() implementation Tero Kristo 2020-01-16 13:53 ` Tero Kristo 2020-01-16 13:53 ` [PATCHv5 06/14] remoteproc/omap: Initialize and assign reserved memory node Tero Kristo 2020-01-16 13:53 ` Tero Kristo 2020-01-30 18:11 ` Andrew F. Davis 2020-01-30 18:11 ` Andrew F. Davis 2020-01-30 19:18 ` Tero Kristo 2020-01-30 19:18 ` Tero Kristo 2020-01-30 19:20 ` Andrew F. Davis 2020-01-30 19:20 ` Andrew F. Davis 2020-01-30 19:42 ` Tero Kristo 2020-01-30 19:42 ` Tero Kristo 2020-01-30 19:55 ` Suman Anna 2020-01-30 19:55 ` Suman Anna 2020-01-30 20:22 ` Andrew F. Davis 2020-01-30 20:22 ` Andrew F. Davis 2020-01-30 20:39 ` Suman Anna 2020-01-30 20:39 ` Suman Anna 2020-01-30 21:19 ` Andrew F. Davis 2020-01-30 21:19 ` Andrew F. Davis 2020-01-30 21:39 ` Suman Anna 2020-01-30 21:39 ` Suman Anna 2020-01-30 21:50 ` Andrew F. Davis 2020-01-30 21:50 ` Andrew F. Davis 2020-01-30 21:57 ` Suman Anna 2020-01-30 21:57 ` Suman Anna 2020-01-30 22:06 ` Suman Anna 2020-01-30 22:06 ` Suman Anna 2020-01-30 23:04 ` Andrew F. Davis 2020-01-30 23:04 ` Andrew F. Davis 2020-02-05 8:51 ` Tero Kristo 2020-02-05 8:51 ` Tero Kristo 2020-01-16 13:53 ` [PATCHv5 07/14] remoteproc/omap: Add support for DRA7xx remote processors Tero Kristo 2020-01-16 13:53 ` Tero Kristo 2020-01-16 13:53 ` [PATCHv5 08/14] remoteproc/omap: remove the platform_data header Tero Kristo 2020-01-16 13:53 ` Tero Kristo 2020-01-16 13:53 ` [PATCHv5 09/14] remoteproc/omap: Check for undefined mailbox messages Tero Kristo 2020-01-16 13:53 ` Tero Kristo 2020-01-16 13:53 ` [PATCHv5 10/14] remoteproc/omap: Request a timer(s) for remoteproc usage Tero Kristo 2020-01-16 13:53 ` Tero Kristo 2020-01-16 13:53 ` [PATCHv5 11/14] remoteproc/omap: add support for system suspend/resume Tero Kristo 2020-01-16 13:53 ` Tero Kristo 2020-01-16 13:53 ` [PATCHv5 12/14] remoteproc/omap: add support for runtime auto-suspend/resume Tero Kristo 2020-01-16 13:53 ` Tero Kristo 2020-01-16 13:53 ` [PATCHv5 13/14] remoteproc/omap: report device exceptions and trigger recovery Tero Kristo 2020-01-16 13:53 ` Tero Kristo 2020-01-16 13:53 ` [PATCHv5 14/14] remoteproc/omap: add watchdog functionality for remote processors Tero Kristo 2020-01-16 13:53 ` 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=20200116135332.7819-4-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=mathieu.poirier@linaro.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.