From patchwork Fri Aug 28 08:36:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 7090391 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CF8619F1C2 for ; Fri, 28 Aug 2015 08:39:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1705420999 for ; Fri, 28 Aug 2015 08:39:58 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 35F6120981 for ; Fri, 28 Aug 2015 08:39:57 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZVFAr-0003RV-CX; Fri, 28 Aug 2015 08:38:13 +0000 Received: from mailout4.w1.samsung.com ([210.118.77.14]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZVFAo-0003MX-Fr for linux-arm-kernel@lists.infradead.org; Fri, 28 Aug 2015 08:38:11 +0000 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NTS002HAAMVDE90@mailout4.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Fri, 28 Aug 2015 09:37:43 +0100 (BST) X-AuditID: cbfec7f4-f79c56d0000012ee-e2-55e01dd7c37d Received: from eusync4.samsung.com ( [203.254.199.214]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id A0.E4.04846.7DD10E55; Fri, 28 Aug 2015 09:37:43 +0100 (BST) Received: from amdc1339.digital.local ([106.116.147.30]) by eusync4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NTS00KZRAMJBV20@eusync4.samsung.com>; Fri, 28 Aug 2015 09:37:43 +0100 (BST) From: Marek Szyprowski To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/2] ARM: dma-mapping: add support for offset parameter in dma_mmap() Date: Fri, 28 Aug 2015 10:36:59 +0200 Message-id: <1440751036-6585-2-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.2 In-reply-to: <1440751036-6585-1-git-send-email-m.szyprowski@samsung.com> References: <1440751036-6585-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrLJMWRmVeSWpSXmKPExsVy+t/xa7rXZR+EGuz8qmmx6fE1Vovbl3kt 1h65y26xYOMjRgcWj5bmHjaPzUvqPfq2rGL0+LxJLoAlissmJTUnsyy1SN8ugSujf/ZftoLv bBU//j9ma2C8y9rFyMkhIWAisXjOMnYIW0ziwr31bF2MXBxCAksZJf48/w/lNDFJrPhzgxmk ik3AUKLrbRcbiC0ioCExpesxWDezQI3EpGN7wGqEBcIlNu7fCLaBRUBVovHnbKYuRg4OXgF3 ieb7jBDL5CT+v1zBBGJzCnhIbPj7CswWAip5uPIj6wRG3gWMDKsYRVNLkwuKk9JzDfWKE3OL S/PS9ZLzczcxQgLlyw7GxcesDjEKcDAq8fBabLgfKsSaWFZcmXuIUYKDWUmEN0ToQagQb0pi ZVVqUX58UWlOavEhRmkOFiVx3rm73ocICaQnlqRmp6YWpBbBZJk4OKUaGFn9cm6u3mf2huNJ +NLMmjTuDzHm3rMtr6+NvVtyaInFgswY8UmTHsT8Fl8w7ZrKlle6J/5eddDdferynRuR3Ef6 2CtX/LpxczuD4cKgwOiZJwx32lxta9XhnXv1yEE2TtGrNpanNPZsmfHtTUj8uw1d92Zeyv0R tD/AdVrwV6dPlpO2vtLouCymxFKckWioxVxUnAgAJcfyMBACAAA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150828_013810_721830_31C7CD2B X-CRM114-Status: GOOD ( 15.91 ) X-Spam-Score: -8.3 (--------) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Russell King - ARM Linux , stable@vger.kernel.org, Marek Szyprowski MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 CC: stable@vger.kernel.org # v3.6+ --- 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 67ae0f2ed983..25ecc6afec4c 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -1424,6 +1424,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) {