Skip to content

Commit

Permalink
Blackfin: convert DMA code to a proper bitmap
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Michael Hennerich authored and Mike Frysinger committed Dec 15, 2009
1 parent ddcd7cb commit cb5ae60
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions arch/blackfin/kernel/dma-mapping.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <asm/bfin-global.h>

static spinlock_t dma_page_lock;
static unsigned int *dma_page;
static unsigned long *dma_page;
static unsigned int dma_pages;
static unsigned long dma_base;
static unsigned long dma_size;
Expand All @@ -30,7 +30,7 @@ void dma_alloc_init(unsigned long start, unsigned long end)
spin_lock_init(&dma_page_lock);
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);
dma_base = PAGE_ALIGN(start);
dma_size = PAGE_ALIGN(end) - PAGE_ALIGN(start);
Expand Down Expand Up @@ -58,10 +58,11 @@ static unsigned long __alloc_dma_pages(unsigned int pages)
spin_lock_irqsave(&dma_page_lock, flags);

for (i = 0; i < dma_pages;) {
if (dma_page[i++] == 0) {
if (test_bit(i++, dma_page) == 0) {
if (++count == pages) {
while (count--)
dma_page[--i] = 1;
__set_bit(--i, dma_page);

ret = dma_base + (i << PAGE_SHIFT);
break;
}
Expand All @@ -84,9 +85,9 @@ static void __free_dma_pages(unsigned long addr, unsigned int pages)
}

spin_lock_irqsave(&dma_page_lock, flags);
for (i = page; i < page + pages; i++) {
dma_page[i] = 0;
}
for (i = page; i < page + pages; i++)
__clear_bit(i, dma_page);

spin_unlock_irqrestore(&dma_page_lock, flags);
}

Expand Down

0 comments on commit cb5ae60

Please sign in to comment.