lkml.org 
[lkml]   [2016]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 23/91] ARM: 8427/1: dma-mapping: add support for offset parameter in dma_mmap()
    Date
    From: Marek Szyprowski <m.szyprowski@samsung.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit 7e31210349e9e03a9a4dff31ab5f2bc83e8e84f5 upstream.

    IOMMU-based dma_mmap() implementation lacked proper support for offset
    parameter used in mmap call (it always assumed that mapping starts from
    offset zero). This patch adds support for offset parameter to IOMMU-based
    implementation.

    Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    arch/arm/mm/dma-mapping.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
    index f817f3064d67..8f3375adfcf9 100644
    --- a/arch/arm/mm/dma-mapping.c
    +++ b/arch/arm/mm/dma-mapping.c
    @@ -1389,6 +1389,8 @@ static int arm_iommu_mmap_attrs(struct device *dev, struct vm_area_struct *vma,
    if (off >= nr_pages || (usize >> PAGE_SHIFT) > nr_pages - off)
    return -ENXIO;

    + pages += off;
    +
    do {
    int ret = vm_insert_page(vma, uaddr, *pages++);
    if (ret) {
    --
    2.6.4


    \
     
     \ /
      Last update: 2016-01-05 20:01    [W:4.048 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site