Merge branches 'arm/smmu', 'virtio', 'x86/amd', 'x86/vt-d' and 'core' into next

Joerg Roedel committed 4 years ago

Commit 66dc1b76 parents c9e6606 91d6988 4cb3600 664c0b5 c95a9c2 aade40b20 files · +493 −570Browse files

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

Unified · Split

@@ -16,6 +16,7 @@ · 15 unmodified lines
16	16	#define VIRTIO_IOMMU_F_BYPASS 3
17	17	#define VIRTIO_IOMMU_F_PROBE 4
18	18	#define VIRTIO_IOMMU_F_MMIO 5
	19	+#define VIRTIO_IOMMU_F_BYPASS_CONFIG 6
19	20
20	21	struct virtio_iommu_range_64 {
21	22	__le64 start;
@@ -36,6 +37,8 @@ struct virtio_iommu_config { · 14 unmodified lines
36	37	struct virtio_iommu_range_32 domain_range;
37	38	/* Probe buffer size */
38	39	__le32 probe_size;
	40	+ __u8 bypass;
	41	+ __u8 reserved[3];
39	42	};
40	43
41	44	/* Request types */
@@ -66,11 +69,14 @@ struct virtio_iommu_req_tail { · 24 unmodified lines
66	69	__u8 reserved[3];
67	70	};
68	71
	72	+#define VIRTIO_IOMMU_ATTACH_F_BYPASS (1 << 0)
	73	+
69	74	struct virtio_iommu_req_attach {
70	75	struct virtio_iommu_req_head head;
71	76	__le32 domain;
72	77	__le32 endpoint;
73		− __u8 reserved[8];
	78	+ __le32 flags;
	79	+ __u8 reserved[4];
74	80	struct virtio_iommu_req_tail tail;
75	81	};
76	82