GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-04-25 15:53:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ARM: dma-mapping: fix atomic allocation alignment

Browse source 
The alignment mask is calculated incorrectly. Fixing the calculation
makes strange hangs/lockups disappear during the boot with Amstrad E3
and 3.6-rc1 kernel.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
This commit is contained in:
Aaro Koskinen 2012-08-07 14:39:25 +02:00 • committed by Marek Szyprowski
parent 39f78e7056
commit e4ea6918c9
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/mm/dma-mapping.c
View file

@ -423,7 +423,7 @@ static void *__alloc_from_pool(size_t size, struct page **ret_page)
unsigned int pageno; unsigned int pageno;
unsigned long flags; unsigned long flags;
void *ptr = NULL; void *ptr = NULL;
size_t align; unsigned long align_mask;
if (!pool->vaddr) { if (!pool->vaddr) {
WARN(1, "coherent pool not initialised!\n"); WARN(1, "coherent pool not initialised!\n");
@ -435,11 +435,11 @@ static void *__alloc_from_pool(size_t size, struct page **ret_page)
* small, so align them to their order in pages, minimum is a page * small, so align them to their order in pages, minimum is a page
* size. This helps reduce fragmentation of the DMA space. * size. This helps reduce fragmentation of the DMA space.
*/ */
align = PAGE_SIZE << get_order(size); align_mask = (1 << get_order(size)) - 1;
spin_lock_irqsave(&pool->lock, flags); spin_lock_irqsave(&pool->lock, flags);
pageno = bitmap_find_next_zero_area(pool->bitmap, pool->nr_pages, pageno = bitmap_find_next_zero_area(pool->bitmap, pool->nr_pages,
0, count, (1 << align) - 1); 0, count, align_mask);
if (pageno < pool->nr_pages) { if (pageno < pool->nr_pages) {
bitmap_set(pool->bitmap, pageno, count); bitmap_set(pool->bitmap, pageno, count);
ptr = pool->vaddr + PAGE_SIZE * pageno; ptr = pool->vaddr + PAGE_SIZE * pageno;