1 files changed, 13 insertions, 6 deletions

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 87ba23a75b38..2a7b78bb98b4 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -1991,16 +1991,13 @@ static void do_attach(struct iommu_dev_data *dev_data,
 
 static void do_detach(struct iommu_dev_data *dev_data)
 {
+        struct protection_domain *domain = dev_data->domain;
         struct amd_iommu *iommu;
         u16 alias;
 
         iommu = amd_iommu_rlookup_table[dev_data->devid];
         alias = dev_data->alias;
 
-        /* decrease reference counters */
-        dev_data->domain->dev_iommu[iommu->index] -= 1;
-        dev_data->domain->dev_cnt                 -= 1;
-
         /* Update data structures */
         dev_data->domain = NULL;
         list_del(&dev_data->list);
@@ -2010,6 +2007,16 @@ static void do_detach(struct iommu_dev_data *dev_data)
 
         /* Flush the DTE entry */
         device_flush_dte(dev_data);
+
+        /* Flush IOTLB */
+        domain_flush_tlb_pde(domain);
+
+        /* Wait for the flushes to finish */
+        domain_flush_complete(domain);
+
+        /* decrease reference counters - needs to happen after the flushes */
+        domain->dev_iommu[iommu->index] -= 1;
+        domain->dev_cnt                 -= 1;
 }
 
 /*
@@ -2617,13 +2624,13 @@ out_unmap:
                         bus_addr  = address + s->dma_address + (j << PAGE_SHIFT);
                         iommu_unmap_page(domain, bus_addr, PAGE_SIZE);
 
-                        if (--mapped_pages)
+                        if (--mapped_pages == 0)
                                 goto out_free_iova;
                 }
         }
 
 out_free_iova:
-        free_iova_fast(&dma_dom->iovad, address, npages);
+        free_iova_fast(&dma_dom->iovad, address >> PAGE_SHIFT, npages);
 
 out_err:
         return 0;