Commit c2a052a4 authored by Xuan Zhuo's avatar Xuan Zhuo Committed by Michael S. Tsirkin
Browse files

remoteproc: rename len of rpoc_vring to num 



Rename the member len in the structure rpoc_vring to num. And remove 'in
bytes' from the comment of it. This is misleading. Because this actually
refers to the size of the virtio vring to be created. The unit is not
bytes.

Signed-off-by: default avatarXuan Zhuo <xuanzhuo@linux.alibaba.com>
Message-Id: <20220624025621.128843-2-xuanzhuo@linux.alibaba.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 3d7cb6b0

drivers/remoteproc/remoteproc_core.c

+2 −2
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ int rproc_alloc_vring(struct rproc_vdev *rvdev, int i) 
	size_t size;



	/* actual size of vring (in bytes) */

	size = PAGE_ALIGN(vring_size(rvring->len, rvring->align));

	size = PAGE_ALIGN(vring_size(rvring->num, rvring->align));



	rsc = (void *)rproc->table_ptr + rvdev->rsc_offset;
@@ -401,7 +401,7 @@ rproc_parse_vring(struct rproc_vdev *rvdev, struct fw_rsc_vdev *rsc, int i) 
		return -EINVAL;

	}



	rvring->len = vring->num;

	rvring->num = vring->num;

	rvring->align = vring->align;

	rvring->rvdev = rvdev;

drivers/remoteproc/remoteproc_virtio.c

+5 −5
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static struct virtqueue *rp_find_vq(struct virtio_device *vdev, 
	struct fw_rsc_vdev *rsc;

	struct virtqueue *vq;

	void *addr;

	int len, size;

	int num, size;



	/* we're temporarily limited to two virtqueues per rvdev */

	if (id >= ARRAY_SIZE(rvdev->vring))
@@ -104,20 +104,20 @@ static struct virtqueue *rp_find_vq(struct virtio_device *vdev, 


	rvring = &rvdev->vring[id];

	addr = mem->va;

	len = rvring->len;

	num = rvring->num;



	/* zero vring */

	size = vring_size(len, rvring->align);

	size = vring_size(num, rvring->align);

	memset(addr, 0, size);



	dev_dbg(dev, "vring%d: va %pK qsz %d notifyid %d\n",

		id, addr, len, rvring->notifyid);

		id, addr, num, rvring->notifyid);



	/*

	 * Create the new vq, and tell virtio we're not interested in

	 * the 'weak' smp barriers, since we're talking with a real device.

	 */

	vq = vring_new_virtqueue(id, len, rvring->align, vdev, false, ctx,

	vq = vring_new_virtqueue(id, num, rvring->align, vdev, false, ctx,

				 addr, rproc_virtio_notify, callback, name);

	if (!vq) {

		dev_err(dev, "vring_new_virtqueue %s failed\n", name);

include/linux/remoteproc.h

+2 −2
Original line number Diff line number Diff line
@@ -597,7 +597,7 @@ struct rproc_subdev { 
/**

 * struct rproc_vring - remoteproc vring state

 * @va:	virtual address

 * @len: length, in bytes

 * @num: vring size

 * @da: device address

 * @align: vring alignment

 * @notifyid: rproc-specific unique vring index
@@ -606,7 +606,7 @@ struct rproc_subdev { 
 */

struct rproc_vring {

	void *va;

	int len;

	int num;

	u32 da;

	u32 align;

	int notifyid;