Merge tag 'iommu-updates-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

Pull IOMMU updates from Joerg Roedel:
 "Not much this time, but the changes include:

   - moving domain allocation into the iommu drivers to prepare for the
     introduction of default domains for devices

   - fixing the IO page-table code in the AMD IOMMU driver to correctly
     encode large page sizes

   - extension of the PCI support in the ARM-SMMU driver

   - various fixes and cleanups"

* tag 'iommu-updates-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (34 commits)
  iommu/amd: Correctly encode huge pages in iommu page tables
  iommu/amd: Optimize amd_iommu_iova_to_phys for new fetch_pte interface
  iommu/amd: Optimize alloc_new_range for new fetch_pte interface
  iommu/amd: Optimize iommu_unmap_page for new fetch_pte interface
  iommu/amd: Return the pte page-size in fetch_pte
  iommu/amd: Add support for contiguous dma allocator
  iommu/amd: Don't allocate with __GFP_ZERO in alloc_coherent
  iommu/amd: Ignore BUS_NOTIFY_UNBOUND_DRIVER event
  iommu/amd: Use BUS_NOTIFY_REMOVED_DEVICE
  iommu/tegra: smmu: Compute PFN mask at runtime
  iommu/tegra: gart: Set aperture at domain initialization time
  iommu/tegra: Setup aperture
  iommu: Remove domain_init and domain_free iommu_ops
  iommu/fsl: Make use of domain_alloc and domain_free
  iommu/rockchip: Make use of domain_alloc and domain_free
  iommu/ipmmu-vmsa: Make use of domain_alloc and domain_free
  iommu/shmobile: Make use of domain_alloc and domain_free
  iommu/msm: Make use of domain_alloc and domain_free
  iommu/tegra-gart: Make use of domain_alloc and domain_free
  iommu/tegra-smmu: Make use of domain_alloc and domain_free
  ...

1 files changed, 30 insertions, 3 deletions

diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index 38daa453f2e5..0546b8710ce3 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -51,9 +51,33 @@ struct iommu_domain_geometry {
         bool force_aperture;       /* DMA only allowed in mappable range? */
 };
 
+/* Domain feature flags */
+#define __IOMMU_DOMAIN_PAGING   (1U << 0)  /* Support for iommu_map/unmap */
+#define __IOMMU_DOMAIN_DMA_API  (1U << 1)  /* Domain for use in DMA-API
+                                              implementation              */
+#define __IOMMU_DOMAIN_PT       (1U << 2)  /* Domain is identity mapped   */
+
+/*
+ * This are the possible domain-types
+ *
+ *      IOMMU_DOMAIN_BLOCKED    - All DMA is blocked, can be used to isolate
+ *                                devices
+ *      IOMMU_DOMAIN_IDENTITY   - DMA addresses are system physical addresses
+ *      IOMMU_DOMAIN_UNMANAGED  - DMA mappings managed by IOMMU-API user, used
+ *                                for VMs
+ *      IOMMU_DOMAIN_DMA        - Internally used for DMA-API implementations.
+ *                                This flag allows IOMMU drivers to implement
+ *                                certain optimizations for these domains
+ */
+#define IOMMU_DOMAIN_BLOCKED    (0U)
+#define IOMMU_DOMAIN_IDENTITY   (__IOMMU_DOMAIN_PT)
+#define IOMMU_DOMAIN_UNMANAGED  (__IOMMU_DOMAIN_PAGING)
+#define IOMMU_DOMAIN_DMA        (__IOMMU_DOMAIN_PAGING |        \
+                                 __IOMMU_DOMAIN_DMA_API)
+
 struct iommu_domain {
+        unsigned type;
         const struct iommu_ops *ops;
-        void *priv;
         iommu_fault_handler_t handler;
         void *handler_token;
         struct iommu_domain_geometry geometry;
@@ -113,8 +137,11 @@ enum iommu_attr {
  */
 struct iommu_ops {
         bool (*capable)(enum iommu_cap);
-        int (*domain_init)(struct iommu_domain *domain);
-        void (*domain_destroy)(struct iommu_domain *domain);
+
+        /* Domain allocation and freeing by the iommu driver */
+        struct iommu_domain *(*domain_alloc)(unsigned iommu_domain_type);
+        void (*domain_free)(struct iommu_domain *);
+
         int (*attach_dev)(struct iommu_domain *domain, struct device *dev);
         void (*detach_dev)(struct iommu_domain *domain, struct device *dev);
         int (*map)(struct iommu_domain *domain, unsigned long iova,