From: "Michael S. Tsirkin" <mst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>,
Andy Shevchenko <andy@infradead.org>,
Darren Hart <dvhart@infradead.org>,
Vadim Pasternak <vadimp@mellanox.com>,
platform-driver-x86@vger.kernel.org
Subject: [PATCH v8 16/19] mellanox: switch to virtio_legacy_init/size
Date: Mon, 6 Apr 2020 21:17:00 -0400 [thread overview]
Message-ID: <20200407011612.478226-17-mst@redhat.com> (raw)
In-Reply-To: <20200407011612.478226-1-mst@redhat.com>
These are used for legacy ring format, switch to APIs that make this
explicit.
Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
drivers/platform/mellanox/mlxbf-tmfifo.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/platform/mellanox/mlxbf-tmfifo.c b/drivers/platform/mellanox/mlxbf-tmfifo.c
index 5739a9669b29..f42b1fb713f1 100644
--- a/drivers/platform/mellanox/mlxbf-tmfifo.c
+++ b/drivers/platform/mellanox/mlxbf-tmfifo.c
@@ -214,7 +214,7 @@ static void mlxbf_tmfifo_free_vrings(struct mlxbf_tmfifo *fifo,
for (i = 0; i < ARRAY_SIZE(tm_vdev->vrings); i++) {
vring = &tm_vdev->vrings[i];
if (vring->va) {
- size = vring_size(vring->num, vring->align);
+ size = vring_legacy_size(vring->num, vring->align);
dma_free_coherent(tm_vdev->vdev.dev.parent, size,
vring->va, vring->dma);
vring->va = NULL;
@@ -245,7 +245,7 @@ static int mlxbf_tmfifo_alloc_vrings(struct mlxbf_tmfifo *fifo,
vring->vdev_id = tm_vdev->vdev.id.device;
dev = &tm_vdev->vdev.dev;
- size = vring_size(vring->num, vring->align);
+ size = vring_legacy_size(vring->num, vring->align);
va = dma_alloc_coherent(dev->parent, size, &dma, GFP_KERNEL);
if (!va) {
mlxbf_tmfifo_free_vrings(fifo, tm_vdev);
@@ -935,7 +935,7 @@ static int mlxbf_tmfifo_virtio_find_vqs(struct virtio_device *vdev,
vring = &tm_vdev->vrings[i];
/* zero vring */
- size = vring_size(vring->num, vring->align);
+ size = vring_legacy_size(vring->num, vring->align);
memset(vring->va, 0, size);
vq = vring_new_virtqueue(i, vring->num, vring->align, vdev,
false, false, vring->va,
--
MST
next prev parent reply other threads:[~2020-04-07 1:17 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-07 1:16 [PATCH v8 00/19] virtio: alignment issues Michael S. Tsirkin
2020-04-07 1:16 ` [PATCH v8 01/19] tools/virtio: define aligned attribute Michael S. Tsirkin
2020-04-07 1:16 ` [PATCH v8 02/19] tools/virtio: make asm/barrier.h self contained Michael S. Tsirkin
2020-04-07 1:16 ` [PATCH v8 03/19] tools/virtio: define __KERNEL__ Michael S. Tsirkin
2020-04-07 1:16 ` [PATCH v8 04/19] virtio: add VIRTIO_RING_NO_LEGACY Michael S. Tsirkin
2020-04-07 1:16 ` [PATCH v8 05/19] virtgpu: pull in uaccess.h Michael S. Tsirkin
2020-04-07 1:16 ` [PATCH v8 06/19] virtio-rng: pull in slab.h Michael S. Tsirkin
2020-04-07 1:16 ` [PATCH v8 07/19] remoteproc: " Michael S. Tsirkin
2020-04-07 5:31 ` Bjorn Andersson
2020-04-07 1:16 ` [PATCH v8 08/19] virtio_input: " Michael S. Tsirkin
2020-04-07 1:16 ` [PATCH v8 09/19] virtio: stop using legacy struct vring in kernel Michael S. Tsirkin
2020-04-07 8:51 ` Stefan Hajnoczi
2020-04-07 1:16 ` [PATCH v8 10/19] vhost: force spec specified alignment on types Michael S. Tsirkin
2020-04-07 1:16 ` [PATCH v8 11/19] virtio: add legacy init/size APIs Michael S. Tsirkin
2020-04-07 1:16 ` [PATCH v8 12/19] virtio_ring: switch to virtio_legacy_init/size Michael S. Tsirkin
2020-04-07 1:16 ` [PATCH v8 13/19] tools/virtio: " Michael S. Tsirkin
2020-04-07 1:16 ` [PATCH v8 14/19] vop: " Michael S. Tsirkin
2020-04-07 1:16 ` [PATCH v8 15/19] remoteproc: " Michael S. Tsirkin
2020-04-07 5:30 ` Bjorn Andersson
2020-04-07 1:17 ` Michael S. Tsirkin [this message]
2020-04-07 1:17 ` [PATCH v8 17/19] vhost: option to fetch descriptors through an independent struct Michael S. Tsirkin
2020-04-07 1:17 ` [PATCH v8 18/19] vhost: use batched version by default Michael S. Tsirkin
2020-04-07 1:17 ` [PATCH v8 19/19] vhost: batching fetches Michael S. Tsirkin
2020-04-07 3:44 ` [PATCH v8 00/19] virtio: alignment issues Jason Wang
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=20200407011612.478226-17-mst@redhat.com \
--to=mst@redhat.com \
--cc=andy.shevchenko@gmail.com \
--cc=andy@infradead.org \
--cc=dvhart@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=platform-driver-x86@vger.kernel.org \
--cc=vadimp@mellanox.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).