lkml.org 
[lkml]   [2017]   [Feb]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v3 5/6] rpmsg: virtio_rpmsg: don't allocate buffer if provided by low level driver
Date
Low level platform specific driver has the knowledge of the different
communication link constraints like fixed or secured memory region to
use for buffer allocation.

If virtual address is defined in virtio_rpmsg_cfg structure, a dedicated
memory pool buffer fitting platform requirements is available.
Rpmsg virtio layer should rely on it if its size is compliant with link
characteristics.

Signed-off-by: Loic Pallardy <loic.pallardy@st.com>
---
Changes since V1:
- Alignment with open parenthesis.
- Add vrp->bufs_dma intialization in virtio_rpmsg_get_config function

Changes since V2:
- Fix warnings reported by kbuild test robot
---
drivers/rpmsg/virtio_rpmsg_bus.c | 59 ++++++++++++++++++++++++++--------------
1 file changed, 39 insertions(+), 20 deletions(-)

diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c
index 080ee07..b347e34 100644
--- a/drivers/rpmsg/virtio_rpmsg_bus.c
+++ b/drivers/rpmsg/virtio_rpmsg_bus.c
@@ -57,6 +57,7 @@
* @sendq: wait queue of sending contexts waiting for a tx buffers
* @sleepers: number of senders that are waiting for a tx buffer
* @ns_ept: the bus's name service endpoint
+ * @ext_buffer: buffer allocated by low level driver
*
* This structure stores the rpmsg state of a given virtio remote processor
* device (there might be several virtio proc devices for each physical
@@ -76,6 +77,7 @@ struct virtproc_info {
wait_queue_head_t sendq;
atomic_t sleepers;
struct rpmsg_endpoint *ns_ept;
+ bool ext_buffer;
};

/* The feature bitmap for virtio rpmsg */
@@ -893,6 +895,7 @@ static int virtio_rpmsg_get_config(struct virtio_device *vdev)
ret = -EINVAL;
goto out;
}
+ vrp->bufs_dma = virtio_cfg.pa;

/* Check rpmsg buffer length */
total_buf_space = vrp->num_bufs * vrp->buf_size;
@@ -903,6 +906,17 @@ static int virtio_rpmsg_get_config(struct virtio_device *vdev)
ret = -ENOMEM;
goto out;
}
+
+ /* Level platform specific buffer driver ? */
+ if (virtio_cfg.va != -1) {
+ vrp->ext_buffer = true;
+ /* half of the buffers is dedicated for RX */
+ vrp->rbufs = (void *)(uintptr_t)virtio_cfg.va;
+
+ /* and half is dedicated for TX */
+ vrp->sbufs = (void *)(uintptr_t)virtio_cfg.va + total_buf_space / 2;
+ }
+
return !ret;
}
out:
@@ -915,9 +929,9 @@ static int rpmsg_probe(struct virtio_device *vdev)
static const char * const names[] = { "input", "output" };
struct virtqueue *vqs[2];
struct virtproc_info *vrp;
- void *bufs_va;
+ void *bufs_va = NULL;
int err = 0, i;
- size_t total_buf_space;
+ size_t total_buf_space = 0;
bool notify;

vrp = kzalloc(sizeof(*vrp), GFP_KERNEL);
@@ -958,25 +972,28 @@ static int rpmsg_probe(struct virtio_device *vdev)
if (err < 0)
goto free_vrp;

- total_buf_space = vrp->num_bufs * vrp->buf_size;
+ /* Allocate buffer if none provided by low level platform driver */
+ if (!vrp->ext_buffer) {
+ total_buf_space = vrp->num_bufs * vrp->buf_size;

/* allocate coherent memory for the buffers */
- bufs_va = dma_alloc_coherent(vdev->dev.parent->parent,
- total_buf_space, &vrp->bufs_dma,
- GFP_KERNEL);
- if (!bufs_va) {
- err = -ENOMEM;
- goto vqs_del;
- }
+ bufs_va = dma_alloc_coherent(vdev->dev.parent->parent,
+ total_buf_space, &vrp->bufs_dma,
+ GFP_KERNEL);
+ if (!bufs_va) {
+ err = -ENOMEM;
+ goto vqs_del;
+ }

- dev_dbg(&vdev->dev, "buffers: va %p, dma %pad\n",
- bufs_va, &vrp->bufs_dma);
+ dev_dbg(&vdev->dev, "buffers: va %p, dma %pad\n",
+ bufs_va, &vrp->bufs_dma);

- /* half of the buffers is dedicated for RX */
- vrp->rbufs = bufs_va;
+ /* half of the buffers is dedicated for RX */
+ vrp->rbufs = bufs_va;

- /* and half is dedicated for TX */
- vrp->sbufs = bufs_va + total_buf_space / 2;
+ /* and half is dedicated for TX */
+ vrp->sbufs = bufs_va + total_buf_space / 2;
+ }

/* set up the receive buffers */
for (i = 0; i < vrp->num_bufs / 2; i++) {
@@ -1027,8 +1044,9 @@ static int rpmsg_probe(struct virtio_device *vdev)
return 0;

free_coherent:
- dma_free_coherent(vdev->dev.parent->parent, total_buf_space,
- bufs_va, vrp->bufs_dma);
+ if (!vrp->ext_buffer)
+ dma_free_coherent(vdev->dev.parent->parent, total_buf_space,
+ bufs_va, vrp->bufs_dma);
vqs_del:
vdev->config->del_vqs(vrp->vdev);
free_vrp:
@@ -1062,8 +1080,9 @@ static void rpmsg_remove(struct virtio_device *vdev)

vdev->config->del_vqs(vrp->vdev);

- dma_free_coherent(vdev->dev.parent->parent, total_buf_space,
- vrp->rbufs, vrp->bufs_dma);
+ if (!vrp->ext_buffer)
+ dma_free_coherent(vdev->dev.parent->parent, total_buf_space,
+ vrp->rbufs, vrp->bufs_dma);

kfree(vrp);
}
--
1.9.1
\
 
 \ /
  Last update: 2017-02-01 16:09    [W:0.040 / U:5.628 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site