iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iommu/amd: Flush not present cache in iommu_map_page

Browse Source 
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>
This commit is contained in:
Tom Murphy 2019-06-13 23:04:55 +01:00 committed by Joerg Roedel
parent 5c90501a72
commit 5cd3f2e98c
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/iommu/amd_iommu.c
View File

@ -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 * 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; address += offset;
if (unlikely(amd_iommu_np_cache)) { domain_flush_np_cache(&dma_dom->domain, address, size);
domain_flush_pages(&dma_dom->domain, address, size);
domain_flush_complete(&dma_dom->domain);
}
out: out:
return address; return address;
@ -2571,6 +2578,9 @@ static int map_sg(struct device *dev, struct scatterlist *sglist,
s->dma_length = s->length; s->dma_length = s->length;
} }
if (s)
domain_flush_np_cache(domain, s->dma_address, s->dma_length);
return nelems; return nelems;
out_unmap: 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); ret = iommu_map_page(domain, iova, paddr, page_size, prot, GFP_KERNEL);
mutex_unlock(&domain->api_lock); mutex_unlock(&domain->api_lock);
domain_flush_np_cache(domain, iova, page_size);
return ret; return ret;
} }