From: "Michael S. Tsirkin" <mst@redhat.com> To: linux-kernel@vger.kernel.org Cc: Andy Shevchenko <andy@infradead.org>, Darren Hart <dvhart@infradead.org>, Vadim Pasternak <vadimp@mellanox.com>, platform-driver-x86@vger.kernel.org Subject: [PATCH v4 12/12] mellanox: switch to virtio_legacy_init/size Date: Mon, 6 Apr 2020 17:02:17 -0400 [thread overview] Message-ID: <20200406210108.148131-13-mst@redhat.com> (raw) In-Reply-To: <20200406210108.148131-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> --- 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
WARNING: multiple messages have this Message-ID (diff)
From: "Michael S. Tsirkin" <mst@redhat.com> To: linux-kernel@vger.kernel.org Cc: Andy Shevchenko <andy@infradead.org>, Darren Hart <dvhart@infradead.org>, Vadim Pasternak <vadimp@mellanox.com>, platform-driver-x86@vger.kernel.org Subject: [PATCH v4 12/12] mellanox: switch to virtio_legacy_init/size Date: Mon, 6 Apr 2020 17:34:50 -0400 [thread overview] Message-ID: <20200406210108.148131-13-mst@redhat.com> (raw) Message-ID: <20200406213450.0eSIncp3KeEpZIjG1pKUaBQIB-lDYmJsRLk0a0uAxDA@z> (raw) In-Reply-To: <20200406210108.148131-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> --- 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-06 21:02 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-06 21:01 [PATCH v4 00/12] virtio: alignment issues Michael S. Tsirkin 2020-04-06 21:01 ` [PATCH v4 01/12] tools/virtio: define aligned attribute Michael S. Tsirkin 2020-04-06 21:34 ` Michael S. Tsirkin 2020-04-06 21:01 ` [PATCH v4 02/12] tools/virtio: make asm/barrier.h self contained Michael S. Tsirkin 2020-04-06 21:34 ` Michael S. Tsirkin 2020-04-06 21:01 ` [PATCH v4 03/12] tools/virtio: define __KERNEL__ Michael S. Tsirkin 2020-04-06 21:34 ` Michael S. Tsirkin 2020-04-06 21:01 ` [PATCH v4 04/12] virtio: add VIRTIO_RING_NO_LEGACY Michael S. Tsirkin 2020-04-06 21:34 ` Michael S. Tsirkin 2020-04-06 21:02 ` [PATCH v4 05/12] virtio: stop using legacy struct vring in kernel Michael S. Tsirkin 2020-04-06 21:34 ` Michael S. Tsirkin 2020-04-06 21:02 ` [PATCH v4 06/12] vhost: force spec specified alignment on types Michael S. Tsirkin 2020-04-06 21:34 ` Michael S. Tsirkin 2020-04-06 21:02 ` [PATCH v4 07/12] virtio: add legacy init/size APIs Michael S. Tsirkin 2020-04-06 21:34 ` Michael S. Tsirkin 2020-04-06 21:02 ` [PATCH v4 08/12] virtio_ring: switch to virtio_legacy_init/size Michael S. Tsirkin 2020-04-06 21:34 ` Michael S. Tsirkin 2020-04-06 21:02 ` [PATCH v4 09/12] tools/virtio: " Michael S. Tsirkin 2020-04-06 21:34 ` Michael S. Tsirkin 2020-04-06 21:02 ` [PATCH v4 10/12] vop: " Michael S. Tsirkin 2020-04-06 21:34 ` Michael S. Tsirkin 2020-04-06 21:02 ` [PATCH v4 11/12] remoteproc: " Michael S. Tsirkin 2020-04-06 21:34 ` Michael S. Tsirkin 2020-04-06 21:02 ` Michael S. Tsirkin [this message] 2020-04-06 21:34 ` [PATCH v4 12/12] mellanox: " Michael S. Tsirkin 2020-04-06 21:34 ` [PATCH v4 00/12] virtio: alignment issues 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=20200406210108.148131-13-mst@redhat.com \ --to=mst@redhat.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: linkBe 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).