Commit 21d0a759 authored by Hiroshi Doyu's avatar Hiroshi Doyu Committed by Marek Szyprowski

ARM: dma-mapping: Refactor out to introduce __in_atomic_pool

Check the given range("start", "size") is included in "atomic_pool" or not.
Signed-off-by: default avatarHiroshi Doyu <hdoyu@nvidia.com>
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
parent 6b3fe472
...@@ -482,20 +482,34 @@ static void *__alloc_from_pool(size_t size, struct page **ret_page) ...@@ -482,20 +482,34 @@ static void *__alloc_from_pool(size_t size, struct page **ret_page)
return ptr; 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) static int __free_from_pool(void *start, size_t size)
{ {
struct dma_pool *pool = &atomic_pool; struct dma_pool *pool = &atomic_pool;
unsigned long pageno, count; unsigned long pageno, count;
unsigned long flags; unsigned long flags;
if (start < pool->vaddr || start > pool->vaddr + pool->size) if (!__in_atomic_pool(start, size))
return 0; 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; pageno = (start - pool->vaddr) >> PAGE_SHIFT;
count = size >> PAGE_SHIFT; count = size >> PAGE_SHIFT;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment