Merge tag 'dma-mapping-5.10' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Oct 2020 21:43:29 +0000 (14:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Oct 2020 21:43:29 +0000 (14:43 -0700)
commit5a32c3413d3340f90c82c84b375ad4b335a59f28
tree4166f2ff0fca170bdd9bab6e56cac99baac37ace
parentf065199d4df0b1512f935621d2de128ddb3fcc3a
parent2a410d09417b5344ab1f3cf001ac73a1daf8dcce
Merge tag 'dma-mapping-5.10' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping updates from Christoph Hellwig:

 - rework the non-coherent DMA allocator

 - move private definitions out of <linux/dma-mapping.h>

 - lower CMA_ALIGNMENT (Paul Cercueil)

 - remove the omap1 dma address translation in favor of the common code

 - make dma-direct aware of multiple dma offset ranges (Jim Quinlan)

 - support per-node DMA CMA areas (Barry Song)

 - increase the default seg boundary limit (Nicolin Chen)

 - misc fixes (Robin Murphy, Thomas Tai, Xu Wang)

 - various cleanups

* tag 'dma-mapping-5.10' of git://git.infradead.org/users/hch/dma-mapping: (63 commits)
  ARM/ixp4xx: add a missing include of dma-map-ops.h
  dma-direct: simplify the DMA_ATTR_NO_KERNEL_MAPPING handling
  dma-direct: factor out a dma_direct_alloc_from_pool helper
  dma-direct check for highmem pages in dma_direct_alloc_pages
  dma-mapping: merge <linux/dma-noncoherent.h> into <linux/dma-map-ops.h>
  dma-mapping: move large parts of <linux/dma-direct.h> to kernel/dma
  dma-mapping: move dma-debug.h to kernel/dma/
  dma-mapping: remove <asm/dma-contiguous.h>
  dma-mapping: merge <linux/dma-contiguous.h> into <linux/dma-map-ops.h>
  dma-contiguous: remove dma_contiguous_set_default
  dma-contiguous: remove dev_set_cma_area
  dma-contiguous: remove dma_declare_contiguous
  dma-mapping: split <linux/dma-mapping.h>
  cma: decrease CMA_ALIGNMENT lower limit to 2
  firewire-ohci: use dma_alloc_pages
  dma-iommu: implement ->alloc_noncoherent
  dma-mapping: add new {alloc,free}_noncoherent dma_map_ops methods
  dma-mapping: add a new dma_alloc_pages API
  dma-mapping: remove dma_cache_sync
  53c700: convert to dma_alloc_noncoherent
  ...
38 files changed:
Documentation/admin-guide/kernel-parameters.txt
MAINTAINERS
arch/arm/mm/init.c
arch/arm/xen/mm.c
arch/arm64/mm/init.c
arch/ia64/Kconfig
arch/ia64/mm/init.c
arch/microblaze/mm/init.c
arch/mips/Kconfig
arch/mips/cavium-octeon/dma-octeon.c
arch/mips/kernel/setup.c
arch/parisc/Kconfig
arch/s390/kernel/setup.c
arch/x86/kernel/setup.c
arch/x86/pci/sta2x11-fixup.c
arch/xtensa/mm/init.c
drivers/acpi/arm64/iort.c
drivers/acpi/scan.c
drivers/base/core.c
drivers/base/dd.c
drivers/gpu/drm/exynos/exynos_drm_dma.c
drivers/gpu/drm/exynos/exynos_drm_gem.c
drivers/gpu/drm/msm/msm_gem.c
drivers/gpu/drm/sun4i/sun4i_backend.c
drivers/iommu/amd/iommu.c
drivers/iommu/dma-iommu.c
drivers/iommu/intel/iommu.c
drivers/iommu/io-pgtable-arm.c
drivers/media/platform/exynos4-is/fimc-is.c
drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c
drivers/usb/core/message.c
include/linux/device.h
include/linux/gfp.h
kernel/dma/contiguous.c
kernel/dma/swiotlb.c
mm/Kconfig
mm/hugetlb.c
mm/memory.c