iommu: Add apply_dm_region call-back to iommu-ops

This new call-back will be used by the iommu driver to do
reserve the given dm_region in its iova space before the
mapping is created.

The call-back is temporary until the dma-ops implementation
is part of the common iommu code.

Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 3000051f48b40c3e1b9e359e009023ce1e245c4c..e8d2fb02d88e6a361855d0d4d263377ddd1f2961 100644 (file)
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -348,6 +348,9 @@ static int iommu_group_create_direct_mappings(struct iommu_group *group,
        list_for_each_entry(entry, &mappings, list) {
                dma_addr_t start, end, addr;
 
+               if (domain->ops->apply_dm_region)
+                       domain->ops->apply_dm_region(dev, domain, entry);
+
                start = ALIGN(entry->start, pg_size);
                end   = ALIGN(entry->start + entry->length, pg_size);
 

diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index 664683aedcce4e7891004492b5ca392e5c6ee5c7..a35fb8b42e1a8d77b5dde6349846e1c9ebb15949 100644 (file)
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -152,6 +152,7 @@ struct iommu_dm_region {
  * @domain_set_attr: Change domain attributes
  * @get_dm_regions: Request list of direct mapping requirements for a device
  * @put_dm_regions: Free list of direct mapping requirements for a device
+ * @apply_dm_region: Temporary helper call-back for iova reserved ranges
  * @domain_window_enable: Configure and enable a particular window for a domain
  * @domain_window_disable: Disable a particular window for a domain
  * @domain_set_windows: Set the number of windows for a domain
@@ -186,6 +187,8 @@ struct iommu_ops {
        /* Request/Free a list of direct mapping requirements for a device */
        void (*get_dm_regions)(struct device *dev, struct list_head *list);
        void (*put_dm_regions)(struct device *dev, struct list_head *list);
+       void (*apply_dm_region)(struct device *dev, struct iommu_domain *domain,
+                               struct iommu_dm_region *region);
 
        /* Window handling functions */
        int (*domain_window_enable)(struct iommu_domain *domain, u32 wnd_nr,