Skip to content
  • Linus Torvalds's avatar
    Merge tag 'dma-mapping-5.10' of git://git.infradead.org/users/hch/dma-mapping · 5a32c341
    Linus Torvalds authored
    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
      ...
    5a32c341
Loading