Commit 399537be authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'vfio-v6.15-rc3' of https://github.com/awilliam/linux-vfio 

Pull vfio fix from Alex Williamson:

 - Include devices where the platform indicates PCI INTx is not routed
   by setting pdev->irq to zero in the expanded virtualization of the
   PCI pin register. This provides consistency in the INFO and SET_IRQS
   ioctls (Alex Williamson)

* tag 'vfio-v6.15-rc3' of https://github.com/awilliam/linux-vfio:
  vfio/pci: Virtualize zero INTx PIN if no pdev->irq
parents 272876d5 2bd42b03

drivers/vfio/pci/vfio_pci_config.c

+1 −1
Original line number Diff line number Diff line
@@ -1815,7 +1815,7 @@ int vfio_config_init(struct vfio_pci_core_device *vdev) 
	}



	if (!IS_ENABLED(CONFIG_VFIO_PCI_INTX) || vdev->nointx ||

	    vdev->pdev->irq == IRQ_NOTCONNECTED)

	    !vdev->pdev->irq || vdev->pdev->irq == IRQ_NOTCONNECTED)

		vconfig[PCI_INTERRUPT_PIN] = 0;



	ret = vfio_cap_init(vdev);