History

Merge tag 'vfio-v4.5-rc1' of git://github.com/awilliam/linux-vfio

Pull VFIO updates from Alex Williamson: - Fixes in AMD xgbe reset, spapr structure padding, type 1 flags (Dan Carpenter, Alexey Kardashevskiy, Pierre Morel) - Re-introduce no-iommu mode, with a user this time (Alex Williamson) * tag 'vfio-v4.5-rc1' of git://github.com/awilliam/linux-vfio: vfio/iommu_type1: make use of info.flags vfio: Include No-IOMMU mode vfio: Add explicit alignments in vfio_iommu_spapr_tce_create VFIO: platform: reset: fix a warning message condition

Linus Torvalds committed 10 years ago

Commit 37cea932 parents cc80fe0 d4f50ee7 files · +214 −9Browse files

Showing the changes to include/uapi (1 of 7 files). Show all

Unified · Split

include/uapi/linux/vfio.h+9−0
@@ -38,6 +38,13 @@ · 37 unmodified lines
38 38
39#define VFIO_SPAPR_TCE_v2_IOMMU 739#define VFIO_SPAPR_TCE_v2_IOMMU 7
40 40
41/*
42 * The No-IOMMU IOMMU offers no translation or isolation for devices and
43 * supports no ioctls outside of VFIO_CHECK_EXTENSION. Use of VFIO's No-IOMMU
44 * code will taint the host kernel and should be used with extreme caution.
45 */
46#define VFIO_NOIOMMU_IOMMU 8
47
41/*48/*
42 * The IOCTL interface is designed for extensibility by embedding the49 * The IOCTL interface is designed for extensibility by embedding the
43 * structure length (argsz) and flags into structures passed between50 * structure length (argsz) and flags into structures passed between
@@ -568,8 +575,10 @@ struct vfio_iommu_spapr_tce_create { · 524 unmodified lines
568 __u32 flags;575 __u32 flags;
569 /* in */576 /* in */
570 __u32 page_shift;577 __u32 page_shift;
578 __u32 __resv1;
571 __u64 window_size;579 __u64 window_size;
572 __u32 levels;580 __u32 levels;
581 __u32 __resv2;
573 /* out */582 /* out */
574 __u64 start_addr;583 __u64 start_addr;
575};584};