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

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

rpmsg: virtio_rpmsg: set rpmsg_buf_size customizable 



Rpmsg buffer size is currently fixed to 512 bytes.
This patch introduces a new capability in struct virtproc_info
to tune shared buffer size between host and coprocessor
according to the needs.

Acked-by: default avatarSuman Anna <s-anna@ti.com>
Signed-off-by: default avatarLoic Pallardy <loic.pallardy@st.com>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent e156aba0

drivers/rpmsg/virtio_rpmsg_bus.c

+13 −9
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
 * @rbufs:	kernel address of rx buffers

 * @sbufs:	kernel address of tx buffers

 * @num_bufs:	total number of buffers for rx and tx

 * @buf_size:   size of one rx or tx buffer

 * @last_sbuf:	index of last tx buffer used

 * @bufs_dma:	dma base addr of the buffers

 * @tx_lock:	protects svq, sbufs and sleepers, to allow concurrent senders.
@@ -65,6 +66,7 @@ struct virtproc_info { 
	struct virtqueue *rvq, *svq;

	void *rbufs, *sbufs;

	unsigned int num_bufs;

	unsigned int buf_size;

	int last_sbuf;

	dma_addr_t bufs_dma;

	struct mutex tx_lock;
@@ -158,7 +160,7 @@ struct virtio_rpmsg_channel { 
 * processor.

 */

#define MAX_RPMSG_NUM_BUFS	(512)

#define RPMSG_BUF_SIZE		(512)

#define MAX_RPMSG_BUF_SIZE	(512)



/*

 * Local addresses are dynamically allocated on-demand.
@@ -435,7 +437,7 @@ static void *get_a_tx_buf(struct virtproc_info *vrp) 
	 * (half of our buffers are used for sending messages)

	 */

	if (vrp->last_sbuf < vrp->num_bufs / 2)

		ret = vrp->sbufs + RPMSG_BUF_SIZE * vrp->last_sbuf++;

		ret = vrp->sbufs + vrp->buf_size * vrp->last_sbuf++;

	/* or recycle a used one */

	else

		ret = virtqueue_get_buf(vrp->svq, &len);
@@ -561,7 +563,7 @@ static int rpmsg_send_offchannel_raw(struct rpmsg_device *rpdev, 
	 * messaging), or to improve the buffer allocator, to support

	 * variable-length buffer sizes.

	 */

	if (len > RPMSG_BUF_SIZE - sizeof(struct rpmsg_hdr)) {

	if (len > vrp->buf_size - sizeof(struct rpmsg_hdr)) {

		dev_err(dev, "message is too big (%d)\n", len);

		return -EMSGSIZE;

	}
@@ -701,7 +703,7 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev, 
	 * We currently use fixed-sized buffers, so trivially sanitize

	 * the reported payload length.

	 */

	if (len > RPMSG_BUF_SIZE ||

	if (len > vrp->buf_size ||

	    msg->len > (len - sizeof(struct rpmsg_hdr))) {

		dev_warn(dev, "inbound msg too big: (%d, %d)\n", len, msg->len);

		return -EINVAL;
@@ -734,7 +736,7 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev, 
		dev_warn(dev, "msg received with no recipient\n");



	/* publish the real size of the buffer */

	sg_init_one(&sg, msg, RPMSG_BUF_SIZE);

	sg_init_one(&sg, msg, vrp->buf_size);



	/* add the buffer back to the remote processor's virtqueue */

	err = virtqueue_add_inbuf(vrp->rvq, &sg, 1, msg, GFP_KERNEL);
@@ -891,7 +893,9 @@ static int rpmsg_probe(struct virtio_device *vdev) 
	else

		vrp->num_bufs = MAX_RPMSG_NUM_BUFS;



	total_buf_space = vrp->num_bufs * RPMSG_BUF_SIZE;

	vrp->buf_size = MAX_RPMSG_BUF_SIZE;



	total_buf_space = vrp->num_bufs * vrp->buf_size;



	/* allocate coherent memory for the buffers */

	bufs_va = dma_alloc_coherent(vdev->dev.parent->parent,
@@ -914,9 +918,9 @@ static int rpmsg_probe(struct virtio_device *vdev) 
	/* set up the receive buffers */

	for (i = 0; i < vrp->num_bufs / 2; i++) {

		struct scatterlist sg;

		void *cpu_addr = vrp->rbufs + i * RPMSG_BUF_SIZE;

		void *cpu_addr = vrp->rbufs + i * vrp->buf_size;



		sg_init_one(&sg, cpu_addr, RPMSG_BUF_SIZE);

		sg_init_one(&sg, cpu_addr, vrp->buf_size);



		err = virtqueue_add_inbuf(vrp->rvq, &sg, 1, cpu_addr,

					  GFP_KERNEL);
@@ -981,7 +985,7 @@ static int rpmsg_remove_device(struct device *dev, void *data) 
static void rpmsg_remove(struct virtio_device *vdev)

{

	struct virtproc_info *vrp = vdev->priv;

	size_t total_buf_space = vrp->num_bufs * RPMSG_BUF_SIZE;

	size_t total_buf_space = vrp->num_bufs * vrp->buf_size;

	int ret;



	vdev->config->reset(vdev);