summaryrefslogtreecommitdiff
path: root/drivers/iommu
diff options
context:
space:
mode:
authorJoerg Roedel <jroedel@suse.de>2019-05-07 10:39:32 +0300
committerJoerg Roedel <jroedel@suse.de>2019-05-07 10:40:03 +0300
commit97a18f548548a6ee1b9be14c6fc72090b8839875 (patch)
treeaf887ab04c4e37e74405d6188f9c440739931638 /drivers/iommu
parent89736a0ee81d14439d085c8d4653bc1d86fe64d8 (diff)
downloadlinux-97a18f548548a6ee1b9be14c6fc72090b8839875.tar.xz
Revert "iommu/amd: Flush not present cache in iommu_map_page"
This reverts commit 1a1079011da32db87e19fcb39e70d082f89da921. This commit caused a NULL-ptr deference bug and must be reverted for now. Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu')
-rw-r--r--drivers/iommu/amd_iommu.c19
1 files changed, 4 insertions, 15 deletions
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 23c1a7eebb06..fde16c5b0a70 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -1307,16 +1307,6 @@ static void domain_flush_complete(struct protection_domain *domain)
}
}
-/* Flush the not present cache if it exists */
-static void domain_flush_np_cache(struct protection_domain *domain,
- dma_addr_t iova, size_t size)
-{
- if (unlikely(amd_iommu_np_cache)) {
- domain_flush_pages(domain, iova, size);
- domain_flush_complete(domain);
- }
-}
-
/*
* This function flushes the DTEs for all devices in domain
@@ -2399,7 +2389,10 @@ static dma_addr_t __map_single(struct device *dev,
}
address += offset;
- domain_flush_np_cache(&dma_dom->domain, address, size);
+ if (unlikely(amd_iommu_np_cache)) {
+ domain_flush_pages(&dma_dom->domain, address, size);
+ domain_flush_complete(&dma_dom->domain);
+ }
out:
return address;
@@ -2578,8 +2571,6 @@ static int map_sg(struct device *dev, struct scatterlist *sglist,
s->dma_length = s->length;
}
- domain_flush_np_cache(domain, s->dma_address, s->dma_length);
-
return nelems;
out_unmap:
@@ -3060,8 +3051,6 @@ static int amd_iommu_map(struct iommu_domain *dom, unsigned long iova,
ret = iommu_map_page(domain, iova, paddr, page_size, prot, GFP_KERNEL);
mutex_unlock(&domain->api_lock);
- domain_flush_np_cache(domain, iova, page_size);
-
return ret;
}