android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iommu/amd: Flush iommu tlb in dma_ops_aperture_alloc()

Browse Source 
Since the allocator wraparound happens in this function now,
flush the iommu tlb there too.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Joerg Roedel
2015-12-21 17:49:34 +01:00
parent 60e6a7cb44
commit ccb50e03da
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/iommu/amd_iommu.c
View File

@ -1518,7 +1518,8 @@ out_free:
return -ENOMEM;
}
static dma_addr_t dma_ops_aperture_alloc(struct aperture_range *range,
static dma_addr_t dma_ops_aperture_alloc(struct dma_ops_domain *dom,
struct aperture_range *range,
unsigned long pages,
unsigned long dma_mask,
unsigned long boundary_size,
@ -1526,6 +1527,7 @@ static dma_addr_t dma_ops_aperture_alloc(struct aperture_range *range,
{
unsigned long offset, limit, flags;
dma_addr_t address;
bool flush = false;
offset = range->offset >> PAGE_SHIFT;
limit = iommu_device_max_index(APERTURE_RANGE_PAGES, offset,
@ -1534,17 +1536,24 @@ static dma_addr_t dma_ops_aperture_alloc(struct aperture_range *range,
spin_lock_irqsave(&range->bitmap_lock, flags);
address = iommu_area_alloc(range->bitmap, limit, range->next_bit,
pages, offset, boundary_size, align_mask);
if (address == -1)
if (address == -1) {
/* Nothing found, retry one time */
address = iommu_area_alloc(range->bitmap, limit,
0, pages, offset, boundary_size,
align_mask);
flush = true;
}
if (address != -1)
range->next_bit = address + pages;
spin_unlock_irqrestore(&range->bitmap_lock, flags);
if (flush) {
domain_flush_tlb(&dom->domain);
domain_flush_complete(&dom->domain);
}
return address;
}
@ -1566,12 +1575,14 @@ static unsigned long dma_ops_area_alloc(struct device *dev,
1UL << (BITS_PER_LONG - PAGE_SHIFT);
for (;i < max_index; ++i) {
if (dom->aperture[i]->offset >= dma_mask)
struct aperture_range *range = dom->aperture[i];
if (range->offset >= dma_mask)
break;
next_bit = dom->aperture[i]->next_bit;
next_bit = range->next_bit;
address = dma_ops_aperture_alloc(dom->aperture[i], pages,
address = dma_ops_aperture_alloc(dom, dom->aperture[i], pages,
dma_mask, boundary_size,
align_mask);
if (address != -1) {