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 v3 09/13] remoteproc: modify rproc_handle_carveout to support pre-registered region
Date: Thu, 1 Mar 2018 17:23:56 +0100 [thread overview]
Message-ID: <1519921440-21356-10-git-send-email-loic.pallardy@st.com> (raw)
In-Reply-To: <1519921440-21356-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 pre-registered
region. Match is done on region name, then requested device address and
length are checked.
If no name match found, original allocation is used.
Signed-off-by: Loic Pallardy <loic.pallardy@st.com>
---
drivers/remoteproc/remoteproc_core.c | 49 +++++++++++++++++++++++++++++++++++-
1 file changed, 48 insertions(+), 1 deletion(-)
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 0ebbc4f..49b28a0 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -679,7 +679,7 @@ static int rproc_handle_carveout(struct rproc *rproc,
struct fw_rsc_carveout *rsc,
int offset, int avail)
{
- struct rproc_mem_entry *carveout, *mapping = NULL;
+ struct rproc_mem_entry *carveout, *mapping = NULL, *mem;
struct device *dev = &rproc->dev;
dma_addr_t dma;
void *va;
@@ -699,6 +699,51 @@ static int rproc_handle_carveout(struct rproc *rproc,
dev_dbg(dev, "carveout rsc: name: %s, da 0x%x, pa 0x%x, len 0x%x, flags 0x%x\n",
rsc->name, rsc->da, rsc->pa, rsc->len, rsc->flags);
+ /* Check carveout rsc already part of a registered carveout */
+ /* Search by name */
+ mem = rproc_find_carveout_by_name(rproc, rsc->name);
+ if (mem) {
+ int delta = 0;
+
+ if (rsc->da != FW_RSC_ADDR_ANY) {
+ delta = rsc->da - mem->da;
+
+ /* Check requested resource belongs to registered carveout */
+ if (delta < 0) {
+ dev_err(dev->parent,
+ "Registered carveout doesn't fit da request\n");
+ return -ENOMEM;
+ }
+
+ if (delta + rsc->len > mem->len) {
+ dev_err(dev->parent,
+ "Registered carveout doesn't fit len request\n");
+ return -ENOMEM;
+ }
+ } else {
+ /* Check requested resource length */
+ if (rsc->len > mem->len) {
+ dev_err(dev->parent,
+ "Registered carveout doesn't fit len request\n");
+ return -ENOMEM;
+ }
+ /* Update resource da with registered resource value */
+ rsc->da = mem->da;
+ }
+
+ /*
+ * Update resource pa
+ * Use va if defined else dma to generate pa
+ */
+ if (mem->va)
+ rsc->pa = rproc_va_to_pa(mem->va) + delta;
+ else
+ rsc->pa = (u32)mem->dma + delta;
+
+ return 0;
+ }
+
+ /* No registered carveout found, allocate a new one */
va = dma_alloc_coherent(dev->parent, rsc->len, &dma, GFP_KERNEL);
if (!va) {
dev_err(dev->parent,
@@ -761,6 +806,8 @@ static int rproc_handle_carveout(struct rproc *rproc,
dev_dbg(dev, "carveout mapped 0x%x to %pad\n",
rsc->da, &dma);
+ } else {
+ rsc->da = (u32)dma;
}
/*
--
1.9.1
next prev parent reply other threads:[~2018-03-01 16:26 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-01 16:23 [PATCH v3 00/13] remoteproc: add fixed memory region support Loic Pallardy
2018-03-01 16:23 ` [PATCH v3 01/13] remoteproc: configure IOMMU only if device address requested Loic Pallardy
2018-03-01 16:23 ` [PATCH v3 02/13] remoteproc: add rproc_va_to_pa function Loic Pallardy
2018-05-10 0:11 ` Bjorn Andersson
2018-03-01 16:23 ` [PATCH v3 03/13] remoteproc: add release ops in rproc_mem_entry struct Loic Pallardy
2018-05-10 0:53 ` Bjorn Andersson
2018-03-01 16:23 ` [PATCH v3 04/13] remoteproc: add name " Loic Pallardy
2018-05-10 0:12 ` Bjorn Andersson
2018-03-01 16:23 ` [PATCH v3 05/13] remoteproc: add helper function to allocate and init " Loic Pallardy
2018-03-01 16:23 ` [PATCH v3 06/13] remoteproc: introduce rproc_add_carveout function Loic Pallardy
2018-05-10 0:56 ` Bjorn Andersson
2018-03-01 16:23 ` [PATCH v3 07/13] remoteproc: introduce rproc_find_carveout_by_name function Loic Pallardy
2018-05-10 0:19 ` Bjorn Andersson
2018-05-14 14:40 ` Loic PALLARDY
2018-03-01 16:23 ` [PATCH v3 08/13] remoteproc: add prepare and unprepare ops Loic Pallardy
2018-05-10 0:52 ` Bjorn Andersson
2018-05-14 15:03 ` Loic PALLARDY
2018-10-24 3:12 ` Suman Anna
2018-03-01 16:23 ` Loic Pallardy [this message]
2018-05-10 0:42 ` [PATCH v3 09/13] remoteproc: modify rproc_handle_carveout to support pre-registered region Bjorn Andersson
2018-05-14 14:52 ` Loic PALLARDY
2018-03-01 16:23 ` [PATCH v3 10/13] remoteproc: modify vring allocation " Loic Pallardy
2018-05-10 0:59 ` Bjorn Andersson
2018-05-14 15:43 ` Loic PALLARDY
2018-03-01 16:23 ` [PATCH v3 11/13] remoteproc: create vdev subdevice with specific dma memory pool Loic Pallardy
2018-05-10 1:06 ` Bjorn Andersson
2018-05-14 15:57 ` Loic PALLARDY
2018-03-01 16:23 ` [PATCH v3 12/13] rpmsg: virtio: allocate buffer from parent Loic Pallardy
2018-03-01 16:24 ` [PATCH v3 13/13] remoteproc: st: add reserved memory support Loic Pallardy
2018-04-03 12:04 ` [PATCH v3 00/13] remoteproc: add fixed memory region support Loic PALLARDY
2018-06-25 3:23 ` Anup Patel
2018-06-26 8:17 ` 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=1519921440-21356-10-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;
as well as URLs for NNTP newsgroup(s).