Merge tag 'vfio-for-v3.10' of git://github.com/awilliam/linux-vfio

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / vfio / pci / vfio_pci_intrs.c

diff --git a/drivers/vfio/pci/vfio_pci_intrs.c b/drivers/vfio/pci/vfio_pci_intrs.c
index a96509187deb677a03e0a7e4902d76fe1f3c81a5..4bc704e1b7c725d59cdcf7e754a63493f861b01b 100644 (file)
--- a/drivers/vfio/pci/vfio_pci_intrs.c
+++ b/drivers/vfio/pci/vfio_pci_intrs.c
@@ -287,7 +287,8 @@ void vfio_pci_intx_mask(struct vfio_pci_device *vdev)
  * a signal is necessary, which can then be handled via a work queue
  * or directly depending on the caller.
  */
-int vfio_pci_intx_unmask_handler(struct vfio_pci_device *vdev, void *unused)
+static int vfio_pci_intx_unmask_handler(struct vfio_pci_device *vdev,
+                                       void *unused)
 {
        struct pci_dev *pdev = vdev->pdev;
        unsigned long flags;
@@ -746,6 +747,63 @@ static int vfio_pci_set_msi_trigger(struct vfio_pci_device *vdev,
        return 0;
 }
 
+static int vfio_pci_set_err_trigger(struct vfio_pci_device *vdev,
+                                   unsigned index, unsigned start,
+                                   unsigned count, uint32_t flags, void *data)
+{
+       int32_t fd = *(int32_t *)data;
+       struct pci_dev *pdev = vdev->pdev;
+
+       if ((index != VFIO_PCI_ERR_IRQ_INDEX) ||
+           !(flags & VFIO_IRQ_SET_DATA_TYPE_MASK))
+               return -EINVAL;
+
+       /*
+        * device_lock synchronizes setting and checking of
+        * err_trigger. The vfio_pci_aer_err_detected() is also
+        * called with device_lock held.
+        */
+
+       /* DATA_NONE/DATA_BOOL enables loopback testing */
+
+       if (flags & VFIO_IRQ_SET_DATA_NONE) {
+               device_lock(&pdev->dev);
+               if (vdev->err_trigger)
+                       eventfd_signal(vdev->err_trigger, 1);
+               device_unlock(&pdev->dev);
+               return 0;
+       } else if (flags & VFIO_IRQ_SET_DATA_BOOL) {
+               uint8_t trigger = *(uint8_t *)data;
+               device_lock(&pdev->dev);
+               if (trigger && vdev->err_trigger)
+                       eventfd_signal(vdev->err_trigger, 1);
+               device_unlock(&pdev->dev);
+               return 0;
+       }
+
+       /* Handle SET_DATA_EVENTFD */
+
+       if (fd == -1) {
+               device_lock(&pdev->dev);
+               if (vdev->err_trigger)
+                       eventfd_ctx_put(vdev->err_trigger);
+               vdev->err_trigger = NULL;
+               device_unlock(&pdev->dev);
+               return 0;
+       } else if (fd >= 0) {
+               struct eventfd_ctx *efdctx;
+               efdctx = eventfd_ctx_fdget(fd);
+               if (IS_ERR(efdctx))
+                       return PTR_ERR(efdctx);
+               device_lock(&pdev->dev);
+               if (vdev->err_trigger)
+                       eventfd_ctx_put(vdev->err_trigger);
+               vdev->err_trigger = efdctx;
+               device_unlock(&pdev->dev);
+               return 0;
+       } else
+               return -EINVAL;
+}
 int vfio_pci_set_irqs_ioctl(struct vfio_pci_device *vdev, uint32_t flags,
                            unsigned index, unsigned start, unsigned count,
                            void *data)
@@ -780,6 +838,13 @@ int vfio_pci_set_irqs_ioctl(struct vfio_pci_device *vdev, uint32_t flags,
                        break;
                }
                break;
+       case VFIO_PCI_ERR_IRQ_INDEX:
+               switch (flags & VFIO_IRQ_SET_ACTION_TYPE_MASK) {
+               case VFIO_IRQ_SET_ACTION_TRIGGER:
+                       if (pci_is_pcie(vdev->pdev))
+                               func = vfio_pci_set_err_trigger;
+                       break;
+               }
        }
 
        if (!func)