From: Mark Brown <broonie@linaro.org>
Date: Sat, 24 May 2014 13:04:44 +0000 (+0100)
Subject: Merge remote-tracking branch 'lsk/v3.10/topic/arm64-dma' into lsk-v3.10-arm64-misc
X-Git-Tag: firefly_0821_release~3680^2~35^2~1^2~11
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ea3518bfc02dff43d671a4f9e2799882689a0db4;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'lsk/v3.10/topic/arm64-dma' into lsk-v3.10-arm64-misc

Conflicts:
	arch/arm64/Kconfig
	arch/arm64/mm/dma-mapping.c
	mm/Kconfig
---

ea3518bfc02dff43d671a4f9e2799882689a0db4
diff --cc arch/arm64/Kconfig
index 1eded479dfd7,e418519ec904..21201a0cb3f7
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -28,7 -21,7 +28,8 @@@ config ARM6
  	select HAVE_DEBUG_KMEMLEAK
  	select HAVE_DMA_API_DEBUG
  	select HAVE_DMA_ATTRS
+ 	select HAVE_DMA_CONTIGUOUS
 +	select HAVE_EFFICIENT_UNALIGNED_ACCESS
  	select HAVE_GENERIC_DMA_COHERENT
  	select HAVE_GENERIC_HARDIRQS
  	select HAVE_HW_BREAKPOINT if PERF_EVENTS
diff --cc mm/Kconfig
index 19b2bd2f6a61,26a5f815cfc3..b2d1aed56439
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@@ -478,5 -478,26 +478,29 @@@ config FRONTSWA
  
  	  If unsure, say Y to enable frontswap.
  
 +config GENERIC_EARLY_IOREMAP
 +	bool
++
+ config CMA
+ 	bool "Contiguous Memory Allocator"
+ 	depends on HAVE_MEMBLOCK
+ 	select MIGRATION
+ 	select MEMORY_ISOLATION
+ 	help
+ 	  This enables the Contiguous Memory Allocator which allows other
+ 	  subsystems to allocate big physically-contiguous blocks of memory.
+ 	  CMA reserves a region of memory and allows only movable pages to
+ 	  be allocated from it. This way, the kernel can use the memory for
+ 	  pagecache and when a subsystem requests for contiguous area, the
+ 	  allocated pages are migrated away to serve the contiguous request.
+ 
+ 	  If unsure, say "n".
+ 
+ config CMA_DEBUG
+ 	bool "CMA debug messages (DEVELOPMENT)"
+ 	depends on DEBUG_KERNEL && CMA
+ 	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.