diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index 6671e45d3c3ba5ceb45cfb337548ef930cf75968..47294a3a398ed0883996addc3ffff6c63ef88c42 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -345,6 +345,11 @@ struct iommu_ops {
 
 	int (*def_domain_type)(struct device *dev);
 
+	KABI_DEPRECATE_FN(int, bind_guest_msi, struct iommu_domain *domain,
+			  dma_addr_t giova, phys_addr_t gpa, size_t size)
+	KABI_DEPRECATE_FN(void, unbind_guest_msi, struct iommu_domain *domain,
+			  dma_addr_t giova)
+
 	int (*dev_get_config)(struct device *dev, int type, void *data);
 	int (*dev_set_config)(struct device *dev, int type, void *data);
 
diff --git a/include/uapi/linux/iommu.h b/include/uapi/linux/iommu.h
index bed34a8c943093a1951663227ad9fc6c139b1f4d..9ddaf2d22d9aa3dac72cbeb9d553886d022294c2 100644
--- a/include/uapi/linux/iommu.h
+++ b/include/uapi/linux/iommu.h
@@ -373,20 +373,21 @@ struct iommu_pasid_smmuv3 {
  * @smmuv3: table information when @format is %IOMMU_PASID_FORMAT_SMMUV3
  */
 struct iommu_pasid_table_config {
+	__u32	argsz;
 #define PASID_TABLE_CFG_VERSION_1 1
 	__u32	version;
+	__u64	base_ptr;
 #define IOMMU_PASID_FORMAT_SMMUV3	1
 	__u32	format;
-	__u64	base_ptr;
 	__u8	pasid_bits;
 #define IOMMU_PASID_CONFIG_TRANSLATE	1
 #define IOMMU_PASID_CONFIG_BYPASS	2
 #define IOMMU_PASID_CONFIG_ABORT	3
 	__u8	config;
-	__u8    padding[6];
+	__u8    padding[2];
 	union {
 		struct iommu_pasid_smmuv3 smmuv3;
-	};
+	} vendor_data;
 };
 
 #endif /* _UAPI_IOMMU_H */