From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 10 Mar 2019 18:54:48 +0000 (-0700)
Subject: Merge tag 'dma-mapping-5.1' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Tag: 5.1-rc-smb3~75
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=b7a7d1c1ec688104fdc922568c26395a756f616d;p=sfrench%2Fcifs-2.6.git

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
  ...
---

b7a7d1c1ec688104fdc922568c26395a756f616d
diff --cc arch/x86/Kconfig
index 90b562a34d65,0e33dede053e..c1f9b3cf437c
--- a/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 kernel/dma/Kconfig
index 0711d18645de,212aac7c675f..a06ba3013b3b
--- a/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 ARCH_HAS_DMA_SET_MASK
 +	bool
 +
- config HAVE_GENERIC_DMA_COHERENT
+ 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