diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-02 14:02:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-02 14:02:32 -0700 |
| commit | 0b2e3b6bb4a415379f16e38fc92db42379be47a1 (patch) | |
| tree | ac6af620793ecd5e4b1d5523e0f431d2d8a5ef66 /include | |
| parent | e95893004104054d49406fd108fefa3ddc054366 (diff) | |
| parent | 664e9386bd05dbdfecfb28d6cf2fde983aabc65c (diff) | |
| download | linux-exynos-0b2e3b6bb4a415379f16e38fc92db42379be47a1.tar.gz linux-exynos-0b2e3b6bb4a415379f16e38fc92db42379be47a1.tar.bz2 linux-exynos-0b2e3b6bb4a415379f16e38fc92db42379be47a1.zip | |
Merge tag 'vfio-for-v3.10' of git://github.com/awilliam/linux-vfio
Pull vfio updates from Alex Williamson:
"Changes include extension to support PCI AER notification to
userspace, byte granularity of PCI config space and access to
unarchitected PCI config space, better protection around IOMMU driver
accesses, default file mode fix, and a few misc cleanups."
* tag 'vfio-for-v3.10' of git://github.com/awilliam/linux-vfio:
vfio: Set container device mode
vfio: Use down_reads to protect iommu disconnects
vfio: Convert container->group_lock to rwsem
PCI/VFIO: use pcie_flags_reg instead of access PCI-E Capabilities Register
vfio-pci: Enable raw access to unassigned config space
vfio-pci: Use byte granularity in config map
vfio: make local function vfio_pci_intx_unmask_handler() static
VFIO-AER: Vfio-pci driver changes for supporting AER
VFIO: Wrapper for getting reference to vfio_device
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/vfio.h | 3 | ||||
| -rw-r--r-- | include/uapi/linux/vfio.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/vfio.h b/include/linux/vfio.h index ab9e86224c54..ac8d488e4372 100644 --- a/include/linux/vfio.h +++ b/include/linux/vfio.h @@ -45,6 +45,9 @@ extern int vfio_add_group_dev(struct device *dev, void *device_data); extern void *vfio_del_group_dev(struct device *dev); +extern struct vfio_device *vfio_device_get_from_dev(struct device *dev); +extern void vfio_device_put(struct vfio_device *device); +extern void *vfio_device_data(struct vfio_device *device); /** * struct vfio_iommu_driver_ops - VFIO IOMMU driver callbacks diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h index 4f41f309911e..284ff2436829 100644 --- a/include/uapi/linux/vfio.h +++ b/include/uapi/linux/vfio.h @@ -319,6 +319,7 @@ enum { VFIO_PCI_INTX_IRQ_INDEX, VFIO_PCI_MSI_IRQ_INDEX, VFIO_PCI_MSIX_IRQ_INDEX, + VFIO_PCI_ERR_IRQ_INDEX, VFIO_PCI_NUM_IRQS }; |