From: Mathieu Poirier <mathieu.poirier@linaro.org>
To: bjorn.andersson@linaro.org, ohad@wizery.com,
mcoquelin.stm32@gmail.com, alexandre.torgue@st.com
Cc: loic.pallardy@st.com, arnaud.pouliquen@st.com,
linux-remoteproc@vger.kernel.org,
linux-stm32@st-md-mailman.stormreply.com,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 07/12] remoteproc: stm32: Get loaded resource table for synchronisation
Date: Fri, 24 Apr 2020 14:25:00 -0600 [thread overview]
Message-ID: <20200424202505.29562-8-mathieu.poirier@linaro.org> (raw)
In-Reply-To: <20200424202505.29562-1-mathieu.poirier@linaro.org>
Get the resource table location when synchronising with the M4 so
that the remoteproc and rpmsg subsystem can be initialised properly.
Mainly based on the work published by Arnaud Pouliquen [1].
[1]. https://patchwork.kernel.org/project/linux-remoteproc/list/?series=239877
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Reviewed-by: Loic Pallardy <loic.pallardy@st.com>
---
drivers/remoteproc/stm32_rproc.c | 66 ++++++++++++++++++++++++++++++++
1 file changed, 66 insertions(+)
diff --git a/drivers/remoteproc/stm32_rproc.c b/drivers/remoteproc/stm32_rproc.c
index 89fbd2ffac93..8ba69e903851 100644
--- a/drivers/remoteproc/stm32_rproc.c
+++ b/drivers/remoteproc/stm32_rproc.c
@@ -87,6 +87,7 @@ struct stm32_rproc {
struct stm32_mbox mb[MBOX_NB_MBX];
struct workqueue_struct *workqueue;
bool secured_soc;
+ void __iomem *rsc_va;
};
static int stm32_rproc_pa_to_da(struct rproc *rproc, phys_addr_t pa, u64 *da)
@@ -654,6 +655,65 @@ static int stm32_rproc_get_m4_status(struct stm32_rproc *ddata,
return regmap_read(ddata->m4_state.map, ddata->m4_state.reg, state);
}
+static int stm32_rproc_da_to_pa(struct platform_device *pdev,
+ struct stm32_rproc *ddata,
+ u64 da, phys_addr_t *pa)
+{
+ struct device *dev = &pdev->dev;
+ struct stm32_rproc_mem *p_mem;
+ unsigned int i;
+
+ for (i = 0; i < ddata->nb_rmems; i++) {
+ p_mem = &ddata->rmems[i];
+
+ if (da < p_mem->dev_addr ||
+ da >= p_mem->dev_addr + p_mem->size)
+ continue;
+
+ *pa = da - p_mem->dev_addr + p_mem->bus_addr;
+ dev_dbg(dev, "da %llx to pa %#x\n", da, *pa);
+
+ return 0;
+ }
+
+ dev_err(dev, "can't translate da %llx\n", da);
+
+ return -EINVAL;
+}
+
+static int stm32_rproc_get_loaded_rsc_table(struct platform_device *pdev,
+ struct stm32_rproc *ddata)
+{
+ struct device *dev = &pdev->dev;
+ phys_addr_t rsc_pa;
+ u32 rsc_da;
+ int err;
+
+ err = regmap_read(ddata->rsctbl.map, ddata->rsctbl.reg, &rsc_da);
+ if (err) {
+ dev_err(dev, "failed to read rsc tbl addr\n");
+ return err;
+ }
+
+ if (!rsc_da)
+ /* no rsc table */
+ return 0;
+
+ err = stm32_rproc_da_to_pa(pdev, ddata, rsc_da, &rsc_pa);
+ if (err)
+ return err;
+
+ ddata->rsc_va = devm_ioremap_wc(dev, rsc_pa, RSC_TBL_SIZE);
+ if (IS_ERR_OR_NULL(ddata->rsc_va)) {
+ dev_err(dev, "Unable to map memory region: %pa+%zx\n",
+ &rsc_pa, RSC_TBL_SIZE);
+ ddata->rsc_va = NULL;
+ return -ENOMEM;
+ }
+
+ return 0;
+}
+
static int stm32_rproc_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
@@ -693,6 +753,12 @@ static int stm32_rproc_probe(struct platform_device *pdev)
state = M4_STATE_OFF;
}
+ if (state == M4_STATE_CRUN) {
+ ret = stm32_rproc_get_loaded_rsc_table(pdev, ddata);
+ if (ret)
+ goto free_rproc;
+ }
+
rproc->auto_boot = auto_boot;
rproc->has_iommu = false;
ddata->workqueue = create_workqueue(dev_name(dev));
--
2.20.1
next prev parent reply other threads:[~2020-04-24 20:25 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-24 20:24 [PATCH v2 00/12] remoteproc: stm32: Add support for synchronising with M4 Mathieu Poirier
2020-04-24 20:24 ` [PATCH v2 01/12] remoteproc: stm32: Decouple rproc from memory translation Mathieu Poirier
2020-05-14 4:57 ` Bjorn Andersson
2020-04-24 20:24 ` [PATCH v2 02/12] remoteproc: stm32: Request IRQ with platform device Mathieu Poirier
2020-05-14 4:57 ` Bjorn Andersson
2020-04-24 20:24 ` [PATCH v2 03/12] remoteproc: stm32: Decouple rproc from DT parsing Mathieu Poirier
2020-04-29 13:37 ` Arnaud POULIQUEN
2020-04-30 20:58 ` Mathieu Poirier
2020-05-14 4:59 ` Bjorn Andersson
2020-04-24 20:24 ` [PATCH v2 04/12] remoteproc: stm32: Remove memory translation " Mathieu Poirier
2020-05-14 5:03 ` Bjorn Andersson
2020-04-24 20:24 ` [PATCH v2 05/12] remoteproc: stm32: Parse syscon that will manage M4 synchronisation Mathieu Poirier
2020-05-14 5:03 ` Bjorn Andersson
2020-04-24 20:24 ` [PATCH v2 06/12] remoteproc: stm32: Get coprocessor state Mathieu Poirier
2020-04-29 13:38 ` Arnaud POULIQUEN
2020-05-01 17:40 ` Mathieu Poirier
2020-04-24 20:25 ` Mathieu Poirier [this message]
2020-04-24 20:25 ` [PATCH v2 08/12] remoteproc: stm32: Introduce new start ops for synchronisation Mathieu Poirier
2020-04-29 14:50 ` Arnaud POULIQUEN
2020-04-24 20:25 ` [PATCH v2 09/12] remoteproc: stm32: Update M4 state in stm32_rproc_stop() Mathieu Poirier
2020-04-29 14:52 ` Arnaud POULIQUEN
2020-04-24 20:25 ` [PATCH v2 10/12] remoteproc: stm32: Introduce new parse fw ops for synchronisation Mathieu Poirier
2020-05-14 5:13 ` Bjorn Andersson
2020-04-24 20:25 ` [PATCH v2 11/12] remoteproc: stm32: Introduce new loaded rsc " Mathieu Poirier
2020-05-14 5:15 ` Bjorn Andersson
2020-04-24 20:25 ` [PATCH v2 12/12] remoteproc: stm32: Set synchronisation state machine if needed Mathieu Poirier
2020-04-29 14:47 ` Arnaud POULIQUEN
2020-05-01 17:54 ` Mathieu Poirier
2020-04-29 15:08 ` [PATCH v2 00/12] remoteproc: stm32: Add support for synchronising with M4 Arnaud POULIQUEN
2020-05-01 17:59 ` Mathieu Poirier
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=20200424202505.29562-8-mathieu.poirier@linaro.org \
--to=mathieu.poirier@linaro.org \
--cc=alexandre.torgue@st.com \
--cc=arnaud.pouliquen@st.com \
--cc=bjorn.andersson@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=loic.pallardy@st.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=ohad@wizery.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).