From patchwork Tue Jan 5 15:28:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 59194 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp6032413lbb; Tue, 5 Jan 2016 07:30:19 -0800 (PST) X-Received: by 10.66.136.101 with SMTP id pz5mr6014410pab.91.1452007789097; Tue, 05 Jan 2016 07:29:49 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ra6si60252562pab.90.2016.01.05.07.29.48; Tue, 05 Jan 2016 07:29:49 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752459AbcAEP3s (ORCPT + 2 others); Tue, 5 Jan 2016 10:29:48 -0500 Received: from mx2.suse.de ([195.135.220.15]:41374 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752203AbcAEP3s (ORCPT ); Tue, 5 Jan 2016 10:29:48 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id A9D79AC3B; Tue, 5 Jan 2016 15:29:44 +0000 (UTC) From: Jiri Slaby To: stable@vger.kernel.org Cc: Marek Szyprowski , Russell King , Jiri Slaby Subject: [patch added to the 3.12 stable tree] ARM: 8427/1: dma-mapping: add support for offset parameter in dma_mmap() Date: Tue, 5 Jan 2016 16:28:24 +0100 Message-Id: <1452007726-3747-23-git-send-email-jslaby@suse.cz> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1452007726-3747-1-git-send-email-jslaby@suse.cz> References: <1452007726-3747-1-git-send-email-jslaby@suse.cz> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Marek Szyprowski This patch has been added to the 3.12 stable tree. If you have any objections, please let us know. -- 2.6.4 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html =============== 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: Jiri Slaby --- 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) {