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 03/13] remoteproc: add release ops in rproc_mem_entry struct
Date: Thu, 1 Mar 2018 17:23:50 +0100 [thread overview]
Message-ID: <1519921440-21356-4-git-send-email-loic.pallardy@st.com> (raw)
In-Reply-To: <1519921440-21356-1-git-send-email-loic.pallardy@st.com>
Memory entry could be allocated in different ways (ioremap,
dma_alloc_coherent, internal RAM allocator...).
This patch introduces a release ops in rproc_mem_entry structure
to associate dedicated release mechanism to each memory entry descriptor
in order to keep remoteproc core generic.
Signed-off-by: Loic Pallardy <loic.pallardy@st.com>
---
drivers/remoteproc/remoteproc_core.c | 23 +++++++++++++++++++++--
include/linux/remoteproc.h | 5 ++++-
2 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index eb1b779..5f11536 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -597,6 +597,24 @@ static int rproc_handle_devmem(struct rproc *rproc, struct fw_rsc_devmem *rsc,
}
/**
+ * rproc_release_carveout() - release acquired carveout
+ * @rproc: rproc handle
+ * @mem: the memory entry to release
+ *
+ * This function releases specified memory entry @mem allocated via
+ * dma_alloc_coherent() function by @rproc.
+ */
+static int rproc_release_carveout(struct rproc *rproc,
+ struct rproc_mem_entry *mem)
+{
+ struct device *dev = &rproc->dev;
+
+ /* clean up carveout allocations */
+ dma_free_coherent(dev->parent, mem->len, mem->va, mem->dma);
+ return 0;
+}
+
+/**
* rproc_handle_carveout() - handle phys contig memory allocation requests
* @rproc: rproc handle
* @rsc: the resource entry
@@ -730,6 +748,7 @@ static int rproc_handle_carveout(struct rproc *rproc,
carveout->len = rsc->len;
carveout->dma = dma;
carveout->da = rsc->da;
+ carveout->release = rproc_release_carveout;
list_add_tail(&carveout->node, &rproc->carveouts);
@@ -863,8 +882,8 @@ static void rproc_resource_cleanup(struct rproc *rproc)
/* clean up carveout allocations */
list_for_each_entry_safe(entry, tmp, &rproc->carveouts, node) {
- dma_free_coherent(dev->parent, entry->len, entry->va,
- entry->dma);
+ if (entry->release)
+ entry->release(rproc, entry);
list_del(&entry->node);
kfree(entry);
}
diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h
index 728d421..dedc138 100644
--- a/include/linux/remoteproc.h
+++ b/include/linux/remoteproc.h
@@ -305,12 +305,15 @@ struct fw_rsc_vdev {
struct fw_rsc_vdev_vring vring[0];
} __packed;
+struct rproc;
+
/**
* struct rproc_mem_entry - memory entry descriptor
* @va: virtual address
* @dma: dma address
* @len: length, in bytes
* @da: device address
+ * @release: release associated memory
* @priv: associated data
* @node: list node
*/
@@ -321,9 +324,9 @@ struct rproc_mem_entry {
u32 da;
void *priv;
struct list_head node;
+ int (*release)(struct rproc *rproc, struct rproc_mem_entry *mem);
};
-struct rproc;
struct firmware;
/**
--
1.9.1
next prev parent reply other threads:[~2018-03-01 16:27 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 ` Loic Pallardy [this message]
2018-05-10 0:53 ` [PATCH v3 03/13] remoteproc: add release ops in rproc_mem_entry struct 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 ` [PATCH v3 09/13] remoteproc: modify rproc_handle_carveout to support pre-registered region Loic Pallardy
2018-05-10 0:42 ` 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-4-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).