From: minchan@kernel.org (Minchan Kim)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: use common utility function in dma
Date: Fri, 11 May 2012 16:03:58 +0900 [thread overview]
Message-ID: <1336719838-11087-1-git-send-email-minchan@kernel.org> (raw)
mm provides alloc_pages_exact so use it instead of open coded hack.
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Minchan Kim <minchan@kernel.org>
---
arch/arm/mm/dma-mapping.c | 23 +++++------------------
1 file changed, 5 insertions(+), 18 deletions(-)
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index b982602..98c9bbd 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -184,20 +184,12 @@ static void __dma_clear_buffer(struct page *page, size_t size)
*/
static struct page *__dma_alloc_buffer(struct device *dev, size_t size, gfp_t gfp)
{
- unsigned long order = get_order(size);
- struct page *page, *p, *e;
-
- page = alloc_pages(gfp, order);
- if (!page)
+ struct page *page;
+ void *addr = alloc_pages_exact(size, gfp);
+ if (!addr)
return NULL;
- /*
- * Now split the huge page and free the excess pages
- */
- split_page(page, order);
- for (p = page + (size >> PAGE_SHIFT), e = page + (1 << order); p < e; p++)
- __free_page(p);
-
+ page = virt_to_page(addr);
__dma_clear_buffer(page, size);
return page;
@@ -208,12 +200,7 @@ static struct page *__dma_alloc_buffer(struct device *dev, size_t size, gfp_t gf
*/
static void __dma_free_buffer(struct page *page, size_t size)
{
- struct page *e = page + (size >> PAGE_SHIFT);
-
- while (page < e) {
- __free_page(page);
- page++;
- }
+ free_pages_exact(page_address(page), size);
}
#ifdef CONFIG_MMU
--
1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: Minchan Kim <minchan@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
Minchan Kim <minchan@kernel.org>,
Russell King <linux@arm.linux.org.uk>
Subject: [PATCH] ARM: use common utility function in dma
Date: Fri, 11 May 2012 16:03:58 +0900 [thread overview]
Message-ID: <1336719838-11087-1-git-send-email-minchan@kernel.org> (raw)
mm provides alloc_pages_exact so use it instead of open coded hack.
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Minchan Kim <minchan@kernel.org>
---
arch/arm/mm/dma-mapping.c | 23 +++++------------------
1 file changed, 5 insertions(+), 18 deletions(-)
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index b982602..98c9bbd 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -184,20 +184,12 @@ static void __dma_clear_buffer(struct page *page, size_t size)
*/
static struct page *__dma_alloc_buffer(struct device *dev, size_t size, gfp_t gfp)
{
- unsigned long order = get_order(size);
- struct page *page, *p, *e;
-
- page = alloc_pages(gfp, order);
- if (!page)
+ struct page *page;
+ void *addr = alloc_pages_exact(size, gfp);
+ if (!addr)
return NULL;
- /*
- * Now split the huge page and free the excess pages
- */
- split_page(page, order);
- for (p = page + (size >> PAGE_SHIFT), e = page + (1 << order); p < e; p++)
- __free_page(p);
-
+ page = virt_to_page(addr);
__dma_clear_buffer(page, size);
return page;
@@ -208,12 +200,7 @@ static struct page *__dma_alloc_buffer(struct device *dev, size_t size, gfp_t gf
*/
static void __dma_free_buffer(struct page *page, size_t size)
{
- struct page *e = page + (size >> PAGE_SHIFT);
-
- while (page < e) {
- __free_page(page);
- page++;
- }
+ free_pages_exact(page_address(page), size);
}
#ifdef CONFIG_MMU
--
1.7.9.5
--
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>
WARNING: multiple messages have this Message-ID (diff)
From: Minchan Kim <minchan@kernel.org>
To: unlisted-recipients:; (no To-header on input)
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
Minchan Kim <minchan@kernel.org>,
Russell King <linux@arm.linux.org.uk>
Subject: [PATCH] ARM: use common utility function in dma
Date: Fri, 11 May 2012 16:03:58 +0900 [thread overview]
Message-ID: <1336719838-11087-1-git-send-email-minchan@kernel.org> (raw)
mm provides alloc_pages_exact so use it instead of open coded hack.
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Minchan Kim <minchan@kernel.org>
---
arch/arm/mm/dma-mapping.c | 23 +++++------------------
1 file changed, 5 insertions(+), 18 deletions(-)
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index b982602..98c9bbd 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -184,20 +184,12 @@ static void __dma_clear_buffer(struct page *page, size_t size)
*/
static struct page *__dma_alloc_buffer(struct device *dev, size_t size, gfp_t gfp)
{
- unsigned long order = get_order(size);
- struct page *page, *p, *e;
-
- page = alloc_pages(gfp, order);
- if (!page)
+ struct page *page;
+ void *addr = alloc_pages_exact(size, gfp);
+ if (!addr)
return NULL;
- /*
- * Now split the huge page and free the excess pages
- */
- split_page(page, order);
- for (p = page + (size >> PAGE_SHIFT), e = page + (1 << order); p < e; p++)
- __free_page(p);
-
+ page = virt_to_page(addr);
__dma_clear_buffer(page, size);
return page;
@@ -208,12 +200,7 @@ static struct page *__dma_alloc_buffer(struct device *dev, size_t size, gfp_t gf
*/
static void __dma_free_buffer(struct page *page, size_t size)
{
- struct page *e = page + (size >> PAGE_SHIFT);
-
- while (page < e) {
- __free_page(page);
- page++;
- }
+ free_pages_exact(page_address(page), size);
}
#ifdef CONFIG_MMU
--
1.7.9.5
next reply other threads:[~2012-05-11 7:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-11 7:03 Minchan Kim [this message]
2012-05-11 7:03 ` [PATCH] ARM: use common utility function in dma Minchan Kim
2012-05-11 7:03 ` Minchan Kim
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=1336719838-11087-1-git-send-email-minchan@kernel.org \
--to=minchan@kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.