From: Jason Wang <jasowang@redhat.com>
To: mst@redhat.com, virtualization@lists.linux-foundation.org,
linux-kernel@vger.kernel.org
Cc: shahafs@mellanox.com, lulu@redhat.com, sgarzare@redhat.com,
rdunlap@infradead.org, Jason Wang <jasowang@redhat.com>
Subject: [PATCH V3 12/19] virtio-pci-modern: introduce helper for setting/geting queue size
Date: Mon, 4 Jan 2021 14:54:56 +0800 [thread overview]
Message-ID: <20210104065503.199631-13-jasowang@redhat.com> (raw)
In-Reply-To: <20210104065503.199631-1-jasowang@redhat.com>
This patch introduces helper for setting/getting queue size for modern
device.
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
drivers/virtio/virtio_pci_modern.c | 34 ++++++++++++++++++++++++++++--
1 file changed, 32 insertions(+), 2 deletions(-)
diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
index 0e62820b83ff..7a89226135af 100644
--- a/drivers/virtio/virtio_pci_modern.c
+++ b/drivers/virtio/virtio_pci_modern.c
@@ -262,6 +262,36 @@ static bool vp_modern_get_queue_enable(struct virtio_pci_modern_device *mdev,
return vp_ioread16(&mdev->common->queue_enable);
}
+/*
+ * vp_modern_set_queue_size - set size for a virtqueue
+ * @mdev: the modern virtio-pci device
+ * @index: the queue index
+ * @size: the size of the virtqueue
+ */
+static void vp_modern_set_queue_size(struct virtio_pci_modern_device *mdev,
+ u16 index, u16 size)
+{
+ vp_iowrite16(index, &mdev->common->queue_select);
+ vp_iowrite16(size, &mdev->common->queue_size);
+
+}
+
+/*
+ * vp_modern_get_queue_size - get size for a virtqueue
+ * @mdev: the modern virtio-pci device
+ * @index: the queue index
+ *
+ * Returns the size of the virtqueue
+ */
+static u16 vp_modern_get_queue_size(struct virtio_pci_modern_device *mdev,
+ u16 index)
+{
+ vp_iowrite16(index, &mdev->common->queue_select);
+
+ return vp_ioread16(&mdev->common->queue_size);
+
+}
+
/* virtio config->finalize_features() implementation */
static int vp_finalize_features(struct virtio_device *vdev)
{
@@ -487,7 +517,7 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev,
vp_iowrite16(index, &cfg->queue_select);
/* Check if queue is either not available or already active. */
- num = vp_ioread16(&cfg->queue_size);
+ num = vp_modern_get_queue_size(mdev, index);
if (!num || vp_modern_get_queue_enable(mdev, index))
return ERR_PTR(-ENOENT);
@@ -510,7 +540,7 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev,
return ERR_PTR(-ENOMEM);
/* activate the queue */
- vp_iowrite16(virtqueue_get_vring_size(vq), &cfg->queue_size);
+ vp_modern_set_queue_size(mdev, index, virtqueue_get_vring_size(vq));
vp_modern_queue_address(mdev, index, virtqueue_get_desc_addr(vq),
virtqueue_get_avail_addr(vq),
virtqueue_get_used_addr(vq));
--
2.25.1
next prev parent reply other threads:[~2021-01-04 6:57 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-04 6:54 [PATCH V3 00/19] vDPA driver for virtio-pci device Jason Wang
2021-01-04 6:54 ` [PATCH V3 01/19] virtio-pci: do not access iomem via struct virtio_pci_device directly Jason Wang
2021-01-04 6:54 ` [PATCH V3 02/19] virtio-pci: split out modern device Jason Wang
2021-01-04 6:54 ` [PATCH V3 03/19] virtio-pci-modern: factor out modern device initialization logic Jason Wang
2021-01-04 6:54 ` [PATCH V3 04/19] virtio-pci-modern: introduce vp_modern_remove() Jason Wang
2021-01-04 6:54 ` [PATCH V3 05/19] virtio-pci-modern: introduce helper to set config vector Jason Wang
2021-01-04 6:54 ` [PATCH V3 06/19] virtio-pci-modern: introduce helpers for setting and getting status Jason Wang
2021-01-04 6:54 ` [PATCH V3 07/19] virtio-pci-modern: introduce helpers for setting and getting features Jason Wang
2021-01-04 6:54 ` [PATCH V3 08/19] virtio-pci-modern: introduce vp_modern_generation() Jason Wang
2021-01-04 6:54 ` [PATCH V3 09/19] virtio-pci-modern: introduce vp_modern_set_queue_vector() Jason Wang
2021-01-04 6:54 ` [PATCH V3 10/19] virtio-pci-modern: introduce vp_modern_queue_address() Jason Wang
2021-01-04 6:54 ` [PATCH V3 11/19] virtio-pci-modern: introduce helper to set/get queue_enable Jason Wang
2021-01-04 6:54 ` Jason Wang [this message]
2021-01-04 6:54 ` [PATCH V3 13/19] virtio-pci-modern: introduce helper for getting queue nums Jason Wang
2021-01-04 6:54 ` [PATCH V3 14/19] virtio-pci-modern: introduce helper to get notification offset Jason Wang
2021-01-04 6:54 ` [PATCH V3 15/19] virito-pci-modern: rename map_capability() to vp_modern_map_capability() Jason Wang
2021-01-04 6:55 ` [PATCH V3 16/19] virtio-pci: introduce modern device module Jason Wang
2021-02-05 15:34 ` Michael S. Tsirkin
2021-02-08 5:42 ` Jason Wang
2021-02-08 12:04 ` Michael S. Tsirkin
2021-02-09 3:29 ` Jason Wang
2021-02-09 9:23 ` Michael S. Tsirkin
2021-02-09 10:15 ` Naresh Kamboju
2021-02-10 4:38 ` Jason Wang
2021-02-09 14:20 ` Michael S. Tsirkin
2021-02-10 4:44 ` Jason Wang
2021-02-10 12:35 ` Michael S. Tsirkin
2021-02-18 5:49 ` Jason Wang
2021-02-12 20:14 ` Guenter Roeck
2021-02-19 8:31 ` Jason Wang
2021-01-04 6:55 ` [PATCH V3 17/19] vdpa: set the virtqueue num during register Jason Wang
2021-02-05 15:27 ` Michael S. Tsirkin
2021-02-08 4:16 ` Jason Wang
2021-01-04 6:55 ` [PATCH V3 18/19] virtio_vdpa: don't warn when fail to disable vq Jason Wang
2021-02-05 15:24 ` Michael S. Tsirkin
2021-02-08 4:15 ` Jason Wang
2021-01-04 6:55 ` [PATCH V3 19/19] vdpa: introduce virtio pci driver Jason Wang
2021-02-02 3:53 ` [PATCH V3 00/19] vDPA driver for virtio-pci device 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=20210104065503.199631-13-jasowang@redhat.com \
--to=jasowang@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lulu@redhat.com \
--cc=mst@redhat.com \
--cc=rdunlap@infradead.org \
--cc=sgarzare@redhat.com \
--cc=shahafs@mellanox.com \
--cc=virtualization@lists.linux-foundation.org \
/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).