Commit 2ed90dbb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull dma-mapping updates from Christoph Hellwig:

 - make support for dma_ops optional

 - move more code out of line

 - add generic support for a dma_ops bypass mode

 - misc cleanups

* tag 'dma-mapping-5.9' of git://git.infradead.org/users/hch/dma-mapping:
  dma-contiguous: cleanup dma_alloc_contiguous
  dma-debug: use named initializers for dir2name
  powerpc: use the generic dma_ops_bypass mode
  dma-mapping: add a dma_ops_bypass flag to struct device
  dma-mapping: make support for dma ops optional
  dma-mapping: inline the fast path dma-direct calls
  dma-mapping: move the remaining DMA API calls out of line
parents 9fa867d2 274b3f7b

arch/alpha/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ config ALPHA 
	select ARCH_NO_PREEMPT

	select ARCH_NO_SG_CHAIN

	select ARCH_USE_CMPXCHG_LOCKREF

	select DMA_OPS if PCI

	select FORCE_PCI if !ALPHA_JENSEN

	select PCI_DOMAINS if PCI

	select PCI_SYSCALL if PCI

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ config ARM 
	select CPU_PM if SUSPEND || CPU_IDLE

	select DCACHE_WORD_ACCESS if HAVE_EFFICIENT_UNALIGNED_ACCESS

	select DMA_DECLARE_COHERENT

	select DMA_OPS

	select DMA_REMAP if MMU

	select EDAC_SUPPORT

	select EDAC_ATOMIC_SCRUB

arch/ia64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ config IA64_SGI_UV 


config IA64_HP_SBA_IOMMU

	bool "HP SBA IOMMU support"

	select DMA_OPS

	default y

	help

	  Say Y here to add support for the SBA IOMMU found on HP zx1 and

arch/mips/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -366,6 +366,7 @@ config MACH_JAZZ 
	select ARC_PROMLIB

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select ARCH_MIGHT_HAVE_PC_SERIO

	select DMA_OPS

	select FW_ARC

	select FW_ARC32

	select ARCH_MAY_HAVE_PC_FDC

arch/parisc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ config PARISC 
	select ARCH_HAS_UBSAN_SANITIZE_ALL

	select ARCH_NO_SG_CHAIN

	select ARCH_SUPPORTS_MEMORY_FAILURE

	select DMA_OPS

	select RTC_CLASS

	select RTC_DRV_GENERIC

	select INIT_ALL_POSSIBLE

CRA Git | Maintained and supported by SUSTech CRA and CCSE