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

Commit e464ef16 authored by Gioh Kim's avatar Gioh Kim Committed by Marek Szyprowski
Browse files

arm: dma-mapping: add checking cma area initialized 



If CMA is turned on and CMA size is set to zero, kernel should
behave as if CMA was not enabled at compile time.
Every dma allocation should check existence of cma area
before requesting memory.

Signed-off-by: default avatarGioh Kim <gioh.kim@lge.com>
Signed-off-by: default avatarJoonsoo Kim <iamjoonsoo.kim@lge.com>
Acked-by: default avatarMichal Nazarewicz <mina86@mina86.com>
[mszyprow: removed redundant empty line from the patch]
Signed-off-by: default avatar <m.szyprowski@samsung.com>
parent 006f841d

arch/arm/mm/dma-mapping.c

+3 −3
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ static int __init atomic_pool_init(void) 
	if (!pages)

		goto no_pages;



	if (IS_ENABLED(CONFIG_DMA_CMA))

	if (dev_get_cma_area(NULL))

		ptr = __alloc_from_contiguous(NULL, pool->size, prot, &page,

					      atomic_pool_init);

	else
@@ -701,7 +701,7 @@ static void *__dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, 
		addr = __alloc_simple_buffer(dev, size, gfp, &page);

	else if (!(gfp & __GFP_WAIT))

		addr = __alloc_from_pool(size, &page);

	else if (!IS_ENABLED(CONFIG_DMA_CMA))

	else if (!dev_get_cma_area(dev))

		addr = __alloc_remap_buffer(dev, size, gfp, prot, &page, caller);

	else

		addr = __alloc_from_contiguous(dev, size, prot, &page, caller);
@@ -790,7 +790,7 @@ static void __arm_dma_free(struct device *dev, size_t size, void *cpu_addr, 
		__dma_free_buffer(page, size);

	} else if (__free_from_pool(cpu_addr, size)) {

		return;

	} else if (!IS_ENABLED(CONFIG_DMA_CMA)) {

	} else if (!dev_get_cma_area(dev)) {

		__dma_free_remap(cpu_addr, size);

		__dma_free_buffer(page, size);

	} else {