History

Merge branches 'arm/allwinner', 'arm/mediatek', 'arm/renesas', 'arm/tegra', 'arm/qcom', 'arm/smmu', 'ppc/pamu', 'x86/amd', 'x86/vt-d' and 'core' into next

Joerg Roedel committed 6 years ago

Commit 7e3c38811 parents 549738f 03c7b78 3c21356 d714aaa 21d3c04 7aaf0b0 0dd4ce6 ce433d0 54ce12e c40aaaa 6278eec46 files · +2372 −939Browse files

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

Unified · Split

include/uapi/linux/iommu.h+13−5
@@ -139,6 +139,7 @@ enum iommu_page_response_code { · 138 unmodified lines
139 139
140/**140/**
141 * struct iommu_page_response - Generic page response information141 * struct iommu_page_response - Generic page response information
142 * @argsz: User filled size of this data
142 * @version: API version of this structure143 * @version: API version of this structure
143 * @flags: encodes whether the corresponding fields are valid144 * @flags: encodes whether the corresponding fields are valid
144 * (IOMMU_FAULT_PAGE_RESPONSE_* values)145 * (IOMMU_FAULT_PAGE_RESPONSE_* values)
@@ -147,6 +148,7 @@ enum iommu_page_response_code { · 2 unmodified lines
147 * @code: response code from &enum iommu_page_response_code148 * @code: response code from &enum iommu_page_response_code
148 */149 */
149struct iommu_page_response {150struct iommu_page_response {
151 __u32 argsz;
150#define IOMMU_PAGE_RESP_VERSION_1 1152#define IOMMU_PAGE_RESP_VERSION_1 1
151 __u32 version;153 __u32 version;
152#define IOMMU_PAGE_RESP_PASID_VALID (1 << 0)154#define IOMMU_PAGE_RESP_PASID_VALID (1 << 0)
@@ -222,6 +224,7 @@ struct iommu_inv_pasid_info { · 69 unmodified lines
222/**224/**
223 * struct iommu_cache_invalidate_info - First level/stage invalidation225 * struct iommu_cache_invalidate_info - First level/stage invalidation
224 * information226 * information
227 * @argsz: User filled size of this data
225 * @version: API version of this structure228 * @version: API version of this structure
226 * @cache: bitfield that allows to select which caches to invalidate229 * @cache: bitfield that allows to select which caches to invalidate
227 * @granularity: defines the lowest granularity used for the invalidation:230 * @granularity: defines the lowest granularity used for the invalidation:
@@ -250,6 +253,7 @@ struct iommu_inv_pasid_info { · 22 unmodified lines
250 * must support the used granularity.253 * must support the used granularity.
251 */254 */
252struct iommu_cache_invalidate_info {255struct iommu_cache_invalidate_info {
256 __u32 argsz;
253#define IOMMU_CACHE_INVALIDATE_INFO_VERSION_1 1257#define IOMMU_CACHE_INVALIDATE_INFO_VERSION_1 1
254 __u32 version;258 __u32 version;
255/* IOMMU paging structure cache */259/* IOMMU paging structure cache */
@@ -259,11 +263,11 @@ struct iommu_cache_invalidate_info { · 3 unmodified lines
259#define IOMMU_CACHE_INV_TYPE_NR (3)263#define IOMMU_CACHE_INV_TYPE_NR (3)
260 __u8 cache;264 __u8 cache;
261 __u8 granularity;265 __u8 granularity;
262 __u8 padding[2];266 __u8 padding[6];
263 union {267 union {
264 struct iommu_inv_pasid_info pasid_info;268 struct iommu_inv_pasid_info pasid_info;
265 struct iommu_inv_addr_info addr_info;269 struct iommu_inv_addr_info addr_info;
266 };270 } granu;
267};271};
268 272
269/**273/**
@@ -284,6 +288,7 @@ struct iommu_gpasid_bind_data_vtd { · 14 unmodified lines
284#define IOMMU_SVA_VTD_GPASID_PWT (1 << 3) /* page-level write through */288#define IOMMU_SVA_VTD_GPASID_PWT (1 << 3) /* page-level write through */
285#define IOMMU_SVA_VTD_GPASID_EMTE (1 << 4) /* extended mem type enable */289#define IOMMU_SVA_VTD_GPASID_EMTE (1 << 4) /* extended mem type enable */
286#define IOMMU_SVA_VTD_GPASID_CD (1 << 5) /* PASID-level cache disable */290#define IOMMU_SVA_VTD_GPASID_CD (1 << 5) /* PASID-level cache disable */
291#define IOMMU_SVA_VTD_GPASID_LAST (1 << 6)
287 __u64 flags;292 __u64 flags;
288 __u32 pat;293 __u32 pat;
289 __u32 emt;294 __u32 emt;
@@ -296,6 +301,7 @@ struct iommu_gpasid_bind_data_vtd { · 6 unmodified lines
296 301
297/**302/**
298 * struct iommu_gpasid_bind_data - Information about device and guest PASID binding303 * struct iommu_gpasid_bind_data - Information about device and guest PASID binding
304 * @argsz: User filled size of this data
299 * @version: Version of this data structure305 * @version: Version of this data structure
300 * @format: PASID table entry format306 * @format: PASID table entry format
301 * @flags: Additional information on guest bind request307 * @flags: Additional information on guest bind request
@@ -313,21 +319,23 @@ struct iommu_gpasid_bind_data_vtd { · 11 unmodified lines
313 * PASID to host PASID based on this bind data.319 * PASID to host PASID based on this bind data.
314 */320 */
315struct iommu_gpasid_bind_data {321struct iommu_gpasid_bind_data {
322 __u32 argsz;
316#define IOMMU_GPASID_BIND_VERSION_1 1323#define IOMMU_GPASID_BIND_VERSION_1 1
317 __u32 version;324 __u32 version;
318#define IOMMU_PASID_FORMAT_INTEL_VTD 1325#define IOMMU_PASID_FORMAT_INTEL_VTD 1
326#define IOMMU_PASID_FORMAT_LAST 2
319 __u32 format;327 __u32 format;
328 __u32 addr_width;
320#define IOMMU_SVA_GPASID_VAL (1 << 0) /* guest PASID valid */329#define IOMMU_SVA_GPASID_VAL (1 << 0) /* guest PASID valid */
321 __u64 flags;330 __u64 flags;
322 __u64 gpgd;331 __u64 gpgd;
323 __u64 hpasid;332 __u64 hpasid;
324 __u64 gpasid;333 __u64 gpasid;
325 __u32 addr_width;334 __u8 padding[8];
326 __u8 padding[12];
327 /* Vendor specific data */335 /* Vendor specific data */
328 union {336 union {
329 struct iommu_gpasid_bind_data_vtd vtd;337 struct iommu_gpasid_bind_data_vtd vtd;
330 };338 } vendor;
331};339};
332 340
333#endif /* _UAPI_IOMMU_H */341#endif /* _UAPI_IOMMU_H */