Merge branch 'api-features' into arm/smmu

diff --cc include/linux/iommu.h
index 6c1b4c900191d09657a77d38aa3049ef581c1df8,480921dfbadfeea964acd9b743a6445181fb42ce..a815cf6f6f47a8611b70b886d15da0f003ac5a01
--- 1/include/linux/iommu.h
--- 2/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@@ -397,9 -450,14 +451,17 @@@ struct iommu_fwspec 
        u32                     ids[1];
  };
  
 +/* ATS is supported */
 +#define IOMMU_FWSPEC_PCI_RC_ATS                       (1 << 0)
 +
+ /**
+  * struct iommu_sva - handle to a device-mm bond
+  */
+ struct iommu_sva {
+       struct device                   *dev;
+       const struct iommu_sva_ops      *ops;
+ };
+ 
  int iommu_fwspec_init(struct device *dev, struct fwnode_handle *iommu_fwnode,
                      const struct iommu_ops *ops);
  void iommu_fwspec_free(struct device *dev);