Path: csiph.com!feeder.erje.net!1.us.feeder.erje.net!newsfeed.fsmpi.rwth-aachen.de!newsfeed.straub-nv.de!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod From: Joerg Roedel Newsgroups: linux.kernel Subject: [PATCH 10/20] iommu/amd: Remove align-parameter from __map_single() Date: Fri, 08 Jul 2016 13:50:02 +0200 Message-ID: References: X-Original-To: iommu@lists.linux-foundation.org Dkim-Signature: v=1; a=rsa-sha256; c=simple/simple; d=8bytes.org; s=mail-1; t=1467978325; bh=mw0LRtX5Ga7I0CfDpGKn1wC006+qazeS14FiXhcDsJI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=riIjHkMgDPJD9ZMCmSPbmfBU7+c0YcaaYaBjs/+q2cWWaVUY0m1RhrZ/IL3BCFVcM u0a9jJrBW5rmeHuwBwzEF1nzkKNXyiq55tvATnzbubo9aSeFT9NMHVa1ZCkooi+3dw p0rROsHMtq5eOxxFUzEmfduYdAfcWKX6Z+DaCOEL/EBMKbUQvNK4SPi+Sv+7kqpWYe rHOuRwog+OuKgYgpQGb/IhgbY2OKpmSBZa3O23o+bzgD90RS0e783bLEIVAmnD+TbJ vcZMpJb1kKbW48ubMWBpH1z0H8uV0Zcn6Sb5jhIGhFn3LPQ0NKmByK1s6MClBQz1g8 O4ZgPP6LnWE4w== X-Mailer: git-send-email 1.9.1 Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 68 Organization: linux.* mail to news gateway X-Original-Cc: linux-kernel@vger.kernel.org, Suravee Suthikulpanit , Vincent.Wan@amd.com, Joerg Roedel X-Original-Date: Fri, 8 Jul 2016 13:45:01 +0200 X-Original-Message-ID: <1467978311-28322-11-git-send-email-joro@8bytes.org> X-Original-References: <1467978311-28322-1-git-send-email-joro@8bytes.org> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1439345 From: Joerg Roedel This parameter is not required anymore because the iova-allocations are always aligned to its size. Signed-off-by: Joerg Roedel --- drivers/iommu/amd_iommu.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index fbfe51b..b91843c 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -2170,22 +2170,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; @@ -2281,8 +2276,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); } /* @@ -2325,8 +2319,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; @@ -2410,7 +2403,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; -- 1.9.1