From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 29 Mar 2022 15:50:14 +0000 (-0700)
Subject: Merge tag 'dma-mapping-5.18' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Tag: v6.6.17~7865
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9ae2a143081fa8fba5042431007b33d9a855b7a2;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull dma-mapping updates from Christoph Hellwig:

 - do not zero buffer in set_memory_decrypted (Kirill A. Shutemov)

 - fix return value of dma-debug __setup handlers (Randy Dunlap)

 - swiotlb cleanups (Robin Murphy)

 - remove most remaining users of the pci-dma-compat.h API
   (Christophe JAILLET)

 - share the ABI header for the DMA map_benchmark with userspace
   (Tian Tao)

 - update the maintainer for DMA MAPPING BENCHMARK (Xiang Chen)

 - remove CONFIG_DMA_REMAP (me)

* tag 'dma-mapping-5.18' of git://git.infradead.org/users/hch/dma-mapping:
  dma-mapping: benchmark: extract a common header file for map_benchmark definition
  dma-debug: fix return value of __setup handlers
  dma-mapping: remove CONFIG_DMA_REMAP
  media: v4l2-pci-skeleton: Remove usage of the deprecated "pci-dma-compat.h" API
  rapidio/tsi721: Remove usage of the deprecated "pci-dma-compat.h" API
  sparc: Remove usage of the deprecated "pci-dma-compat.h" API
  agp/intel: Remove usage of the deprecated "pci-dma-compat.h" API
  alpha: Remove usage of the deprecated "pci-dma-compat.h" API
  MAINTAINERS: update maintainer list of DMA MAPPING BENCHMARK
  swiotlb: simplify array allocation
  swiotlb: tidy up includes
  swiotlb: simplify debugfs setup
  swiotlb: do not zero buffer in set_memory_decrypted()
---

9ae2a143081fa8fba5042431007b33d9a855b7a2
diff --cc arch/xtensa/Kconfig
index f46c7d2,76438ee..bd113bc
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@@ -18,12 -17,9 +18,12 @@@ config XTENS
  	select BUILDTIME_TABLE_SORT
  	select CLONE_BACKWARDS
  	select COMMON_CLK
- 	select DMA_REMAP if MMU
+ 	select DMA_NONCOHERENT_MMAP if MMU
  	select GENERIC_ATOMIC64
  	select GENERIC_IRQ_SHOW
 +	select GENERIC_LIB_CMPDI2
 +	select GENERIC_LIB_MULDI3
 +	select GENERIC_LIB_UCMPDI2
  	select GENERIC_PCI_IOMAP
  	select GENERIC_SCHED_CLOCK
  	select HAVE_ARCH_AUDITSYSCALL