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>, <s-anna@ti.com>,
Loic Pallardy <loic.pallardy@st.com>
Subject: [PATCH v4 03/17] remoteproc: add release ops in rproc_mem_entry struct
Date: Fri, 27 Jul 2018 15:14:38 +0200 [thread overview]
Message-ID: <1532697292-14272-4-git-send-email-loic.pallardy@st.com> (raw)
In-Reply-To: <1532697292-14272-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>
Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
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 8e5fe1e..24fe11f 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -600,6 +600,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
@@ -733,6 +751,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);
@@ -920,8 +939,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 e3c5d85..bef2e83 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-07-27 13:16 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-27 13:14 [PATCH v4 00/17] remoteproc: add fixed memory region support Loic Pallardy
2018-07-27 13:14 ` [PATCH v4 01/17] remoteproc: configure IOMMU only if device address requested Loic Pallardy
2018-10-23 17:25 ` Suman Anna
2018-10-23 19:40 ` Loic PALLARDY
2018-10-24 3:46 ` Suman Anna
2018-10-24 12:56 ` Loic PALLARDY
2018-10-26 0:46 ` Suman Anna
2018-07-27 13:14 ` [PATCH v4 02/17] remoteproc: add rproc_va_to_pa function Loic Pallardy
2018-10-23 16:50 ` Suman Anna
2018-10-23 19:51 ` Loic PALLARDY
2018-10-24 3:19 ` Suman Anna
2018-10-24 12:58 ` Loic PALLARDY
2018-10-25 22:50 ` Suman Anna
2018-07-27 13:14 ` Loic Pallardy [this message]
2018-10-23 16:53 ` [PATCH v4 03/17] remoteproc: add release ops in rproc_mem_entry struct Suman Anna
2018-10-23 20:48 ` Suman Anna
2018-07-27 13:14 ` [PATCH v4 04/17] remoteproc: add name " Loic Pallardy
2018-10-23 17:06 ` Suman Anna
2018-07-27 13:14 ` [PATCH v4 05/17] remoteproc: add helper function to allocate and init " Loic Pallardy
2018-10-23 19:24 ` Suman Anna
2018-07-27 13:14 ` [PATCH v4 06/17] remoteproc: introduce rproc_add_carveout function Loic Pallardy
2018-10-23 17:05 ` Suman Anna
2018-10-23 19:48 ` Loic PALLARDY
2018-07-27 13:14 ` [PATCH v4 07/17] remoteproc: introduce rproc_find_carveout_by_name function Loic Pallardy
2018-10-23 19:28 ` Suman Anna
2018-07-27 13:14 ` [PATCH v4 08/17] remoteproc: add alloc ops in rproc_mem_entry struct Loic Pallardy
2018-10-23 21:20 ` Suman Anna
2018-10-24 16:00 ` Loic PALLARDY
2018-10-25 22:37 ` Suman Anna
2018-07-27 13:14 ` [PATCH v4 09/17] remoteproc: add helper function to allocate rproc_mem_entry from reserved memory Loic Pallardy
2018-07-27 13:14 ` [PATCH v4 10/17] remoteproc: add helper function to check carveout device address Loic Pallardy
2018-10-23 22:14 ` Suman Anna
2018-10-24 15:24 ` Loic PALLARDY
2018-10-25 22:50 ` Suman Anna
2018-07-27 13:14 ` [PATCH v4 11/17] remoteproc: modify rproc_handle_carveout to support pre-registered region Loic Pallardy
2018-07-27 13:14 ` [PATCH v4 12/17] remoteproc: modify vring allocation to rely on centralized carveout allocator Loic Pallardy
2018-10-10 5:32 ` Bjorn Andersson
2018-10-10 18:58 ` Loic PALLARDY
2018-10-15 6:40 ` Bjorn Andersson
2018-10-23 23:24 ` Suman Anna
2018-10-24 0:14 ` Suman Anna
2018-10-24 15:14 ` Loic PALLARDY
2018-10-29 20:17 ` Suman Anna
2018-12-04 17:56 ` Wendy Liang
2018-12-04 18:04 ` Loic PALLARDY
2018-12-04 18:58 ` Wendy Liang
2018-12-04 19:57 ` Loic PALLARDY
2018-12-04 21:24 ` Wendy Liang
2018-07-27 13:14 ` [PATCH v4 13/17] remoteproc: create vdev subdevice with specific dma memory pool Loic Pallardy
2018-09-27 17:17 ` Wendy Liang
2018-09-27 19:22 ` Loic PALLARDY
2018-09-27 20:18 ` Wendy Liang
2018-10-24 1:22 ` Suman Anna
2018-10-24 1:48 ` Suman Anna
2018-10-24 12:42 ` Loic PALLARDY
2018-10-25 22:06 ` Suman Anna
2018-10-24 12:40 ` Loic PALLARDY
2018-10-25 20:16 ` Suman Anna
2018-10-10 5:58 ` Bjorn Andersson
2018-10-10 19:17 ` Loic PALLARDY
2018-10-24 1:27 ` Suman Anna
2018-07-27 13:14 ` [PATCH v4 14/17] remoteproc: keystone: declare reserved memory region for vdev device Loic Pallardy
2018-07-27 13:14 ` [PATCH v4 15/17] remoteproc: da8xx: " Loic Pallardy
2018-10-24 2:57 ` Suman Anna
2018-10-24 13:19 ` Loic PALLARDY
2018-10-25 22:11 ` Suman Anna
2018-07-27 13:14 ` [PATCH v4 16/17] remoteproc: st: add reserved memory support Loic Pallardy
2018-10-24 3:01 ` Suman Anna
2018-10-24 12:37 ` Loic PALLARDY
2018-07-27 13:14 ` [PATCH v4 17/17] rpmsg: virtio: allocate buffer from parent Loic Pallardy
2018-09-28 7:56 ` Anup Patel
2018-09-21 6:04 ` [PATCH v4 00/17] remoteproc: add fixed memory region support Anup Patel
2018-09-26 16:00 ` Loic PALLARDY
2018-09-28 7:54 ` Anup Patel
2018-10-23 16:42 ` Suman Anna
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=1532697292-14272-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 \
--cc=s-anna@ti.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).