From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Fri, 28 Aug 2015 08:25:02 +0000 (+0200)
Subject: ARM: dma-mapping: add support for offset parameter in dma_mmap()
X-Git-Tag: submit/tizen/20150901.112943~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=610928815db600aa0bb3d34bbdce02dc25e9c755;p=platform%2Fkernel%2Flinux-exynos.git

ARM: dma-mapping: add support for offset parameter in dma_mmap()

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>
CC: stable@vger.kernel.org  # v3.6+
---

diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index dacabff87eae..a04dfbe2d4a2 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -1376,6 +1376,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) {