From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:59517 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752202AbbLFFvs (ORCPT ); Sun, 6 Dec 2015 00:51:48 -0500 Subject: Patch "ARM: 8427/1: dma-mapping: add support for offset parameter in dma_mmap()" has been added to the 4.3-stable tree To: m.szyprowski@samsung.com, gregkh@linuxfoundation.org, rmk+kernel@arm.linux.org.uk Cc: , From: Date: Sat, 05 Dec 2015 21:51:47 -0800 Message-ID: <1449381107209201@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled ARM: 8427/1: dma-mapping: add support for offset parameter in dma_mmap() to the 4.3-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: arm-8427-1-dma-mapping-add-support-for-offset-parameter-in-dma_mmap.patch and it can be found in the queue-4.3 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 7e31210349e9e03a9a4dff31ab5f2bc83e8e84f5 Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Fri, 28 Aug 2015 09:42:09 +0100 Subject: ARM: 8427/1: dma-mapping: add support for offset parameter in dma_mmap() From: Marek Szyprowski 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 Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman --- arch/arm/mm/dma-mapping.c | 2 ++ 1 file changed, 2 insertions(+) --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -1418,6 +1418,8 @@ static int arm_iommu_mmap_attrs(struct d 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) { Patches currently in stable-queue which might be from m.szyprowski@samsung.com are queue-4.3/arm-dts-add-vbus-regulator-to-usb2-phy-nodes-on-exynos3250-exynos4210-and-exynos4412-boards.patch queue-4.3/arm-8427-1-dma-mapping-add-support-for-offset-parameter-in-dma_mmap.patch queue-4.3/arm-8426-1-dma-mapping-add-missing-range-check-in-dma_mmap.patch