iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Blackfin: convert DMA code to a proper bitmap

Browse Source 
Rather than using our own data structures that basically boil down to a
bitmap, use the standard bitmap functions.

Reported-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Michael Hennerich
2009-09-23 11:32:52 +00:00
committed by Mike Frysinger
parent ddcd7cb857
commit cb5ae60f7a
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
arch/blackfin/kernel/dma-mapping.c
View File

@ -19,7 +19,7 @@
#include <asm/bfin-global.h> #include <asm/bfin-global.h>
static spinlock_t dma_page_lock; static spinlock_t dma_page_lock;
static unsigned int *dma_page; static unsigned long *dma_page;
static unsigned int dma_pages; static unsigned int dma_pages;
static unsigned long dma_base; static unsigned long dma_base;
static unsigned long dma_size; static unsigned long dma_size;
@ -30,7 +30,7 @@ void dma_alloc_init(unsigned long start, unsigned long end)
spin_lock_init(&dma_page_lock); spin_lock_init(&dma_page_lock);
dma_initialized = 0; dma_initialized = 0;
dma_page = (unsigned int *)__get_free_page(GFP_KERNEL); dma_page = (unsigned long *)__get_free_page(GFP_KERNEL);
memset(dma_page, 0, PAGE_SIZE); memset(dma_page, 0, PAGE_SIZE);
dma_base = PAGE_ALIGN(start); dma_base = PAGE_ALIGN(start);
dma_size = PAGE_ALIGN(end) - PAGE_ALIGN(start); dma_size = PAGE_ALIGN(end) - PAGE_ALIGN(start);
@ -58,10 +58,11 @@ static unsigned long __alloc_dma_pages(unsigned int pages)
spin_lock_irqsave(&dma_page_lock, flags); spin_lock_irqsave(&dma_page_lock, flags);
for (i = 0; i < dma_pages;) { for (i = 0; i < dma_pages;) {
if (dma_page[i++] == 0) { if (test_bit(i++, dma_page) == 0) {
if (++count == pages) { if (++count == pages) {
while (count--) while (count--)
dma_page[--i] = 1; __set_bit(--i, dma_page);
ret = dma_base + (i << PAGE_SHIFT); ret = dma_base + (i << PAGE_SHIFT);
break; break;
} }
@ -84,9 +85,9 @@ static void __free_dma_pages(unsigned long addr, unsigned int pages)
} }
spin_lock_irqsave(&dma_page_lock, flags); spin_lock_irqsave(&dma_page_lock, flags);
for (i = page; i < page + pages; i++) { for (i = page; i < page + pages; i++)
dma_page[i] = 0; __clear_bit(i, dma_page);
}
spin_unlock_irqrestore(&dma_page_lock, flags); spin_unlock_irqrestore(&dma_page_lock, flags);
} }