Merge branches 'iommu/page-sizes' and 'iommu/group-id' into next

[~andy/linux] / include / linux / iommu.h

diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index cc26f89c4ee6303ae670196905055dbfae654510..d937580417ba668d343b30b1741d59139f7924b9 100644 (file)
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -74,6 +74,7 @@ struct iommu_ops {
                                    unsigned long iova);
        int (*domain_has_cap)(struct iommu_domain *domain,
                              unsigned long cap);
+       int (*device_group)(struct device *dev, unsigned int *groupid);
        unsigned long pgsize_bitmap;
 };
 
@@ -95,6 +96,7 @@ extern int iommu_domain_has_cap(struct iommu_domain *domain,
                                unsigned long cap);
 extern void iommu_set_fault_handler(struct iommu_domain *domain,
                                        iommu_fault_handler_t handler);
+extern int iommu_device_group(struct device *dev, unsigned int *groupid);
 
 /**
  * report_iommu_fault() - report about an IOMMU fault to the IOMMU framework
@@ -193,6 +195,11 @@ static inline void iommu_set_fault_handler(struct iommu_domain *domain,
 {
 }
 
+static inline int iommu_device_group(struct device *dev, unsigned int *groupid)
+{
+       return -ENODEV;
+}
+
 #endif /* CONFIG_IOMMU_API */
 
 #endif /* __LINUX_IOMMU_H */