diff options
| author |   Tom Murphy <murphyt7@tcd.ie> | 2019-06-13 23:04:55 +0100 |
|---|---|---|
| committer |   Joerg Roedel <jroedel@suse.de> | 2019-07-01 14:15:47 +0200 |
| commit | 5cd3f2e98ccaa668210ed2e3a1d6bde3189fe366 (patch) | |
| tree | bd3a85eab62371354a40da6b28e3388bdadc83c0 /drivers/iommu | |
| parent | iommu/amd: Only free resources once on init error (diff) | |
| download | linux-dev-5cd3f2e98ccaa668210ed2e3a1d6bde3189fe366.tar.xz linux-dev-5cd3f2e98ccaa668210ed2e3a1d6bde3189fe366.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 <murphyt7@tcd.ie>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/amd_iommu.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 86613f139618..a91732f170ea 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; @@ -2571,6 +2578,9 @@ static int map_sg(struct device *dev, struct scatterlist *sglist, s->dma_length = s->length; } + if (s) + domain_flush_np_cache(domain, s->dma_address, s->dma_length); + return nelems; out_unmap: @@ -3051,6 +3061,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; } |