From: Joerg Roedel <jroedel@suse.de>
Date: Fri, 26 Apr 2019 15:11:46 +0000 (+0200)
Subject: Merge branch 'api-features' into arm/smmu
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d53bff888f3bca8bb618a4b2723a6cfbde46f7ed;p=linux.git

Merge branch 'api-features' into arm/smmu
---

d53bff888f3bca8bb618a4b2723a6cfbde46f7ed
diff --cc include/linux/iommu.h
index 6c1b4c900191d,480921dfbadfe..a815cf6f6f47a
--- a/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);