Commit 21ea447d authored by Xuan Zhuo's avatar Xuan Zhuo Committed by Pengyuan Zhao
Browse files

virtio_pci: introduce helper to get/set queue reset 

mainline inclusion
from mainline-v6.0-rc1
commit 0b50cece
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I5WXCZ
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0b50cece0b7857732d2055f2c77f8730c10f9196

----------------------------------------------------------------------

Introduce new helpers to implement queue reset and get queue reset
status.

 https://github.com/oasis-tcs/virtio-spec/issues/124
 https://github.com/oasis-tcs/virtio-spec/issues/139



Signed-off-by: default avatarXuan Zhuo <xuanzhuo@linux.alibaba.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Message-Id: <20220801063902.129329-31-xuanzhuo@linux.alibaba.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarPengyuan Zhao <zhaopengyuan@hisilicon.com>
parent d3eb75c5

drivers/virtio/virtio_pci_modern_dev.c

+39 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include <linux/virtio_pci_modern.h>

#include <linux/module.h>

#include <linux/pci.h>

#include <linux/delay.h>



/*

 * vp_modern_map_capability - map a part of virtio pci capability
@@ -464,6 +465,44 @@ void vp_modern_set_status(struct virtio_pci_modern_device *mdev, 
}

EXPORT_SYMBOL_GPL(vp_modern_set_status);



/*

 * vp_modern_get_queue_reset - get the queue reset status

 * @mdev: the modern virtio-pci device

 * @index: queue index

 */

int vp_modern_get_queue_reset(struct virtio_pci_modern_device *mdev, u16 index)

{

	struct virtio_pci_modern_common_cfg __iomem *cfg;



	cfg = (struct virtio_pci_modern_common_cfg __iomem *)mdev->common;



	vp_iowrite16(index, &cfg->cfg.queue_select);

	return vp_ioread16(&cfg->queue_reset);

}

EXPORT_SYMBOL_GPL(vp_modern_get_queue_reset);



/*

 * vp_modern_set_queue_reset - reset the queue

 * @mdev: the modern virtio-pci device

 * @index: queue index

 */

void vp_modern_set_queue_reset(struct virtio_pci_modern_device *mdev, u16 index)

{

	struct virtio_pci_modern_common_cfg __iomem *cfg;



	cfg = (struct virtio_pci_modern_common_cfg __iomem *)mdev->common;



	vp_iowrite16(index, &cfg->cfg.queue_select);

	vp_iowrite16(1, &cfg->queue_reset);



	while (vp_ioread16(&cfg->queue_reset))

		msleep(1);



	while (vp_ioread16(&cfg->cfg.queue_enable))

		msleep(1);

}

EXPORT_SYMBOL_GPL(vp_modern_set_queue_reset);



/*

 * vp_modern_queue_vector - set the MSIX vector for a specific virtqueue

 * @mdev: the modern virtio-pci device

include/linux/virtio_pci_modern.h

+2 −0
Original line number Diff line number Diff line
@@ -106,4 +106,6 @@ void __iomem *vp_modern_map_vq_notify(struct virtio_pci_modern_device *mdev, 
				      u16 index, resource_size_t *pa);

int vp_modern_probe(struct virtio_pci_modern_device *mdev);

void vp_modern_remove(struct virtio_pci_modern_device *mdev);

int vp_modern_get_queue_reset(struct virtio_pci_modern_device *mdev, u16 index);

void vp_modern_set_queue_reset(struct virtio_pci_modern_device *mdev, u16 index);

#endif