From: "Michael S. Tsirkin" <mst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Ohad Ben-Cohen <ohad@wizery.com>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
linux-remoteproc@vger.kernel.org
Subject: [PATCH v6 11/12] remoteproc: switch to virtio_legacy_init/size
Date: Mon, 6 Apr 2020 18:26:50 -0400 [thread overview]
Message-ID: <20200406222507.281867-12-mst@redhat.com> (raw)
In-Reply-To: <20200406222507.281867-1-mst@redhat.com>
These are used for legacy ring format, switch to APIs that make this
explicit.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
maintainers, pls ack merging this through virtio tree due to dependency
on previous patches in the patchset.
drivers/remoteproc/remoteproc_core.c | 2 +-
drivers/remoteproc/remoteproc_virtio.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 097f33e4f1f3..c350a01e6c4e 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -322,7 +322,7 @@ int rproc_alloc_vring(struct rproc_vdev *rvdev, int i)
struct rproc_mem_entry *mem;
/* actual size of vring (in bytes) */
- size = PAGE_ALIGN(vring_size(rvring->len, rvring->align));
+ size = PAGE_ALIGN(vring_legacy_size(rvring->len, rvring->align));
rsc = (void *)rproc->table_ptr + rvdev->rsc_offset;
diff --git a/drivers/remoteproc/remoteproc_virtio.c b/drivers/remoteproc/remoteproc_virtio.c
index 8c07cb2ca8ba..35b02468197a 100644
--- a/drivers/remoteproc/remoteproc_virtio.c
+++ b/drivers/remoteproc/remoteproc_virtio.c
@@ -95,7 +95,7 @@ static struct virtqueue *rp_find_vq(struct virtio_device *vdev,
len = rvring->len;
/* zero vring */
- size = vring_size(len, rvring->align);
+ size = vring_legacy_size(len, rvring->align);
memset(addr, 0, size);
dev_dbg(dev, "vring%d: va %pK qsz %d notifyid %d\n",
--
MST
next prev parent reply other threads:[~2020-04-06 22:27 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-06 22:26 [PATCH v6 00/12] virtio: alignment issues Michael S. Tsirkin
2020-04-06 22:26 ` [PATCH v6 01/12] tools/virtio: define aligned attribute Michael S. Tsirkin
2020-04-06 22:26 ` [PATCH v6 02/12] tools/virtio: make asm/barrier.h self contained Michael S. Tsirkin
2020-04-06 22:26 ` [PATCH v6 03/12] tools/virtio: define __KERNEL__ Michael S. Tsirkin
2020-04-06 22:26 ` [PATCH v6 04/12] virtio: add VIRTIO_RING_NO_LEGACY Michael S. Tsirkin
2020-04-06 22:26 ` [PATCH v6 05/12] virtio: stop using legacy struct vring in kernel Michael S. Tsirkin
2020-04-06 22:26 ` [PATCH v6 06/12] vhost: force spec specified alignment on types Michael S. Tsirkin
2020-04-06 22:26 ` [PATCH v6 07/12] virtio: add legacy init/size APIs Michael S. Tsirkin
2020-04-06 22:26 ` [PATCH v6 08/12] virtio_ring: switch to virtio_legacy_init/size Michael S. Tsirkin
2020-04-06 22:26 ` [PATCH v6 09/12] tools/virtio: " Michael S. Tsirkin
2020-04-06 22:26 ` [PATCH v6 10/12] vop: " Michael S. Tsirkin
2020-04-06 22:28 ` Dixit, Ashutosh
2020-04-06 22:26 ` Michael S. Tsirkin [this message]
2020-04-06 22:26 ` [PATCH v6 12/12] mellanox: " Michael S. Tsirkin
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=20200406222507.281867-12-mst@redhat.com \
--to=mst@redhat.com \
--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).