Merge tag 'vfio-v3.9-rc1' of git://github.com/awilliam/linux-vfio

Pull VFIO updates from Alex Williamson:
 - Fixes PCIe v1 extended capability support

 - Cleans up read/write access functions

 - Fix Removal test to properly wait until devices are unused

 - Enable pcieport driver usage for non-accessible devices w/in groups

 - Extensions for PCI VGA support

* tag 'vfio-v3.9-rc1' of git://github.com/awilliam/linux-vfio:
  drivers/vfio: remove depends on CONFIG_EXPERIMENTAL
  vfio-pci: Add support for VGA region access
  vfio-pci: Manage user power state transitions
  vfio: whitelist pcieport
  vfio: Protect vfio_dev_present against device_del
  vfio-pci: Cleanup BAR access
  vfio-pci: Cleanup read/write functions
  vfio-pci: Enable PCIe extended capabilities on v1

7 files changed, 254 insertions, 227 deletions

diff --git a/drivers/vfio/pci/Kconfig b/drivers/vfio/pci/Kconfig
index 5980758563eb..c41b01e2b693 100644
--- a/drivers/vfio/pci/Kconfig
+++ b/drivers/vfio/pci/Kconfig
@@ -6,3 +6,13 @@ config VFIO_PCI
           use of PCI drivers using the VFIO framework.
 
           If you don't know what to do here, say N.
+
+config VFIO_PCI_VGA
+        bool "VFIO PCI support for VGA devices"
+        depends on VFIO_PCI && X86 && VGA_ARB
+        help
+          Support for VGA extension to VFIO PCI.  This exposes an additional
+          region on VGA devices for accessing legacy VGA addresses used by
+          BIOS and generic video drivers.
+
+          If you don't know what to do here, say N.
diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
index b28e66c4376a..8189cb6a86af 100644
--- a/drivers/vfio/pci/vfio_pci.c
+++ b/drivers/vfio/pci/vfio_pci.c
@@ -84,6 +84,11 @@ static int vfio_pci_enable(struct vfio_pci_device *vdev)
         } else
                 vdev->msix_bar = 0xFF;
 
+#ifdef CONFIG_VFIO_PCI_VGA
+        if ((pdev->class >> 8) == PCI_CLASS_DISPLAY_VGA)
+                vdev->has_vga = true;
+#endif
+
         return 0;
 }
 
@@ -285,6 +290,16 @@ static long vfio_pci_ioctl(void *device_data,
                         info.flags = VFIO_REGION_INFO_FLAG_READ;
                         break;
                 }
+                case VFIO_PCI_VGA_REGION_INDEX:
+                        if (!vdev->has_vga)
+                                return -EINVAL;
+
+                        info.offset = VFIO_PCI_INDEX_TO_OFFSET(info.index);
+                        info.size = 0xc0000;
+                        info.flags = VFIO_REGION_INFO_FLAG_READ |
+                                     VFIO_REGION_INFO_FLAG_WRITE;
+
+                        break;
                 default:
                         return -EINVAL;
                 }
@@ -366,52 +381,50 @@ static long vfio_pci_ioctl(void *device_data,
         return -ENOTTY;
 }
 
-static ssize_t vfio_pci_read(void *device_data, char __user *buf,
-                             size_t count, loff_t *ppos)
+static ssize_t vfio_pci_rw(void *device_data, char __user *buf,
+                           size_t count, loff_t *ppos, bool iswrite)
 {
         unsigned int index = VFIO_PCI_OFFSET_TO_INDEX(*ppos);
         struct vfio_pci_device *vdev = device_data;
-        struct pci_dev *pdev = vdev->pdev;
 
         if (index >= VFIO_PCI_NUM_REGIONS)
                 return -EINVAL;
 
-        if (index == VFIO_PCI_CONFIG_REGION_INDEX)
-                return vfio_pci_config_readwrite(vdev, buf, count, ppos, false);
-        else if (index == VFIO_PCI_ROM_REGION_INDEX)
-                return vfio_pci_mem_readwrite(vdev, buf, count, ppos, false);
-        else if (pci_resource_flags(pdev, index) & IORESOURCE_IO)
-                return vfio_pci_io_readwrite(vdev, buf, count, ppos, false);
-        else if (pci_resource_flags(pdev, index) & IORESOURCE_MEM)
-                return vfio_pci_mem_readwrite(vdev, buf, count, ppos, false);
+        switch (index) {
+        case VFIO_PCI_CONFIG_REGION_INDEX:
+                return vfio_pci_config_rw(vdev, buf, count, ppos, iswrite);
+
+        case VFIO_PCI_ROM_REGION_INDEX:
+                if (iswrite)
+                        return -EINVAL;
+                return vfio_pci_bar_rw(vdev, buf, count, ppos, false);
+
+        case VFIO_PCI_BAR0_REGION_INDEX ... VFIO_PCI_BAR5_REGION_INDEX:
+                return vfio_pci_bar_rw(vdev, buf, count, ppos, iswrite);
+
+        case VFIO_PCI_VGA_REGION_INDEX:
+                return vfio_pci_vga_rw(vdev, buf, count, ppos, iswrite);
+        }
 
         return -EINVAL;
 }
 
-static ssize_t vfio_pci_write(void *device_data, const char __user *buf,
-                              size_t count, loff_t *ppos)
+static ssize_t vfio_pci_read(void *device_data, char __user *buf,
+                             size_t count, loff_t *ppos)
 {
-        unsigned int index = VFIO_PCI_OFFSET_TO_INDEX(*ppos);
-        struct vfio_pci_device *vdev = device_data;
-        struct pci_dev *pdev = vdev->pdev;
+        if (!count)
+                return 0;
 
-        if (index >= VFIO_PCI_NUM_REGIONS)
-                return -EINVAL;
+        return vfio_pci_rw(device_data, buf, count, ppos, false);
+}
 
-        if (index == VFIO_PCI_CONFIG_REGION_INDEX)
-                return vfio_pci_config_readwrite(vdev, (char __user *)buf,
-                                                 count, ppos, true);
-        else if (index == VFIO_PCI_ROM_REGION_INDEX)
-                return -EINVAL;
-        else if (pci_resource_flags(pdev, index) & IORESOURCE_IO)
-                return vfio_pci_io_readwrite(vdev, (char __user *)buf,
-                                             count, ppos, true);
-        else if (pci_resource_flags(pdev, index) & IORESOURCE_MEM) {
-                return vfio_pci_mem_readwrite(vdev, (char __user *)buf,
-                                              count, ppos, true);
-        }
+static ssize_t vfio_pci_write(void *device_data, const char __user *buf,
+                              size_t count, loff_t *ppos)
+{
+        if (!count)
+                return 0;
 
-        return -EINVAL;
+        return vfio_pci_rw(device_data, (char __user *)buf, count, ppos, true);
 }
 
 static int vfio_pci_mmap(void *device_data, struct vm_area_struct *vma)
diff --git a/drivers/vfio/pci/vfio_pci_config.c b/drivers/vfio/pci/vfio_pci_config.c
index 8b8f7d11e102..964ff22bf281 100644
--- a/drivers/vfio/pci/vfio_pci_config.c
+++ b/drivers/vfio/pci/vfio_pci_config.c
@@ -587,12 +587,46 @@ static int __init init_pci_cap_basic_perm(struct perm_bits *perm)
         return 0;
 }
 
+static int vfio_pm_config_write(struct vfio_pci_device *vdev, int pos,
+                                int count, struct perm_bits *perm,
+                                int offset, __le32 val)
+{
+        count = vfio_default_config_write(vdev, pos, count, perm, offset, val);
+        if (count < 0)
+                return count;
+
+        if (offset == PCI_PM_CTRL) {
+                pci_power_t state;
+
+                switch (le32_to_cpu(val) & PCI_PM_CTRL_STATE_MASK) {
+                case 0:
+                        state = PCI_D0;
+                        break;
+                case 1:
+                        state = PCI_D1;
+                        break;
+                case 2:
+                        state = PCI_D2;
+                        break;
+                case 3:
+                        state = PCI_D3hot;
+                        break;
+                }
+
+                pci_set_power_state(vdev->pdev, state);
+        }
+
+        return count;
+}
+
 /* Permissions for the Power Management capability */
 static int __init init_pci_cap_pm_perm(struct perm_bits *perm)