summaryrefslogtreecommitdiffstats
path: root/drivers/iommu/amd_iommu.c
diff options
context:
space:
mode:
authorJoerg Roedel <jroedel@suse.de>2015-12-21 17:58:26 +0100
committerJoerg Roedel <jroedel@suse.de>2015-12-28 17:18:52 +0100
commit05ab49e0056a702b98345a548cc888be0ba9ddf8 (patch)
tree5f25a7b2bb560be2e1a2d1f6354c586c1b45eef2 /drivers/iommu/amd_iommu.c
parentiommu/amd: Flush iommu tlb in dma_ops_aperture_alloc() (diff)
downloadlinux-05ab49e0056a702b98345a548cc888be0ba9ddf8.tar.xz
linux-05ab49e0056a702b98345a548cc888be0ba9ddf8.zip
iommu/amd: Remove 'start' parameter from dma_ops_area_alloc
Parameter is not needed because the value is part of the already passed in struct dma_ops_domain. Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu/amd_iommu.c')
-rw-r--r--drivers/iommu/amd_iommu.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index eb11996e310f..2962c62a8377 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -1561,11 +1561,10 @@ static unsigned long dma_ops_area_alloc(struct device *dev,
struct dma_ops_domain *dom,
unsigned int pages,
unsigned long align_mask,
- u64 dma_mask,
- unsigned long start)
+ u64 dma_mask)
{
int max_index = dom->aperture_size >> APERTURE_RANGE_SHIFT;
- int i = start >> APERTURE_RANGE_SHIFT;
+ int i = dom->next_address >> APERTURE_RANGE_SHIFT;
unsigned long next_bit, boundary_size, mask;
unsigned long address = -1;
@@ -1612,13 +1611,12 @@ static unsigned long dma_ops_alloc_addresses(struct device *dev,
dom->need_flush = true;
#endif
- address = dma_ops_area_alloc(dev, dom, pages, align_mask,
- dma_mask, dom->next_address);
+ address = dma_ops_area_alloc(dev, dom, pages, align_mask, dma_mask);
if (address == -1) {
dom->next_address = 0;
address = dma_ops_area_alloc(dev, dom, pages, align_mask,
- dma_mask, 0);
+ dma_mask);
dom->need_flush = true;
}