lkml.org 
[lkml]   [2016]   [Jul]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 10/20] iommu/amd: Remove align-parameter from __map_single()
    Date
    From: Joerg Roedel <jroedel@suse.de>

    This parameter is not required anymore because the
    iova-allocations are always aligned to its size.

    Signed-off-by: Joerg Roedel <jroedel@suse.de>
    ---
    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
    \
     
     \ /
      Last update: 2016-07-08 14:21    [W:2.216 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site