Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4ea6918 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Marek Szyprowski
Browse files

ARM: dma-mapping: fix atomic allocation alignment 



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: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
parent 39f78e70

arch/arm/mm/dma-mapping.c

+3 −3
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ static void *__alloc_from_pool(size_t size, struct page **ret_page) 
	unsigned int pageno;

	unsigned long flags;

	void *ptr = NULL;

	size_t align;

	unsigned long align_mask;



	if (!pool->vaddr) {

		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

	 * 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);

	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) {

		bitmap_set(pool->bitmap, pageno, count);

		ptr = pool->vaddr + PAGE_SIZE * pageno;