Merge tag 'dma-mapping-5.1' of git://git.infradead.org/users/hch/dma-mapping

Pull DMA mapping updates from Christoph Hellwig:

 - add debugfs support for dumping dma-debug information (Corentin
   Labbe)

 - Kconfig cleanups (Andy Shevchenko and me)

 - debugfs cleanups (Greg Kroah-Hartman)

 - improve dma_map_resource and use it in the media code

 - arch_setup_dma_ops / arch_teardown_dma_ops cleanups

 - various small cleanups and improvements for the per-device coherent
   allocator

 - make the DMA mask an upper bound and don't fail "too large" dma mask
   in the remaning two architectures - this will allow big driver
   cleanups in the following merge windows

* tag 'dma-mapping-5.1' of git://git.infradead.org/users/hch/dma-mapping: (21 commits)
  Documentation/DMA-API-HOWTO: update dma_mask sections
  sparc64/pci_sun4v: allow large DMA masks
  sparc64/iommu: allow large DMA masks
  sparc64: refactor the ali DMA quirk
  ccio: allow large DMA masks
  dma-mapping: remove the DMA_MEMORY_EXCLUSIVE flag
  dma-mapping: remove dma_mark_declared_memory_occupied
  dma-mapping: move CONFIG_DMA_CMA to kernel/dma/Kconfig
  dma-mapping: improve selection of dma_declare_coherent availability
  dma-mapping: remove an incorrect __iommem annotation
  of: select OF_RESERVED_MEM automatically
  device.h: dma_mem is only needed for HAVE_GENERIC_DMA_COHERENT
  mfd/sm501: depend on HAS_DMA
  dma-mapping: add a kconfig symbol for arch_teardown_dma_ops availability
  dma-mapping: add a kconfig symbol for arch_setup_dma_ops availability
  dma-mapping: move debug configuration options to kernel/dma
  dma-debug: add dumping facility via debugfs
  dma: debug: no need to check return value of debugfs_create functions
  videobuf2: replace a layering violation with dma_map_resource
  dma-mapping: don't BUG when calling dma_map_resource on RAM
  ...

diff --cc Documentation/DMA-API.txt
Simple merge

diff --cc arch/arc/Kconfig
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mm/dma-mapping.c
Simple merge

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/csky/Kconfig
Simple merge

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/mips/mm/dma-noncoherent.c
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/riscv/Kconfig
Simple merge

diff --cc arch/sh/Kconfig
Simple merge

diff --cc arch/sh/boards/mach-ecovec24/setup.c
Simple merge

diff --cc arch/sh/boards/mach-migor/setup.c
Simple merge

diff --cc arch/unicore32/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
index 90b562a34d6546742578893dfe605f574829af69,0e33dede053eacfe767ef317a6e0f2e72e4352e0..c1f9b3cf437c3aa9018ff3288282e575f870424c
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -14,7 -14,7 +14,6 @@@ config X86_3
        select ARCH_WANT_IPC_PARSE_VERSION
        select CLKSRC_I8253
        select CLONE_BACKWARDS
-       select HAVE_GENERIC_DMA_COHERENT
 -      select HAVE_AOUT
        select MODULES_USE_ELF_REL
        select OLD_SIGACTION
  

diff --cc arch/xtensa/Kconfig
Simple merge

diff --cc drivers/mfd/Kconfig
Simple merge

diff --cc drivers/parisc/ccio-dma.c
Simple merge

diff --cc include/linux/device.h
Simple merge

diff --cc kernel/dma/Kconfig
index 0711d18645de3d666ee4d52a8b4411b33593a92f,212aac7c675fce02417d15af14318721a0471268..a06ba3013b3b6da68d870da1a329a791cdead33d
--- 1/kernel/dma/Kconfig
--- 2/kernel/dma/Kconfig
+++ b/kernel/dma/Kconfig
@@@ -16,10 -16,13 +16,16 @@@ config ARCH_DMA_ADDR_T_64BI
  config ARCH_HAS_DMA_COHERENCE_H
        bool
  
- config HAVE_GENERIC_DMA_COHERENT
 +config ARCH_HAS_DMA_SET_MASK
 +      bool
 +
+ config DMA_DECLARE_COHERENT
+       bool
+ 
+ config ARCH_HAS_SETUP_DMA_OPS
+       bool
+ 
+ config ARCH_HAS_TEARDOWN_DMA_OPS
        bool
  
  config ARCH_HAS_SYNC_DMA_FOR_DEVICE

diff --cc kernel/dma/direct.c
Simple merge

diff --cc lib/Kconfig.debug
Simple merge