UPSTREAM: PCI: rockchip: cleanup bit definition for PCIE_RC_CONFIG_LCS

[firefly-linux-kernel-4.4.55.git] / drivers / iommu / amd_iommu.c

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index b9319b76a8a193e9da184290e0282a94d5d2ae14..0397985a260128c6054513a22133adafd460991c 100644 (file)
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -352,9 +352,11 @@ static void init_iommu_group(struct device *dev)
        if (!domain)
                goto out;
 
-       dma_domain = to_pdomain(domain)->priv;
+       if (to_pdomain(domain)->flags == PD_DMA_OPS_MASK) {
+               dma_domain = to_pdomain(domain)->priv;
+               init_unity_mappings_for_device(dev, dma_domain);
+       }
 
-       init_unity_mappings_for_device(dev, dma_domain);
 out:
        iommu_group_put(group);
 }
@@ -2322,8 +2324,15 @@ static void update_device_table(struct protection_domain *domain)
 {
        struct iommu_dev_data *dev_data;
 
-       list_for_each_entry(dev_data, &domain->dev_list, list)
+       list_for_each_entry(dev_data, &domain->dev_list, list) {
                set_dte_entry(dev_data->devid, domain, dev_data->ats.enabled);
+
+               if (dev_data->devid == dev_data->alias)
+                       continue;
+
+               /* There is an alias, update device table entry for it */
+               set_dte_entry(dev_data->alias, domain, dev_data->ats.enabled);
+       }
 }
 
 static void update_domain(struct protection_domain *domain)
@@ -2970,9 +2979,7 @@ static struct iommu_domain *amd_iommu_domain_alloc(unsigned type)
 static void amd_iommu_domain_free(struct iommu_domain *dom)
 {
        struct protection_domain *domain;
-
-       if (!dom)
-               return;
+       struct dma_ops_domain *dma_dom;
 
        domain = to_pdomain(dom);
 
@@ -2981,13 +2988,24 @@ static void amd_iommu_domain_free(struct iommu_domain *dom)
 
        BUG_ON(domain->dev_cnt != 0);
 
-       if (domain->mode != PAGE_MODE_NONE)
-               free_pagetable(domain);
+       if (!dom)
+               return;
+
+       switch (dom->type) {
+       case IOMMU_DOMAIN_DMA:
+               dma_dom = domain->priv;
+               dma_ops_domain_free(dma_dom);
+               break;
+       default:
+               if (domain->mode != PAGE_MODE_NONE)
+                       free_pagetable(domain);
 
-       if (domain->flags & PD_IOMMUV2_MASK)
-               free_gcr3_table(domain);
+               if (domain->flags & PD_IOMMUV2_MASK)
+                       free_gcr3_table(domain);
 
-       protection_domain_free(domain);
+               protection_domain_free(domain);
+               break;
+       }
 }
 
 static void amd_iommu_detach_device(struct iommu_domain *dom,