From: hdoyu@nvidia.com (Hiroshi Doyu)
To: linux-arm-kernel@lists.infradead.org
Subject: [RFC 3/4] ARM: dma-mapping: Return cpu addr when dma_alloc(GFP_ATOMIC)
Date: Wed, 22 Aug 2012 10:20:57 -0000 [thread overview]
Message-ID: <1345630830-9586-4-git-send-email-hdoyu@nvidia.com> (raw)
In-Reply-To: <1345630830-9586-1-git-send-email-hdoyu@nvidia.com>
Make dma_alloc{_attrs}() returns cpu address when
DMA_ATTR_NO_KERNEL_MAPPING && GFP_ATOMIC.
Signed-off-by: Hiroshi Doyu <hdoyu@nvidia.com>
---
arch/arm/mm/dma-mapping.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 9260107..a0cd476 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -1198,8 +1198,11 @@ static void *arm_iommu_alloc_attrs(struct device *dev, size_t size,
if (*handle == DMA_ERROR_CODE)
goto err_buffer;
- if (dma_get_attr(DMA_ATTR_NO_KERNEL_MAPPING, attrs))
+ if (dma_get_attr(DMA_ATTR_NO_KERNEL_MAPPING, attrs)) {
+ if (gfp & GFP_ATOMIC)
+ return page_address(pages[0]);
return pages;
+ }
addr = __iommu_alloc_remap(pages, size, gfp, prot,
__builtin_return_address(0));
--
1.7.5.4
next prev parent reply other threads:[~2012-08-22 10:20 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-22 10:20 [RFC 0/4] ARM: dma-mapping: IOMMU atomic allocation Hiroshi Doyu
2012-08-22 10:20 ` [RFC 1/4] ARM: dma-mapping: Refactor out to introduce __alloc_fill_pages Hiroshi Doyu
2012-08-22 10:20 ` [RFC 2/4] ARM: dma-mapping: IOMMU allocates pages from pool with GFP_ATOMIC Hiroshi Doyu
2012-08-22 12:29 ` Marek Szyprowski
2012-08-22 12:52 ` Hiroshi Doyu
2012-08-22 12:47 ` KyongHo Cho
2012-08-22 13:36 ` Hiroshi Doyu
2012-08-23 3:49 ` Minchan Kim
2012-08-23 3:57 ` KyongHo Cho
2012-08-23 5:58 ` Marek Szyprowski
2012-08-23 6:15 ` Hiroshi Doyu
2012-08-23 7:52 ` Marek Szyprowski
2012-08-22 10:20 ` Hiroshi Doyu [this message]
2012-08-22 10:21 ` [RFC 4/4] ARM: dma-mapping: dma_{alloc, free}_coherent with empty attrs Hiroshi Doyu
2012-08-22 12:04 ` [RFC 0/4] ARM: dma-mapping: IOMMU atomic allocation Marek Szyprowski
2012-08-22 14:44 ` Hiroshi Doyu
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=1345630830-9586-4-git-send-email-hdoyu@nvidia.com \
--to=hdoyu@nvidia.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).