Skip to content

Commit

Permalink
Merge tag 'vfio-v6.15-rc3' of https://github.com/awilliam/linux-vfio
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Linus Torvalds committed Apr 17, 2025
2 parents 272876d + 2bd42b0 commit 399537b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/vfio/pci/vfio_pci_config.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 399537b

Please sign in to comment.