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 5/7] remoteproc: modify rproc_handle_carveout to support preallocated region
Date: Fri, 27 Oct 2017 14:44:12 +0200 [thread overview]
Message-ID: <1509108254-22296-6-git-send-email-loic.pallardy@st.com> (raw)
In-Reply-To: <1509108254-22296-1-git-send-email-loic.pallardy@st.com>
In current version rproc_handle_carveout function support only dynamic
region allocation.
This patch extends rproc_handle_carveout function to support different carveout
configurations:
- fixed DA and fixed PA: check if already part of pre-registered carveouts
(platform driver). If no, return error.
- fixed DA and any PA: check if already part of pre-allocated carveouts
(platform driver). If not found and rproc supports iommu, continue with
dynamic allocation (DA will be used for iommu programming), else return
error as no way to force DA.
- any DA and any PA: use original dynamic allocation
Signed-off-by: Loic Pallardy <loic.pallardy@st.com>
---
drivers/remoteproc/remoteproc_core.c | 40 ++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 78525d1..515a17a 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -184,6 +184,10 @@ void *rproc_da_to_va(struct rproc *rproc, u64 da, int len)
struct rproc_mem_entry *carveout;
void *ptr = NULL;
+ /*
+ * da_to_va platform driver is deprecated. Driver should register
+ * carveout thanks to rproc_add_carveout function
+ */
if (rproc->ops->da_to_va) {
ptr = rproc->ops->da_to_va(rproc, da, len);
if (ptr)
@@ -677,6 +681,7 @@ static int rproc_handle_carveout(struct rproc *rproc,
struct rproc_mem_entry *carveout, *mapping;
struct device *dev = &rproc->dev;
dma_addr_t dma;
+ phys_addr_t pa;
void *va;
int ret;
@@ -698,6 +703,41 @@ static int rproc_handle_carveout(struct rproc *rproc,
if (!carveout)
return -ENOMEM;
+ /* Check carveout rsc already part of a registered carveout */
+ if (rsc->da != FW_RSC_ADDR_ANY) {
+ va = rproc_find_carveout_by_da(rproc, rsc->da, rsc->len);
+
+ if (va) {
+ /* Registered region found */
+ pa = rproc_va_to_pa(va);
+ if (rsc->pa != FW_RSC_ADDR_ANY && rsc->pa != (u32)pa) {
+ /* Carveout doesn't match request */
+ dev_err(dev->parent,
+ "Failed to find carveout fitting da and pa\n");
+ return -ENOMEM;
+ }
+
+ /* Update rsc table with physical address */
+ rsc->pa = (u32)pa;
+
+ /* Update carveouts list */
+ carveout->va = va;
+ carveout->len = rsc->len;
+ carveout->da = rsc->da;
+ carveout->priv = (void *)CARVEOUT_RSC;
+
+ list_add_tail(&carveout->node, &rproc->carveouts);
+
+ return 0;
+ }
+
+ if (!rproc->domain) {
+ dev_err(dev->parent,
+ "Bad carveout rsc configuration\n");
+ return -ENOMEM;
+ }
+ }
+
va = dma_alloc_coherent(dev->parent, rsc->len, &dma, GFP_KERNEL);
if (!va) {
dev_err(dev->parent,
--
1.9.1
next 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 ` Loic Pallardy [this message]
2017-10-27 12:44 ` [PATCH 6/7] remoteproc: modify vring allocation to support preallocated region Loic Pallardy
2017-10-27 12:44 ` [PATCH 7/7] remoteproc: st: add reserved memory support Loic Pallardy
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-6-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®