diff options
| author | Linus Torvalds | 2022-10-13 10:44:36 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2022-10-13 10:44:36 -0700 |
| commit | d6f04f26e25242898959b1758432e4076fabc0c0 (patch) | |
| tree | ca59ff33bdfd2a02feae3a255d1fc45302f54a9b | |
| parent | aa41478a576238995c8d414ab9e0d35d1200c9fb (diff) | |
| parent | be8ddea9e75e65b05837f6d51dc5774b866d0bcf (diff) | |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio fixes from Michael Tsirkin:
- Fix a regression in virtio pci on power
- Add a reviewer for ifcvf
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
vdpa/ifcvf: add reviewer
virtio_pci: use irq to detect interrupt support
| -rw-r--r-- | MAINTAINERS | 4 | ||||
| -rw-r--r-- | drivers/virtio/virtio_pci_common.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3b327b60f20d..37eb9a3e964c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -21739,6 +21739,10 @@ F: include/linux/virtio*.h F: include/uapi/linux/virtio_*.h F: tools/virtio/ +IFCVF VIRTIO DATA PATH ACCELERATOR +R: Zhu Lingshan <lingshan.zhu@intel.com> +F: drivers/vdpa/ifcvf/ + VIRTIO BALLOON M: "Michael S. Tsirkin" <mst@redhat.com> M: David Hildenbrand <david@redhat.com> diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c index 4df77eeb4d16..a6c86f916dbd 100644 --- a/drivers/virtio/virtio_pci_common.c +++ b/drivers/virtio/virtio_pci_common.c @@ -409,8 +409,8 @@ int vp_find_vqs(struct virtio_device *vdev, unsigned int nvqs, err = vp_find_vqs_msix(vdev, nvqs, vqs, callbacks, names, false, ctx, desc); if (!err) return 0; - /* Is there an interrupt pin? If not give up. */ - if (!(to_vp_device(vdev)->pci_dev->pin)) + /* Is there an interrupt? If not give up. */ + if (!(to_vp_device(vdev)->pci_dev->irq)) return err; /* Finally fall back to regular interrupts. */ return vp_find_vqs_intx(vdev, nvqs, vqs, callbacks, names, ctx); |