Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94cccde6 authored by Alexander Gordeev's avatar Alexander Gordeev Committed by Bjorn Helgaas
Browse files

vfio: Use pci_enable_msi_range() and pci_enable_msix_range() 



pci_enable_msix() and pci_enable_msi_block() have been deprecated; use
pci_enable_msix_range() and pci_enable_msi_range() instead.

[bhelgaas: changelog]
Signed-off-by: default avatarAlexander Gordeev <agordeev@redhat.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent fc061d96

drivers/vfio/pci/vfio_pci_intrs.c

+8 −4
Original line number Diff line number Diff line
@@ -482,15 +482,19 @@ static int vfio_msi_enable(struct vfio_pci_device *vdev, int nvec, bool msix) 
		for (i = 0; i < nvec; i++)

			vdev->msix[i].entry = i;



		ret = pci_enable_msix(pdev, vdev->msix, nvec);

		if (ret) {

		ret = pci_enable_msix_range(pdev, vdev->msix, 1, nvec);

		if (ret < nvec) {

			if (ret > 0)

				pci_disable_msix(pdev);

			kfree(vdev->msix);

			kfree(vdev->ctx);

			return ret;

		}

	} else {

		ret = pci_enable_msi_block(pdev, nvec);

		if (ret) {

		ret = pci_enable_msi_range(pdev, 1, nvec);

		if (ret < nvec) {

			if (ret > 0)

				pci_disable_msi(pdev);

			kfree(vdev->ctx);

			return ret;

		}