diff options
author | Tom Murphy <tmurphy@arista.com> | 2019-04-29 00:47:02 +0100 |
---|---|---|
committer | Joerg Roedel <jroedel@suse.de> | 2019-05-03 17:27:42 +0200 |
commit | 1a1079011da32db87e19fcb39e70d082f89da921 (patch) | |
tree | 00654600d0d5459bb68ffc9980bc690bf32713a1 | |
parent | c805b428f206a9097ef8c905d8b7e40bc411100e (diff) | |
download | linux-1a1079011da32db87e19fcb39e70d082f89da921.tar.gz linux-1a1079011da32db87e19fcb39e70d082f89da921.tar.bz2 linux-1a1079011da32db87e19fcb39e70d082f89da921.zip |
iommu/amd: Flush not present cache in iommu_map_page
check if there is a not-present cache present and flush it if there is.
Signed-off-by: Tom Murphy <tmurphy@arista.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
-rw-r--r-- | drivers/iommu/amd_iommu.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 3e0696cf965c..bc98de5fa867 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -1307,6 +1307,16 @@ 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 @@ -2389,10 +2399,7 @@ static dma_addr_t __map_single(struct device *dev, } address += offset; - if (unlikely(amd_iommu_np_cache)) { - domain_flush_pages(&dma_dom->domain, address, size); - domain_flush_complete(&dma_dom->domain); - } + domain_flush_np_cache(&dma_dom->domain, address, size); out: return address; @@ -2548,6 +2555,8 @@ 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: @@ -3005,6 +3014,8 @@ 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; } |