Commit 2382dc9a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull dma mapping updates from Christoph Hellwig:
 "Except for a runtime warning fix from Christian this is all about
  consolidation of the generic no-IOMMU code, a well as the glue code
  for swiotlb.

  All the code is based on the x86 implementation with hooks to allow
  all architectures that aren't cache coherent to use it.

  The x86 conversion itself has been deferred because the x86
  maintainers were a little busy in the last months"

* tag 'dma-mapping-4.16' of git://git.infradead.org/users/hch/dma-mapping: (57 commits)
  MAINTAINERS: add the iommu list for swiotlb and xen-swiotlb
  arm64: use swiotlb_alloc and swiotlb_free
  arm64: replace ZONE_DMA with ZONE_DMA32
  mips: use swiotlb_{alloc,free}
  mips/netlogic: remove swiotlb support
  tile: use generic swiotlb_ops
  tile: replace ZONE_DMA with ZONE_DMA32
  unicore32: use generic swiotlb_ops
  ia64: remove an ifdef around the content of pci-dma.c
  ia64: clean up swiotlb support
  ia64: use generic swiotlb_ops
  ia64: replace ZONE_DMA with ZONE_DMA32
  swiotlb: remove various exports
  swiotlb: refactor coherent buffer allocation
  swiotlb: refactor coherent buffer freeing
  swiotlb: wire up ->dma_supported in swiotlb_dma_ops
  swiotlb: add common swiotlb_map_ops
  swiotlb: rename swiotlb_free to swiotlb_exit
  x86: rename swiotlb_dma_ops
  powerpc: rename swiotlb_dma_ops
  ...
parents 28bc6fb9 04f56534

MAINTAINERS

+5 −2
Original line number Diff line number Diff line
@@ -4343,10 +4343,12 @@ T: git git://git.infradead.org/users/hch/dma-mapping.git 
W:	http://git.infradead.org/users/hch/dma-mapping.git

S:	Supported

F:	lib/dma-debug.c

F:	lib/dma-noop.c

F:	lib/dma-direct.c

F:	lib/dma-virt.c

F:	drivers/base/dma-mapping.c

F:	drivers/base/dma-coherent.c

F:	include/asm-generic/dma-mapping.h

F:	include/linux/dma-direct.h

F:	include/linux/dma-mapping.h



DME1737 HARDWARE MONITOR DRIVER
@@ -13071,7 +13073,7 @@ F: arch/x86/boot/video* 


SWIOTLB SUBSYSTEM

M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

L:	linux-kernel@vger.kernel.org

L:	iommu@lists.linux-foundation.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git

S:	Supported

F:	lib/swiotlb.c
@@ -15026,6 +15028,7 @@ F: include/xen/interface/io/vscsiif.h 
XEN SWIOTLB SUBSYSTEM

M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

L:	xen-devel@lists.xenproject.org (moderated for non-subscribers)

L:	iommu@lists.linux-foundation.org

S:	Supported

F:	arch/x86/xen/*swiotlb*

F:	drivers/xen/*swiotlb*

arch/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -938,6 +938,10 @@ config STRICT_MODULE_RWX 
	  and non-text memory will be made non-executable. This provides

	  protection against certain security exploits (e.g. writing to text)



# select if the architecture provides an asm/dma-direct.h header

config ARCH_HAS_PHYS_TO_DMA

	bool



config ARCH_HAS_REFCOUNT

	bool

	help

arch/alpha/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ config ALPHA_EIGER 


config ALPHA_JENSEN

	bool "Jensen"

	depends on BROKEN

	help

	  DEC PC 150 AXP (aka Jensen): This is a very old Digital system - one

	  of the first-generation Alpha systems. A number of these systems

arch/arc/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -463,9 +463,6 @@ config ARCH_PHYS_ADDR_T_64BIT 
config ARCH_DMA_ADDR_T_64BIT

	bool



config ARC_PLAT_NEEDS_PHYS_TO_DMA

	bool



config ARC_KVADDR_SIZE

	int "Kernel Virtual Address Space size (MB)"

	range 0 512

arch/arc/include/asm/dma-mapping.h

+0 −7
Original line number Diff line number Diff line
@@ -11,13 +11,6 @@ 
#ifndef ASM_ARC_DMA_MAPPING_H

#define ASM_ARC_DMA_MAPPING_H



#ifndef CONFIG_ARC_PLAT_NEEDS_PHYS_TO_DMA

#define plat_dma_to_phys(dev, dma_handle) ((phys_addr_t)(dma_handle))

#define plat_phys_to_dma(dev, paddr) ((dma_addr_t)(paddr))

#else

#include <plat/dma.h>

#endif



extern const struct dma_map_ops arc_dma_ops;



static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)

CRA Git | Maintained and supported by SUSTech CRA and CCSE