From: Alex Williamson <alex.williamson@redhat.com>
Date: Mon, 26 Sep 2016 19:52:19 +0000 (-0600)
Subject: vfio-pci: Disable INTx after MSI/X teardown
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c93a97ee0583cd65adaf872e7cc402493eae92a7;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

vfio-pci: Disable INTx after MSI/X teardown

The MSI/X shutdown path can gratuitously enable INTx, which is not
something we want to happen if we're dealing with broken INTx device.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---

diff --git a/drivers/vfio/pci/vfio_pci_intrs.c b/drivers/vfio/pci/vfio_pci_intrs.c
index 152b43822ef1..aa23e9a4a22f 100644
--- a/drivers/vfio/pci/vfio_pci_intrs.c
+++ b/drivers/vfio/pci/vfio_pci_intrs.c
@@ -414,6 +414,13 @@ static void vfio_msi_disable(struct vfio_pci_device *vdev, bool msix)
 	} else
 		pci_disable_msi(pdev);
 
+	/*
+	 * Both disable paths above use pci_intx_for_msi() to clear DisINTx
+	 * via their shutdown paths.  Restore for NoINTx devices.
+	 */
+	if (vdev->nointx)
+		pci_intx(pdev, 0);
+
 	vdev->irq_type = VFIO_PCI_NUM_IRQS;
 	vdev->num_ctx = 0;
 	kfree(vdev->ctx);