diff options
| author | Marek Szyprowski <m.szyprowski@samsung.com> | 2015-08-28 09:42:09 +0100 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-01-05 16:23:32 +0100 |
| commit | e58fe788ba394db17efabaad40355e13bc6119cb (patch) | |
| tree | e210e12877f46032d7acabc8fca77acfd5fd15de /arch | |
| parent | 3e8936ea3ce4c67f1d129bc7e76aaf19fa45a976 (diff) | |
| download | lwn-e58fe788ba394db17efabaad40355e13bc6119cb.tar.gz lwn-e58fe788ba394db17efabaad40355e13bc6119cb.zip | |
ARM: 8427/1: dma-mapping: add support for offset parameter in dma_mmap()
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mm/dma-mapping.c | 2 |
1 files changed, 2 insertions, 0 deletions
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) { |