Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d999b622 authored by Loic Pallardy's avatar Loic Pallardy Committed by Bjorn Andersson
Browse files

rpmsg: virtio: allocate buffer from parent 



Remoteproc is now capable to create one specific sub-device per
virtio link to associate a dedicated memory pool.
This implies to change device used by virtio_rpmsg for
buffer allocation from grand-parent to parent.

Signed-off-by: default avatarLoic Pallardy <loic.pallardy@st.com>
Reviewed-by: default avatarAnup Patel <anup@brainfault.org>
Tested-by: default avatarAnup Patel <anup@brainfault.org>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent 3df52ed7

drivers/rpmsg/virtio_rpmsg_bus.c

+3 −3
Original line number Diff line number Diff line
@@ -912,7 +912,7 @@ static int rpmsg_probe(struct virtio_device *vdev) 
	total_buf_space = vrp->num_bufs * vrp->buf_size;



	/* allocate coherent memory for the buffers */

	bufs_va = dma_alloc_coherent(vdev->dev.parent->parent,

	bufs_va = dma_alloc_coherent(vdev->dev.parent,

				     total_buf_space, &vrp->bufs_dma,

				     GFP_KERNEL);

	if (!bufs_va) {
@@ -980,7 +980,7 @@ static int rpmsg_probe(struct virtio_device *vdev) 
	return 0;



free_coherent:

	dma_free_coherent(vdev->dev.parent->parent, total_buf_space,

	dma_free_coherent(vdev->dev.parent, total_buf_space,

			  bufs_va, vrp->bufs_dma);

vqs_del:

	vdev->config->del_vqs(vrp->vdev);
@@ -1015,7 +1015,7 @@ static void rpmsg_remove(struct virtio_device *vdev) 


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



	dma_free_coherent(vdev->dev.parent->parent, total_buf_space,

	dma_free_coherent(vdev->dev.parent, total_buf_space,

			  vrp->rbufs, vrp->bufs_dma);



	kfree(vrp);