From: Marek Szyprowski <m.szyprowski@samsung.com>
To: linux-arm-kernel@lists.infradead.org,
linaro-mm-sig@lists.linaro.org, linux-mm@kvack.org,
linux-arch@vger.kernel.org, iommu@lists.linux-foundation.org
Cc: Marek Szyprowski <m.szyprowski@samsung.com>,
Kyungmin Park <kyungmin.park@samsung.com>,
Arnd Bergmann <arnd@arndb.de>, Joerg Roedel <joro@8bytes.org>,
Russell King - ARM Linux <linux@arm.linux.org.uk>,
Chunsang Jeong <chunsang.jeong@linaro.org>,
Krishna Reddy <vdumpa@nvidia.com>,
KyongHo Cho <pullip.cho@samsung.com>,
Andrzej Pietrasiewicz <andrzej.p@samsung.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
Hiroshi Doyu <hdoyu@nvidia.com>,
Subash Patel <subashrp@gmail.com>
Subject: [PATCHv10 02/11] ARM: dma-mapping: use dma_mmap_from_coherent()
Date: Thu, 17 May 2012 15:13:52 +0200 [thread overview]
Message-ID: <1337260441-8121-3-git-send-email-m.szyprowski@samsung.com> (raw)
In-Reply-To: <1337260441-8121-1-git-send-email-m.szyprowski@samsung.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
arch/arm/mm/dma-mapping.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index db23ae4..7ec0863 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -401,6 +401,9 @@ static int dma_mmap(struct device *dev, struct vm_area_struct *vma,
unsigned long user_size, kern_size;
struct arm_vmregion *c;
+ if (dma_mmap_from_coherent(dev, vma, cpu_addr, size, &ret))
+ return ret;
+
user_size = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
c = arm_vmregion_find(&consistent_head, (unsigned long)cpu_addr);
--
1.7.10.1
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2012-05-17 13:16 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-17 13:13 [PATCHv10 00/11] ARM: DMA-mapping framework redesign Marek Szyprowski
2012-05-17 13:13 ` [PATCHv10 01/11] common: add dma_mmap_from_coherent() function Marek Szyprowski
2012-05-17 13:13 ` Marek Szyprowski [this message]
2012-05-17 13:13 ` [PATCHv10 03/11] ARM: dma-mapping: use pr_* instread of printk Marek Szyprowski
2012-05-17 13:13 ` [PATCHv10 04/11] ARM: dma-mapping: introduce DMA_ERROR_CODE constant Marek Szyprowski
2012-05-17 13:13 ` [PATCHv10 05/11] ARM: dma-mapping: remove offset parameter to prepare for generic dma_ops Marek Szyprowski
2012-05-17 13:13 ` [PATCHv10 06/11] ARM: dma-mapping: use asm-generic/dma-mapping-common.h Marek Szyprowski
2012-05-17 13:13 ` [PATCHv10 07/11] ARM: dma-mapping: implement dma sg methods on top of any generic dma ops Marek Szyprowski
2012-05-17 13:13 ` [PATCHv10 08/11] ARM: dma-mapping: move all dma bounce code to separate dma ops structure Marek Szyprowski
2012-05-17 13:13 ` [PATCHv10 09/11] ARM: dma-mapping: remove redundant code and do the cleanup Marek Szyprowski
2012-05-17 13:14 ` [PATCHv10 10/11] ARM: dma-mapping: use alloc, mmap, free from dma_ops Marek Szyprowski
2012-05-17 13:14 ` [PATCHv10 11/11] ARM: dma-mapping: add support for IOMMU mapper Marek Szyprowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1337260441-8121-3-git-send-email-m.szyprowski@samsung.com \
--to=m.szyprowski@samsung.com \
--cc=andrzej.p@samsung.com \
--cc=arnd@arndb.de \
--cc=benh@kernel.crashing.org \
--cc=chunsang.jeong@linaro.org \
--cc=hdoyu@nvidia.com \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=konrad.wilk@oracle.com \
--cc=kyungmin.park@samsung.com \
--cc=linaro-mm-sig@lists.linaro.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mm@kvack.org \
--cc=linux@arm.linux.org.uk \
--cc=pullip.cho@samsung.com \
--cc=subashrp@gmail.com \
--cc=vdumpa@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox