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

Commit acec09e6 authored by Jim Harris's avatar Jim Harris Committed by Greg Kroah-Hartman
Browse files

uio/uio_pci_generic: don't fail probe if pdev->irq == NULL 



Some userspace drivers and frameworks only poll and do not
require interrupts to be available and enabled on the
PCI device.  So remove the requirement that an IRQ is
assigned.  If an IRQ is not assigned and a userspace
driver tries to read()/write(), the generic uio
framework will just return -EIO.

This allows binding uio_pci_generic to devices which
cannot get an IRQ assigned, such as an NVMe controller
behind Intel Volume Management Device (VMD), since VMD
does not support INTx interrupts.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 98e959d4

drivers/uio/uio_pci_generic.c

+9 −11
Original line number Diff line number Diff line
@@ -66,14 +66,7 @@ static int probe(struct pci_dev *pdev, 
		return err;

	}



	if (!pdev->irq) {

		dev_warn(&pdev->dev, "No IRQ assigned to device: "

			 "no support for interrupts?\n");

		pci_disable_device(pdev);

		return -ENODEV;

	}



	if (!pci_intx_mask_supported(pdev)) {

	if (pdev->irq && !pci_intx_mask_supported(pdev)) {

		err = -ENODEV;

		goto err_verify;

	}
@@ -86,10 +79,15 @@ static int probe(struct pci_dev *pdev, 


	gdev->info.name = "uio_pci_generic";

	gdev->info.version = DRIVER_VERSION;

	gdev->pdev = pdev;

	if (pdev->irq) {

		gdev->info.irq = pdev->irq;

		gdev->info.irq_flags = IRQF_SHARED;

		gdev->info.handler = irqhandler;

	gdev->pdev = pdev;

	} else {

		dev_warn(&pdev->dev, "No IRQ assigned to device: "

			 "no support for interrupts?\n");

	}



	err = uio_register_device(&pdev->dev, &gdev->info);

	if (err)