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 v2 13/16] remoteproc: look-up memory-device for virtio device allocation
Date: Thu, 30 Nov 2017 17:46:48 +0100 [thread overview]
Message-ID: <1512060411-729-14-git-send-email-loic.pallardy@st.com> (raw)
In-Reply-To: <1512060411-729-1-git-send-email-loic.pallardy@st.com>
This patch parse existing carveout list to find a memory area
matching on "vdev<vdev_id>buffer" name.
If found, memory device will be used as parent for vdev creation, else
rproc platform device will be used as today.
Signed-off-by: Loic Pallardy <loic.pallardy@st.com>
---
drivers/remoteproc/remoteproc_core.c | 13 +++++++++++++
drivers/remoteproc/remoteproc_virtio.c | 2 +-
include/linux/remoteproc.h | 1 +
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 6b5e2b2..9c12319 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -583,8 +583,11 @@ static int rproc_handle_vdev(struct rproc *rproc, struct fw_rsc_vdev *rsc,
{
struct device *dev = &rproc->dev;
struct rproc_vdev *rvdev;
+ struct device *memdev = dev->parent;
+ struct rproc_mem_entry *carveout;
int i, ret;
static int index;
+ char name[16];
/* make sure resource isn't truncated */
if (sizeof(*rsc) + rsc->num_of_vrings * sizeof(struct fw_rsc_vdev_vring)
@@ -637,6 +640,16 @@ static int rproc_handle_vdev(struct rproc *rproc, struct fw_rsc_vdev *rsc,
list_add_tail(&rvdev->node, &rproc->rvdevs);
+ /* Find associated registered carveout. */
+ /* Try dedicated vdev buffer pool. */
+ snprintf(name, sizeof(name), "vdev%dbuffer", rvdev->index);
+ carveout = rproc_find_carveout_by_name(rproc, name);
+
+ if (carveout && carveout->memdev)
+ memdev = &carveout->memdev->dev;
+
+ rvdev->dev = memdev;
+
rproc_add_subdev(rproc, &rvdev->subdev,
rproc_vdev_do_probe, rproc_vdev_do_remove);
diff --git a/drivers/remoteproc/remoteproc_virtio.c b/drivers/remoteproc/remoteproc_virtio.c
index 2946348..1f7a444 100644
--- a/drivers/remoteproc/remoteproc_virtio.c
+++ b/drivers/remoteproc/remoteproc_virtio.c
@@ -303,7 +303,7 @@ static void rproc_virtio_dev_release(struct device *dev)
int rproc_add_virtio_dev(struct rproc_vdev *rvdev, int id)
{
struct rproc *rproc = rvdev->rproc;
- struct device *dev = &rproc->dev;
+ struct device *dev = rvdev->dev;
struct virtio_device *vdev = &rvdev->vdev;
int ret;
diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h
index fb293d3..b3d6656 100644
--- a/include/linux/remoteproc.h
+++ b/include/linux/remoteproc.h
@@ -506,6 +506,7 @@ struct rproc_vdev {
struct kref refcount;
struct rproc_subdev subdev;
+ struct device *dev;
unsigned int id;
unsigned int index;
--
1.9.1
next prev parent reply other threads:[~2017-11-30 16:48 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-30 16:46 [PATCH v2 00/16] remoteproc: add fixed memory region support Loic Pallardy
2017-11-30 16:46 ` [PATCH v2 01/16] remoteproc: add rproc_va_to_pa function Loic Pallardy
2017-12-14 0:30 ` Bjorn Andersson
2018-01-12 7:43 ` Loic PALLARDY
2017-11-30 16:46 ` [PATCH v2 02/16] remoteproc: add release ops in rproc_mem_entry struct Loic Pallardy
2017-12-14 0:34 ` Bjorn Andersson
2018-01-12 7:43 ` Loic PALLARDY
2017-11-30 16:46 ` [PATCH v2 03/16] remoteproc: introduce rproc_add_carveout function Loic Pallardy
2017-12-14 0:36 ` Bjorn Andersson
2018-01-12 7:45 ` Loic PALLARDY
2017-11-30 16:46 ` [PATCH v2 04/16] remoteproc: introduce rproc_find_carveout_by_da Loic Pallardy
2017-12-14 0:45 ` Bjorn Andersson
2018-01-12 7:48 ` Loic PALLARDY
2017-11-30 16:46 ` [PATCH v2 05/16] remoteproc: modify rproc_handle_carveout to support preallocated region Loic Pallardy
2017-12-14 0:59 ` Bjorn Andersson
2018-01-12 7:56 ` Loic PALLARDY
2018-10-23 17:40 ` Suman Anna
2018-10-23 19:09 ` Loic PALLARDY
2018-10-23 19:12 ` Suman Anna
2017-11-30 16:46 ` [PATCH v2 06/16] remoteproc: modify vring allocation " Loic Pallardy
2017-12-14 1:09 ` Bjorn Andersson
2018-01-12 8:13 ` Loic PALLARDY
2017-11-30 16:46 ` [PATCH v2 07/16] remoteproc: st: add reserved memory support Loic Pallardy
2017-12-14 1:15 ` Bjorn Andersson
2018-01-12 8:19 ` Loic PALLARDY
2017-11-30 16:46 ` [PATCH v2 08/16] remoteproc: add name in rproc_mem_entry struct Loic Pallardy
2017-12-14 1:21 ` Bjorn Andersson
2018-01-12 8:19 ` Loic PALLARDY
2017-11-30 16:46 ` [PATCH v2 09/16] remoteproc: add memory device management support Loic Pallardy
2017-11-30 16:46 ` [PATCH v2 10/16] remoteproc: add memory device registering in rproc_add_carveout Loic Pallardy
2017-12-14 1:29 ` Bjorn Andersson
2018-01-15 9:09 ` Loic PALLARDY
2017-11-30 16:46 ` [PATCH v2 11/16] remoteproc: introduce rproc_find_carveout_by_name function Loic Pallardy
2017-12-14 1:32 ` Bjorn Andersson
2018-01-15 9:10 ` Loic PALLARDY
2017-11-30 16:46 ` [PATCH v2 12/16] remoteproc: look-up memory-device for vring allocation Loic Pallardy
2017-12-14 1:44 ` Bjorn Andersson
2018-01-15 20:44 ` Loic PALLARDY
2017-11-30 16:46 ` Loic Pallardy [this message]
2017-12-14 5:32 ` [PATCH v2 13/16] remoteproc: look-up memory-device for virtio device allocation Bjorn Andersson
2018-01-15 20:57 ` Loic PALLARDY
2017-11-30 16:46 ` [PATCH v2 14/16] remoteproc: look-up pre-registered carveout by name for carveout allocation Loic Pallardy
2017-12-14 5:34 ` Bjorn Andersson
2018-01-15 20:59 ` Loic PALLARDY
2017-11-30 16:46 ` [PATCH v2 15/16] remoteproc: st: associate memory device to memory regions Loic Pallardy
2017-12-14 5:37 ` Bjorn Andersson
2018-01-15 21:04 ` Loic PALLARDY
2017-11-30 16:46 ` [PATCH v2 16/16] rpmsg: virtio: allocate buffer from parent 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=1512060411-729-14-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).