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

Commit f7d8f1e9 authored by Marek Szyprowski's avatar Marek Szyprowski
Browse files

Merge remote-tracking branch 'dma-public/for-v3.12-cma-dma' into for-next 



Conflicts:
	mm/Kconfig

Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
parents ad81f054 f825c736

arch/arm/include/asm/dma-contiguous.h

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#define ASMARM_DMA_CONTIGUOUS_H



#ifdef __KERNEL__

#ifdef CONFIG_CMA

#ifdef CONFIG_DMA_CMA



#include <linux/types.h>

#include <asm-generic/dma-contiguous.h>

arch/arm/mm/dma-mapping.c

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

		goto no_pages;



	if (IS_ENABLED(CONFIG_CMA))

	if (IS_ENABLED(CONFIG_DMA_CMA))

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

					      atomic_pool_init);

	else
@@ -670,7 +670,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_CMA))

	else if (!IS_ENABLED(CONFIG_DMA_CMA))

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

	else

		addr = __alloc_from_contiguous(dev, size, prot, &page, caller);
@@ -759,7 +759,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_CMA)) {

	} else if (!IS_ENABLED(CONFIG_DMA_CMA)) {

		__dma_free_remap(cpu_addr, size);

		__dma_free_buffer(page, size);

	} else {

drivers/base/Kconfig

+4 −16
Original line number Diff line number Diff line
@@ -200,11 +200,9 @@ config DMA_SHARED_BUFFER 
	  APIs extension; the file's descriptor can then be passed on to other

	  driver.



config CMA

	bool "Contiguous Memory Allocator"

	depends on HAVE_DMA_CONTIGUOUS && HAVE_MEMBLOCK

	select MIGRATION

	select MEMORY_ISOLATION

config DMA_CMA

	bool "DMA Contiguous Memory Allocator"

	depends on HAVE_DMA_CONTIGUOUS && CMA

	help

	  This enables the Contiguous Memory Allocator which allows drivers

	  to allocate big physically-contiguous blocks of memory for use with
@@ -213,17 +211,7 @@ config CMA 
	  For more information see <include/linux/dma-contiguous.h>.

	  If unsure, say "n".



if CMA



config CMA_DEBUG

	bool "CMA debug messages (DEVELOPMENT)"

	depends on DEBUG_KERNEL

	help

	  Turns on debug messages in CMA.  This produces KERN_DEBUG

	  messages for every CMA call as well as various messages while

	  processing calls such as dma_alloc_from_contiguous().

	  This option does not affect warning and error messages.



if  DMA_CMA

comment "Default contiguous memory area size:"



config CMA_SIZE_MBYTES

drivers/base/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ obj-y := core.o bus.o dd.o syscore.o \ 
			   attribute_container.o transport_class.o \

			   topology.o

obj-$(CONFIG_DEVTMPFS)	+= devtmpfs.o

obj-$(CONFIG_CMA) += dma-contiguous.o

obj-$(CONFIG_DMA_CMA) += dma-contiguous.o

obj-y			+= power/

obj-$(CONFIG_HAS_DMA)	+= dma-mapping.o

obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o

include/linux/dma-contiguous.h

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ struct cma; 
struct page;

struct device;



#ifdef CONFIG_CMA

#ifdef CONFIG_DMA_CMA



/*

 * There is always at least global CMA area and a few optional device