Revert "Update to v6.11 kernel headers."
Revert submission 3277111-kernel_611
Reason for revert: Droidmonitor created revert due to b/369448759.
Reverted changes: /q/submissionid:3277111-kernel_611
Change-Id: I3cabcc2c55904459c69dbfa81e6e65863a7e57cc
diff --git a/libc/kernel/uapi/linux/iommufd.h b/libc/kernel/uapi/linux/iommufd.h
index 6f663b4..2570628 100644
--- a/libc/kernel/uapi/linux/iommufd.h
+++ b/libc/kernel/uapi/linux/iommufd.h
@@ -12,20 +12,19 @@
enum {
IOMMUFD_CMD_BASE = 0x80,
IOMMUFD_CMD_DESTROY = IOMMUFD_CMD_BASE,
- IOMMUFD_CMD_IOAS_ALLOC = 0x81,
- IOMMUFD_CMD_IOAS_ALLOW_IOVAS = 0x82,
- IOMMUFD_CMD_IOAS_COPY = 0x83,
- IOMMUFD_CMD_IOAS_IOVA_RANGES = 0x84,
- IOMMUFD_CMD_IOAS_MAP = 0x85,
- IOMMUFD_CMD_IOAS_UNMAP = 0x86,
- IOMMUFD_CMD_OPTION = 0x87,
- IOMMUFD_CMD_VFIO_IOAS = 0x88,
- IOMMUFD_CMD_HWPT_ALLOC = 0x89,
- IOMMUFD_CMD_GET_HW_INFO = 0x8a,
- IOMMUFD_CMD_HWPT_SET_DIRTY_TRACKING = 0x8b,
- IOMMUFD_CMD_HWPT_GET_DIRTY_BITMAP = 0x8c,
- IOMMUFD_CMD_HWPT_INVALIDATE = 0x8d,
- IOMMUFD_CMD_FAULT_QUEUE_ALLOC = 0x8e,
+ IOMMUFD_CMD_IOAS_ALLOC,
+ IOMMUFD_CMD_IOAS_ALLOW_IOVAS,
+ IOMMUFD_CMD_IOAS_COPY,
+ IOMMUFD_CMD_IOAS_IOVA_RANGES,
+ IOMMUFD_CMD_IOAS_MAP,
+ IOMMUFD_CMD_IOAS_UNMAP,
+ IOMMUFD_CMD_OPTION,
+ IOMMUFD_CMD_VFIO_IOAS,
+ IOMMUFD_CMD_HWPT_ALLOC,
+ IOMMUFD_CMD_GET_HW_INFO,
+ IOMMUFD_CMD_HWPT_SET_DIRTY_TRACKING,
+ IOMMUFD_CMD_HWPT_GET_DIRTY_BITMAP,
+ IOMMUFD_CMD_HWPT_INVALIDATE,
};
struct iommu_destroy {
__u32 size;
@@ -123,7 +122,6 @@
enum iommufd_hwpt_alloc_flags {
IOMMU_HWPT_ALLOC_NEST_PARENT = 1 << 0,
IOMMU_HWPT_ALLOC_DIRTY_TRACKING = 1 << 1,
- IOMMU_HWPT_FAULT_ID_VALID = 1 << 2,
};
enum iommu_hwpt_vtd_s1_flags {
IOMMU_VTD_S1_SRE = 1 << 0,
@@ -137,8 +135,8 @@
__u32 __reserved;
};
enum iommu_hwpt_data_type {
- IOMMU_HWPT_DATA_NONE = 0,
- IOMMU_HWPT_DATA_VTD_S1 = 1,
+ IOMMU_HWPT_DATA_NONE,
+ IOMMU_HWPT_DATA_VTD_S1,
};
struct iommu_hwpt_alloc {
__u32 size;
@@ -150,8 +148,6 @@
__u32 data_type;
__u32 data_len;
__aligned_u64 data_uptr;
- __u32 fault_id;
- __u32 __reserved2;
};
#define IOMMU_HWPT_ALLOC _IO(IOMMUFD_TYPE, IOMMUFD_CMD_HWPT_ALLOC)
enum iommu_hw_info_vtd_flags {
@@ -164,8 +160,8 @@
__aligned_u64 ecap_reg;
};
enum iommu_hw_info_type {
- IOMMU_HW_INFO_TYPE_NONE = 0,
- IOMMU_HW_INFO_TYPE_INTEL_VTD = 1,
+ IOMMU_HW_INFO_TYPE_NONE,
+ IOMMU_HW_INFO_TYPE_INTEL_VTD,
};
enum iommufd_hw_capabilities {
IOMMU_HW_CAP_DIRTY_TRACKING = 1 << 0,
@@ -206,7 +202,7 @@
};
#define IOMMU_HWPT_GET_DIRTY_BITMAP _IO(IOMMUFD_TYPE, IOMMUFD_CMD_HWPT_GET_DIRTY_BITMAP)
enum iommu_hwpt_invalidate_data_type {
- IOMMU_HWPT_INVALIDATE_DATA_VTD_S1 = 0,
+ IOMMU_HWPT_INVALIDATE_DATA_VTD_S1,
};
enum iommu_hwpt_vtd_s1_invalidate_flags {
IOMMU_VTD_INV_FLAGS_LEAF = 1 << 0,
@@ -227,39 +223,4 @@
__u32 __reserved;
};
#define IOMMU_HWPT_INVALIDATE _IO(IOMMUFD_TYPE, IOMMUFD_CMD_HWPT_INVALIDATE)
-enum iommu_hwpt_pgfault_flags {
- IOMMU_PGFAULT_FLAGS_PASID_VALID = (1 << 0),
- IOMMU_PGFAULT_FLAGS_LAST_PAGE = (1 << 1),
-};
-enum iommu_hwpt_pgfault_perm {
- IOMMU_PGFAULT_PERM_READ = (1 << 0),
- IOMMU_PGFAULT_PERM_WRITE = (1 << 1),
- IOMMU_PGFAULT_PERM_EXEC = (1 << 2),
- IOMMU_PGFAULT_PERM_PRIV = (1 << 3),
-};
-struct iommu_hwpt_pgfault {
- __u32 flags;
- __u32 dev_id;
- __u32 pasid;
- __u32 grpid;
- __u32 perm;
- __u64 addr;
- __u32 length;
- __u32 cookie;
-};
-enum iommufd_page_response_code {
- IOMMUFD_PAGE_RESP_SUCCESS = 0,
- IOMMUFD_PAGE_RESP_INVALID = 1,
-};
-struct iommu_hwpt_page_response {
- __u32 cookie;
- __u32 code;
-};
-struct iommu_fault_alloc {
- __u32 size;
- __u32 flags;
- __u32 out_fault_id;
- __u32 out_fault_fd;
-};
-#define IOMMU_FAULT_QUEUE_ALLOC _IO(IOMMUFD_TYPE, IOMMUFD_CMD_FAULT_QUEUE_ALLOC)
#endif