Skip to content

Commit

Permalink
ARM: dma-mapping: Refactor out to introduce __in_atomic_pool
Browse files Browse the repository at this point in the history
Check the given range("start", "size") is included in "atomic_pool" or not.

Signed-off-by: Hiroshi Doyu <hdoyu@nvidia.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
  • Loading branch information
Hiroshi Doyu authored and Marek Szyprowski committed Aug 28, 2012
1 parent 6b3fe47 commit 21d0a75
Showing 1 changed file with 20 additions and 6 deletions.
26 changes: 20 additions & 6 deletions arch/arm/mm/dma-mapping.c
Original file line number Diff line number Diff line change
Expand Up @@ -482,20 +482,34 @@ static void *__alloc_from_pool(size_t size, struct page **ret_page)
return ptr;
}

static bool __in_atomic_pool(void *start, size_t size)
{
struct dma_pool *pool = &atomic_pool;
void *end = start + size;
void *pool_start = pool->vaddr;
void *pool_end = pool->vaddr + pool->size;

if (start < pool_start || start > pool_end)
return false;

if (end <= pool_end)
return true;

WARN(1, "Wrong coherent size(%p-%p) from atomic pool(%p-%p)\n",
start, end - 1, pool_start, pool_end - 1);

return false;
}

static int __free_from_pool(void *start, size_t size)
{
struct dma_pool *pool = &atomic_pool;
unsigned long pageno, count;
unsigned long flags;

if (start < pool->vaddr || start > pool->vaddr + pool->size)
if (!__in_atomic_pool(start, size))
return 0;

if (start + size > pool->vaddr + pool->size) {
WARN(1, "freeing wrong coherent size from pool\n");
return 0;
}

pageno = (start - pool->vaddr) >> PAGE_SHIFT;
count = size >> PAGE_SHIFT;

Expand Down

0 comments on commit 21d0a75

Please sign in to comment.