diff options
| author | Joerg Roedel <jroedel@suse.de> | 2016-07-05 16:28:02 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2016-07-13 12:48:06 +0200 |
| commit | bda350dbdbc1ad8655ece0ec3d41bebc3ee7a77b (patch) | |
| tree | a69947455eb51b53a4680edf8128fa08d3144e93 /drivers/iommu/amd_iommu.c | |
| parent | 2d4c515bf06c9bce87b546279413621f847ef6a3 (diff) | |
iommu/amd: Remove align-parameter from __map_single()
This parameter is not required anymore because the
iova-allocations are always aligned to its size.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu/amd_iommu.c')
| -rw-r--r-- | drivers/iommu/amd_iommu.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 2ba8b464ea1a..d218e35ed3e3 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -2162,22 +2162,17 @@ static dma_addr_t __map_single(struct device *dev, phys_addr_t paddr, size_t size, int direction, - bool align, u64 dma_mask) { dma_addr_t offset = paddr & ~PAGE_MASK; dma_addr_t address, start, ret; unsigned int pages; - unsigned long align_mask = 0; int prot = 0; int i; pages = iommu_num_pages(paddr, size, PAGE_SIZE); paddr &= PAGE_MASK; - if (align) - align_mask = (1UL << get_order(size)) - 1; - address = dma_ops_alloc_iova(dev, dma_dom, pages, dma_mask); if (address == DMA_ERROR_CODE) goto out; @@ -2273,8 +2268,7 @@ static dma_addr_t map_page(struct device *dev, struct page *page, dma_mask = *dev->dma_mask; - return __map_single(dev, domain->priv, paddr, size, dir, false, - dma_mask); + return __map_single(dev, domain->priv, paddr, size, dir, dma_mask); } /* @@ -2317,8 +2311,7 @@ static int map_sg(struct device *dev, struct scatterlist *sglist, paddr = sg_phys(s); s->dma_address = __map_single(dev, domain->priv, - paddr, s->length, dir, false, - dma_mask); + paddr, s->length, dir, dma_mask); if (s->dma_address) { s->dma_length = s->length; @@ -2402,7 +2395,7 @@ static void *alloc_coherent(struct device *dev, size_t size, dma_mask = *dev->dma_mask; *dma_addr = __map_single(dev, domain->priv, page_to_phys(page), - size, DMA_BIDIRECTIONAL, true, dma_mask); + size, DMA_BIDIRECTIONAL, dma_mask); if (*dma_addr == DMA_ERROR_CODE) goto out_free; |