Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'arm/smmu', 'arm/tegra' and...

Conflicts:
	drivers/iommu/amd_iommu.c
	drivers/iommu/tegra-gart.c
	drivers/iommu/tegra-smmu.c

diff --cc drivers/iommu/amd_iommu.c
index 48882c126245b28aa0e4d8c44ad675551385e398,48882c126245b28aa0e4d8c44ad675551385e398,aa710b095f1a606c2fb42ebdb821ba3bf2881a4b,48882c126245b28aa0e4d8c44ad675551385e398,48882c126245b28aa0e4d8c44ad675551385e398,e8c412dcac2189c5a1e4987f751d4db20214a53c..e43d48956dea239fe6816bdb23f0174754c623ee
--- 1/drivers/iommu/amd_iommu.c
--- 2/drivers/iommu/amd_iommu.c
--- 3/drivers/iommu/amd_iommu.c
--- 4/drivers/iommu/amd_iommu.c
--- 5/drivers/iommu/amd_iommu.c
--- 6/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@@@@@@ -3380,9 -3380,9 -3374,8 -3380,9 -3380,9 -3386,9 +3380,8 @@@@@@@ static size_t amd_iommu_unmap(struct io
      static phys_addr_t amd_iommu_iova_to_phys(struct iommu_domain *dom,
                                          dma_addr_t iova)
      {
-----   struct protection_domain *domain = dom->priv;
-- --   unsigned long offset_mask;
-- --   phys_addr_t paddr;
+++++   struct protection_domain *domain = to_pdomain(dom);
     -  unsigned long offset_mask;
     -  phys_addr_t paddr;
++ +++  unsigned long offset_mask, pte_pgsize;
        u64 *pte, __pte;
      
        if (domain->mode == PAGE_MODE_NONE)

diff --cc drivers/iommu/amd_iommu_types.h
Simple merge

diff --cc drivers/iommu/arm-smmu.c
Simple merge

diff --cc drivers/iommu/intel-iommu.c
Simple merge

diff --cc drivers/iommu/ipmmu-vmsa.c
Simple merge

diff --cc drivers/iommu/tegra-gart.c
index c48da057dbb1e5b6be38e6b28daced1046454687,c48da057dbb1e5b6be38e6b28daced1046454687,c48da057dbb1e5b6be38e6b28daced1046454687,c48da057dbb1e5b6be38e6b28daced1046454687,5f3b68c26b839de6feea48ef9cf8820aa4e972ba,fc588a1ffeef5a84f6c07ba4dc845b1a55d9b188..37e708fdbb5aac0bb66ac0cf17db030aa30a3a1e
--- 1/drivers/iommu/tegra-gart.c
--- 2/drivers/iommu/tegra-gart.c
--- 3/drivers/iommu/tegra-gart.c
--- 4/drivers/iommu/tegra-gart.c
--- 5/drivers/iommu/tegra-gart.c
--- 6/drivers/iommu/tegra-gart.c
+++ b/drivers/iommu/tegra-gart.c
@@@@@@@ -156,20 -156,20 -156,20 -156,20 -156,10 -166,21 +166,11 @@@@@@@ static inline bool gart_iova_range_vali
      static int gart_iommu_attach_dev(struct iommu_domain *domain,
                                 struct device *dev)
      {
----    struct gart_device *gart;
    -   struct gart_device *gart = domain->priv;
+++++   struct gart_domain *gart_domain = to_gart_domain(domain);
     -  struct gart_device *gart;
++++++  struct gart_device *gart = gart_domain->gart;
        struct gart_client *client, *c;
        int err = 0;
      
---- -  gart = gart_handle;
---- -  if (!gart)
---- -          return -EINVAL;
----    domain->priv = gart;
     -  gart_domain->gart = gart;
---- -
---- -  domain->geometry.aperture_start = gart->iovmm_base;
---- -  domain->geometry.aperture_end   = gart->iovmm_base +
---- -                                  gart->page_count * GART_PAGE_SIZE - 1;
---- -  domain->geometry.force_aperture = true;
---- -
        client = devm_kzalloc(gart->dev, sizeof(*c), GFP_KERNEL);
        if (!client)
                return -ENOMEM;
@@@@@@@ -216,27 -216,27 -216,27 -216,27 -206,40 -228,37 +218,48 @@@@@@@ out
        spin_unlock(&gart->client_lock);
      }
      
----- static int gart_iommu_domain_init(struct iommu_domain *domain)
+++++ static struct iommu_domain *gart_iommu_domain_alloc(unsigned type)
      {
----    return 0;
----  }
+++++   struct gart_domain *gart_domain;
++++ +  struct gart_device *gart;
      
----  static void gart_iommu_domain_destroy(struct iommu_domain *domain)
----  {
----    struct gart_device *gart = domain->priv;
+++++   if (type != IOMMU_DOMAIN_UNMANAGED)
+++++           return NULL;
    + 
++++ +  gart = gart_handle;
     +  if (!gart)
----            return;
    -           return -EINVAL;
++++++          return NULL;
     +
----    spin_lock(&gart->client_lock);
----    if (!list_empty(&gart->client)) {
----            struct gart_client *c;
    -   domain->priv = gart;
+++++   gart_domain = kzalloc(sizeof(*gart_domain), GFP_KERNEL);
+++++   if (!gart_domain)
+++++           return NULL;
++++  
    -   domain->geometry.aperture_start = gart->iovmm_base;
    -   domain->geometry.aperture_end = gart->iovmm_base +
++++++  gart_domain->gart = gart;
++++++  gart_domain->domain.geometry.aperture_start = gart->iovmm_base;
++++++  gart_domain->domain.geometry.aperture_end = gart->iovmm_base +
++++ +                                  gart->page_count * GART_PAGE_SIZE - 1;
    -   domain->geometry.force_aperture = true;
++++++  gart_domain->domain.geometry.force_aperture = true;
++++ +
    -   return 0;
+++++   return &gart_domain->domain;
++++  }
++++  
    - static void gart_iommu_domain_destroy(struct iommu_domain *domain)
+++++ static void gart_iommu_domain_free(struct iommu_domain *domain)
++++  {
    -   struct gart_device *gart = domain->priv;
    - 
    -   if (!gart)
    -           return;
+++++   struct gart_domain *gart_domain = to_gart_domain(domain);
+++++   struct gart_device *gart = gart_domain->gart;
++++  
    -   spin_lock(&gart->client_lock);
    -   if (!list_empty(&gart->client)) {
    -           struct gart_client *c;
+++++   if (gart) {
+++++           spin_lock(&gart->client_lock);
+++++           if (!list_empty(&gart->client)) {
+++++                   struct gart_client *c;
      
-----           list_for_each_entry(c, &gart->client, list)
-----                   gart_iommu_detach_dev(domain, c->dev);
+++++                   list_for_each_entry(c, &gart->client, list)
+++++                           gart_iommu_detach_dev(domain, c->dev);
+++++           }
+++++           spin_unlock(&gart->client_lock);
        }
-----   spin_unlock(&gart->client_lock);
-----   domain->priv = NULL;
+++++ 
+++++   kfree(gart_domain);
      }
      
      static int gart_iommu_map(struct iommu_domain *domain, unsigned long iova,

diff --cc drivers/iommu/tegra-smmu.c
index 6e134c7c227fced6a0c186f3e403fc6d9e1d49f7,6e134c7c227fced6a0c186f3e403fc6d9e1d49f7,6e134c7c227fced6a0c186f3e403fc6d9e1d49f7,6e134c7c227fced6a0c186f3e403fc6d9e1d49f7,76887a73b47acccf6e792d7a2b33830e73606462,720829724d8619e334577ed780313e813dee3f36..c845d99ecf6b8c50757998f08c86224c70064acb
--- 1/drivers/iommu/tegra-smmu.c
--- 2/drivers/iommu/tegra-smmu.c
--- 3/drivers/iommu/tegra-smmu.c
--- 4/drivers/iommu/tegra-smmu.c
--- 5/drivers/iommu/tegra-smmu.c
--- 6/drivers/iommu/tegra-smmu.c
+++ b/drivers/iommu/tegra-smmu.c
@@@@@@@ -264,14 -264,14 -264,14 -264,14 -265,19 -271,12 +272,17 @@@@@@@ static struct iommu_domain *tegra_smmu_
        for (i = 0; i < SMMU_NUM_PDE; i++)
                pd[i] = 0;
      
-----   domain->priv = as;
    - 
++++ +  /* setup aperture */
    -   domain->geometry.aperture_start = 0;
    -   domain->geometry.aperture_end = 0xffffffff;
    -   domain->geometry.force_aperture = true;
++++++  as->domain.geometry.aperture_start = 0;
++++++  as->domain.geometry.aperture_end = 0xffffffff;
++++++  as->domain.geometry.force_aperture = true;
     +
-----   return 0;
+++++   return &as->domain;
      }
      
----- static void tegra_smmu_domain_destroy(struct iommu_domain *domain)
+++++ static void tegra_smmu_domain_free(struct iommu_domain *domain)
      {
-----   struct tegra_smmu_as *as = domain->priv;
+++++   struct tegra_smmu_as *as = to_smmu_as(domain);
      
        /* TODO: free page directory and page tables */
        ClearPageReserved(as->pd);