diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-11 06:49:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-11 06:49:24 -0400 |
| commit | 27a9716bc80448f7e98fb1fb316daba241a4c539 (patch) | |
| tree | d9a82dc1e1eddd1ff2a27d558149ad8323975134 /include/uapi | |
| parent | e98d6e7f7625ed60c7bc1d39aeb2375ed3918fd5 (diff) | |
| parent | 93899a679fd6b2534b5c297d9316bae039ebcbe1 (diff) | |
Merge tag 'vfio-v3.18-rc1' of git://github.com/awilliam/linux-vfio
Pull VFIO updates from Alex Williamson:
- Nested IOMMU extension to type1 (Will Deacon)
- Restore MSIx message before enabling (Gavin Shan)
- Fix remove path locking (Alex Williamson)
* tag 'vfio-v3.18-rc1' of git://github.com/awilliam/linux-vfio:
vfio-pci: Fix remove path locking
drivers/vfio: Export vfio_spapr_iommu_eeh_ioctl() with GPL
vfio/pci: Restore MSIx message prior to enabling
PCI: Export MSI message relevant functions
vfio/iommu_type1: add new VFIO_TYPE1_NESTING_IOMMU IOMMU type
iommu: introduce domain attribute for nesting IOMMUs
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/vfio.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h index 6612974c64bf..29715d27548f 100644 --- a/include/uapi/linux/vfio.h +++ b/include/uapi/linux/vfio.h | |||
| @@ -33,6 +33,9 @@ | |||
| 33 | /* Check if EEH is supported */ | 33 | /* Check if EEH is supported */ |
| 34 | #define VFIO_EEH 5 | 34 | #define VFIO_EEH 5 |
| 35 | 35 | ||
| 36 | /* Two-stage IOMMU */ | ||
| 37 | #define VFIO_TYPE1_NESTING_IOMMU 6 /* Implies v2 */ | ||
| 38 | |||
| 36 | /* | 39 | /* |
| 37 | * The IOCTL interface is designed for extensibility by embedding the | 40 | * The IOCTL interface is designed for extensibility by embedding the |
| 38 | * structure length (argsz) and flags into structures passed between | 41 | * structure length (argsz) and flags into structures passed between |