From: Loic Pallardy <loic.pallardy@st.com>
To: <bjorn.andersson@linaro.org>, <ohad@wizery.com>
Cc: <linux-remoteproc@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <arnaud.pouliquen@st.com>,
<benjamin.gaignard@linaro.org>,
Loic Pallardy <loic.pallardy@st.com>
Subject: [PATCH 7/7] remoteproc: st: add reserved memory support
Date: Fri, 27 Oct 2017 14:44:14 +0200 [thread overview]
Message-ID: <1509108254-22296-8-git-send-email-loic.pallardy@st.com> (raw)
In-Reply-To: <1509108254-22296-1-git-send-email-loic.pallardy@st.com>
ST remote processor needs some specified memory regions for firmware and IPC.
Memory regions are defined as reserved memory and should be registered in
remoteproc core thanks to rproc_add_carveout function.
Memory region release is handled by ST driver itself on remove operation.
Signed-off-by: Loic Pallardy <loic.pallardy@st.com>
---
drivers/remoteproc/st_remoteproc.c | 43 +++++++++++++++++++++++++++++++-------
1 file changed, 35 insertions(+), 8 deletions(-)
diff --git a/drivers/remoteproc/st_remoteproc.c b/drivers/remoteproc/st_remoteproc.c
index aacef0e..1549ce8 100644
--- a/drivers/remoteproc/st_remoteproc.c
+++ b/drivers/remoteproc/st_remoteproc.c
@@ -19,6 +19,7 @@
#include <linux/mfd/syscon.h>
#include <linux/module.h>
#include <linux/of.h>
+#include <linux/of_address.h>
#include <linux/of_device.h>
#include <linux/of_reserved_mem.h>
#include <linux/platform_device.h>
@@ -208,8 +209,10 @@ static int st_rproc_parse_dt(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct rproc *rproc = platform_get_drvdata(pdev);
struct st_rproc *ddata = rproc->priv;
- struct device_node *np = dev->of_node;
- int err;
+ struct device_node *node, *np = dev->of_node;
+ struct resource res;
+ struct rproc_mem_entry *mem;
+ int err, count, i;
if (ddata->config->sw_reset) {
ddata->sw_reset = devm_reset_control_get_exclusive(dev,
@@ -254,10 +257,36 @@ static int st_rproc_parse_dt(struct platform_device *pdev)
return -EINVAL;
}
- err = of_reserved_mem_device_init(dev);
- if (err) {
- dev_err(dev, "Failed to obtain shared memory\n");
- return err;
+ count = of_count_phandle_with_args(np, "memory-region", NULL);
+
+ for (i = 0; i < count; i++) {
+ node = of_parse_phandle(np, "memory-region", i);
+ if (!node) {
+ dev_err(dev, "No memory-region specified\n");
+ return -EINVAL;
+ }
+
+ err = of_address_to_resource(node, 0, &res);
+ if (err) {
+ dev_err(dev, "Bad memory-region definition\n");
+ return err;
+ }
+
+ mem = devm_kzalloc(dev, sizeof(*mem), GFP_KERNEL);
+ if (!mem)
+ return -ENOMEM;
+
+ mem->dma = res.start;
+ mem->da = res.start;
+ mem->len = resource_size(&res);
+ mem->va = devm_ioremap_wc(dev, mem->dma, mem->len);
+ if (!mem->va) {
+ dev_err(dev, "Unable to map memory region: %pa+%zx\n",
+ &res.start, mem->len);
+ return -EBUSY;
+ }
+
+ rproc_add_carveout(rproc, mem);
}
err = clk_prepare(ddata->clk);
@@ -387,8 +416,6 @@ static int st_rproc_remove(struct platform_device *pdev)
clk_disable_unprepare(ddata->clk);
- of_reserved_mem_device_release(&pdev->dev);
-
for (i = 0; i < ST_RPROC_MAX_VRING * MBOX_MAX; i++)
mbox_free_channel(ddata->mbox_chan[i]);
--
1.9.1
prev parent reply other threads:[~2017-10-27 12:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-27 12:44 [PATCH 0/7] remoteproc: add fixed memory region support Loic Pallardy
2017-10-27 12:44 ` [PATCH 1/7] remoteproc: add rproc_va_to_pa function Loic Pallardy
2017-10-27 12:44 ` [PATCH 2/7] remoteproc: add release ops in rproc_mem_entry struct Loic Pallardy
2017-10-27 12:44 ` [PATCH 3/7] remoteproc: introduce rproc_add_carveout function Loic Pallardy
2017-10-27 12:44 ` [PATCH 4/7] remoteproc: introduce rproc_find_carveout_by_da Loic Pallardy
2017-10-27 12:44 ` [PATCH 5/7] remoteproc: modify rproc_handle_carveout to support preallocated region Loic Pallardy
2017-10-27 12:44 ` [PATCH 6/7] remoteproc: modify vring allocation " Loic Pallardy
2017-10-27 12:44 ` Loic Pallardy [this message]
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=1509108254-22296-8-git-send-email-loic.pallardy@st.com \
--to=loic.pallardy@st.com \
--cc=arnaud.pouliquen@st.com \
--cc=benjamin.gaignard@linaro.org \
--cc=bjorn.andersson@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--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
all inboxes | Powered by JetHome®