lkml.org 
[lkml]   [2018]   [Dec]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH v4 2/9] arch/arm/mm/dma-mapping.c: Convert to use vm_insert_range
    Convert to use vm_insert_range() to map range of kernel
    memory to user vma.

    Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
    ---
    arch/arm/mm/dma-mapping.c | 21 +++++++--------------
    1 file changed, 7 insertions(+), 14 deletions(-)

    diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
    index 661fe48..7cbcde5 100644
    --- a/arch/arm/mm/dma-mapping.c
    +++ b/arch/arm/mm/dma-mapping.c
    @@ -1582,31 +1582,24 @@ static int __arm_iommu_mmap_attrs(struct device *dev, struct vm_area_struct *vma
    void *cpu_addr, dma_addr_t dma_addr, size_t size,
    unsigned long attrs)
    {
    - unsigned long uaddr = vma->vm_start;
    - unsigned long usize = vma->vm_end - vma->vm_start;
    + unsigned long page_count = vma_pages(vma);
    struct page **pages = __iommu_get_pages(cpu_addr, attrs);
    unsigned long nr_pages = PAGE_ALIGN(size) >> PAGE_SHIFT;
    unsigned long off = vma->vm_pgoff;
    + int err;

    if (!pages)
    return -ENXIO;

    - if (off >= nr_pages || (usize >> PAGE_SHIFT) > nr_pages - off)
    + if (off >= nr_pages)
    return -ENXIO;

    pages += off;
    + err = vm_insert_range(vma, vma->vm_start, pages, page_count);
    + if (err)
    + pr_err("Remapping memory failed: %d\n", err);

    - do {
    - int ret = vm_insert_page(vma, uaddr, *pages++);
    - if (ret) {
    - pr_err("Remapping memory failed: %d\n", ret);
    - return ret;
    - }
    - uaddr += PAGE_SIZE;
    - usize -= PAGE_SIZE;
    - } while (usize > 0);
    -
    - return 0;
    + return err;
    }
    static int arm_iommu_mmap_attrs(struct device *dev,
    struct vm_area_struct *vma, void *cpu_addr,
    --
    1.9.1
    \
     
     \ /
      Last update: 2018-12-17 21:19    [W:2.515 / U:1.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site