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 05/13] remoteproc: add helper function to allocate and init rproc_mem_entry struct
Date: Thu, 1 Mar 2018 17:23:52 +0100 [thread overview]
Message-ID: <1519921440-21356-6-git-send-email-loic.pallardy@st.com> (raw)
In-Reply-To: <1519921440-21356-1-git-send-email-loic.pallardy@st.com>
This patch introduces rproc_mem_entry_init helper function to
simplify rproc_mem_entry structure allocation and filling by
client.
Signed-off-by: Loic Pallardy <loic.pallardy@st.com>
---
drivers/remoteproc/remoteproc_core.c | 64 +++++++++++++++++++++++++++---------
include/linux/remoteproc.h | 5 +++
2 files changed, 53 insertions(+), 16 deletions(-)
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index f73a0cf..4c92b7d 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -636,7 +636,7 @@ static int rproc_handle_carveout(struct rproc *rproc,
struct fw_rsc_carveout *rsc,
int offset, int avail)
{
- struct rproc_mem_entry *carveout, *mapping;
+ struct rproc_mem_entry *carveout, *mapping = NULL;
struct device *dev = &rproc->dev;
dma_addr_t dma;
void *va;
@@ -656,16 +656,11 @@ 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);
- carveout = kzalloc(sizeof(*carveout), GFP_KERNEL);
- if (!carveout)
- return -ENOMEM;
-
va = dma_alloc_coherent(dev->parent, rsc->len, &dma, GFP_KERNEL);
if (!va) {
dev_err(dev->parent,
"failed to allocate dma memory: len 0x%x\n", rsc->len);
- ret = -ENOMEM;
- goto free_carv;
+ return -ENOMEM;
}
dev_dbg(dev, "carveout va %p, dma %pad, len 0x%x\n",
@@ -744,27 +739,64 @@ static int rproc_handle_carveout(struct rproc *rproc,
*/
rsc->pa = (u32)rproc_va_to_pa(va);
- carveout->va = va;
- carveout->len = rsc->len;
- carveout->dma = dma;
- carveout->da = rsc->da;
- carveout->release = rproc_release_carveout;
- strlcpy(carveout->name, rsc->name, sizeof(carveout->name));
+ carveout = rproc_mem_entry_init(dev, va, dma, rsc->len, rsc->da,
+ rproc_release_carveout, rsc->name);
+ if (!carveout)
+ goto free_carv;
list_add_tail(&carveout->node, &rproc->carveouts);
return 0;
+free_carv:
+ kfree(carveout);
free_mapping:
kfree(mapping);
dma_free:
dma_free_coherent(dev->parent, rsc->len, va, dma);
-free_carv:
- kfree(carveout);
return ret;
}
-/*
+/**
+ * rproc_mem_entry_init() - allocate and initialize rproc_mem_entry struct
+ * @dev: pointer on device struct
+ * @va: virtual address
+ * @dma: dma address
+ * @len: memory carveout length
+ * @da: device address
+ * @release: memory carveout function
+ * @name: carveout name
+ *
+ * This function allocates a rproc_mem_entry struct and fill it with parameters
+ * provided by client.
+ */
+struct rproc_mem_entry *rproc_mem_entry_init(struct device *dev,
+ void *va, dma_addr_t dma, int len, u32 da,
+ int (*release)(struct rproc *, struct rproc_mem_entry *),
+ const char *name, ...)
+{
+ struct rproc_mem_entry *mem;
+ va_list args;
+
+ mem = devm_kzalloc(dev, sizeof(*mem), GFP_KERNEL);
+ if (!mem)
+ return ERR_PTR(-ENOMEM);
+
+ mem->va = va;
+ mem->dma = dma;
+ mem->da = da;
+ mem->len = len;
+ mem->release = release;
+
+ va_start(args, name);
+ snprintf(mem->name, sizeof(mem->name), name, args);
+ va_end(args);
+
+ return mem;
+}
+EXPORT_SYMBOL(rproc_mem_entry_init);
+
+/**
* A lookup table for resource handlers. The indices are defined in
* enum fw_resource_type.
*/
diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h
index 2202c08..59b60f1 100644
--- a/include/linux/remoteproc.h
+++ b/include/linux/remoteproc.h
@@ -536,6 +536,11 @@ struct rproc *rproc_alloc(struct device *dev, const char *name,
int rproc_del(struct rproc *rproc);
void rproc_free(struct rproc *rproc);
+struct rproc_mem_entry *rproc_mem_entry_init(struct device *dev,
+ void *va, dma_addr_t dma, int len, u32 da,
+ int (*release)(struct rproc *, struct rproc_mem_entry *),
+ const char *name, ...);
+
int rproc_boot(struct rproc *rproc);
void rproc_shutdown(struct rproc *rproc);
void rproc_report_crash(struct rproc *rproc, enum rproc_crash_type type);
--
1.9.1
next prev parent reply other threads:[~2018-03-01 16:24 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 ` Loic Pallardy [this message]
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-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;
as well as URLs for NNTP newsgroup(s).