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

Commit 61771468 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Alex Williamson
Browse files

vfio_pci: use pci_alloc_irq_vectors 



Simplify the interrupt setup by using the new PCI layer helpers.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent c93a97ee

drivers/vfio/pci/vfio_pci_intrs.c

+10 −35
Original line number Diff line number Diff line
@@ -250,6 +250,7 @@ static irqreturn_t vfio_msihandler(int irq, void *arg) 
static int vfio_msi_enable(struct vfio_pci_device *vdev, int nvec, bool msix)

{

	struct pci_dev *pdev = vdev->pdev;

	unsigned int flag = msix ? PCI_IRQ_MSIX : PCI_IRQ_MSI;

	int ret;



	if (!is_irq_none(vdev))
@@ -259,36 +260,14 @@ static int vfio_msi_enable(struct vfio_pci_device *vdev, int nvec, bool msix) 
	if (!vdev->ctx)

		return -ENOMEM;



	if (msix) {

		int i;



		vdev->msix = kzalloc(nvec * sizeof(struct msix_entry),

				     GFP_KERNEL);

		if (!vdev->msix) {

			kfree(vdev->ctx);

			return -ENOMEM;

		}



		for (i = 0; i < nvec; i++)

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



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

	/* return the number of supported vectors if we can't get all: */

	ret = pci_alloc_irq_vectors(pdev, 1, nvec, flag);

	if (ret < nvec) {

		if (ret > 0)

				pci_disable_msix(pdev);

			kfree(vdev->msix);

			pci_free_irq_vectors(pdev);

		kfree(vdev->ctx);

		return ret;

	}

	} else {

		ret = pci_enable_msi_range(pdev, 1, nvec);

		if (ret < nvec) {

			if (ret > 0)

				pci_disable_msi(pdev);

			kfree(vdev->ctx);

			return ret;

		}

	}



	vdev->num_ctx = nvec;

	vdev->irq_type = msix ? VFIO_PCI_MSIX_IRQ_INDEX :
@@ -315,7 +294,7 @@ static int vfio_msi_set_vector_signal(struct vfio_pci_device *vdev, 
	if (vector < 0 || vector >= vdev->num_ctx)

		return -EINVAL;



	irq = msix ? vdev->msix[vector].vector : pdev->irq + vector;

	irq = pci_irq_vector(pdev, vector);



	if (vdev->ctx[vector].trigger) {

		free_irq(irq, vdev->ctx[vector].trigger);
@@ -408,11 +387,7 @@ static void vfio_msi_disable(struct vfio_pci_device *vdev, bool msix) 


	vfio_msi_set_block(vdev, 0, vdev->num_ctx, NULL, msix);



	if (msix) {

		pci_disable_msix(vdev->pdev);

		kfree(vdev->msix);

	} else

		pci_disable_msi(pdev);

	pci_free_irq_vectors(pdev);



	/*

	 * Both disable paths above use pci_intx_for_msi() to clear DisINTx

drivers/vfio/pci/vfio_pci_private.h

+0 −1
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ struct vfio_pci_device { 
	struct perm_bits	*msi_perm;

	spinlock_t		irqlock;

	struct mutex		igate;

	struct msix_entry	*msix;

	struct vfio_pci_irq_ctx	*ctx;

	int			num_ctx;

	int			irq_type;