Merge tag 'dma-mapping-5.3' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping updates from Christoph Hellwig: - move the USB special case that bounced DMA through a device bar into the USB code instead of handling it in the common DMA code (Laurentiu Tudor and Fredrik Noring) - don't dip into the global CMA pool for single page allocations (Nicolin Chen) - fix a crash when allocating memory for the atomic pool failed during boot (Florian Fainelli) - move support for MIPS-style uncached segments to the common code and use that for MIPS and nios2 (me) - make support for DMA_ATTR_NON_CONSISTENT and DMA_ATTR_NO_KERNEL_MAPPING generic (me) - convert nds32 to the generic remapping allocator (me) * tag 'dma-mapping-5.3' of git://git.infradead.org/users/hch/dma-mapping: (29 commits) dma-mapping: mark dma_alloc_need_uncached as __always_inline MIPS: only select ARCH_HAS_UNCACHED_SEGMENT for non-coherent platforms usb: host: Fix excessive alignment restriction for local memory allocations lib/genalloc.c: Add algorithm, align and zeroed family of DMA allocators nios2: use the generic uncached segment support in dma-direct nds32: use the generic remapping allocator for coherent DMA allocations arc: use the generic remapping allocator for coherent DMA allocations dma-direct: handle DMA_ATTR_NO_KERNEL_MAPPING in common code dma-direct: handle DMA_ATTR_NON_CONSISTENT in common code dma-mapping: add a dma_alloc_need_uncached helper openrisc: remove the partial DMA_ATTR_NON_CONSISTENT support arc: remove the partial DMA_ATTR_NON_CONSISTENT support arm-nommu: remove the partial DMA_ATTR_NON_CONSISTENT support ARM: dma-mapping: allow larger DMA mask than supported dma-mapping: truncate dma masks to what dma_addr_t can hold iommu/dma: Apply dma_{alloc,free}_contiguous functions dma-remap: Avoid de-referencing NULL atomic_pool MIPS: use the generic uncached segment support in dma-direct dma-direct: provide generic support for uncached kernel segments au1100fb: fix DMA API abuse ...
No related branches found
No related tags found
Showing
- arch/Kconfig 8 additions, 0 deletionsarch/Kconfig
- arch/arc/Kconfig 2 additions, 0 deletionsarch/arc/Kconfig
- arch/arc/mm/dma.c 10 additions, 61 deletionsarch/arc/mm/dma.c
- arch/arm/mm/dma-mapping-nommu.c 3 additions, 21 deletionsarch/arm/mm/dma-mapping-nommu.c
- arch/arm/mm/dma-mapping.c 1 addition, 19 deletionsarch/arm/mm/dma-mapping.c
- arch/mips/Kconfig 1 addition, 0 deletionsarch/mips/Kconfig
- arch/mips/include/asm/page.h 0 additions, 3 deletionsarch/mips/include/asm/page.h
- arch/mips/jazz/jazzdma.c 0 additions, 6 deletionsarch/mips/jazz/jazzdma.c
- arch/mips/mm/cache.c 0 additions, 2 deletionsarch/mips/mm/cache.c
- arch/mips/mm/dma-noncoherent.c 9 additions, 17 deletionsarch/mips/mm/dma-noncoherent.c
- arch/nds32/Kconfig 2 additions, 0 deletionsarch/nds32/Kconfig
- arch/nds32/kernel/dma.c 11 additions, 314 deletionsarch/nds32/kernel/dma.c
- arch/nios2/Kconfig 1 addition, 0 deletionsarch/nios2/Kconfig
- arch/nios2/include/asm/page.h 0 additions, 6 deletionsarch/nios2/include/asm/page.h
- arch/nios2/mm/dma-mapping.c 15 additions, 19 deletionsarch/nios2/mm/dma-mapping.c
- arch/openrisc/kernel/dma.c 9 additions, 13 deletionsarch/openrisc/kernel/dma.c
- arch/parisc/kernel/pci-dma.c 13 additions, 35 deletionsarch/parisc/kernel/pci-dma.c
- arch/xtensa/kernel/pci-dma.c 1 addition, 7 deletionsarch/xtensa/kernel/pci-dma.c
- drivers/iommu/dma-iommu.c 4 additions, 10 deletionsdrivers/iommu/dma-iommu.c
- drivers/usb/Kconfig 1 addition, 0 deletionsdrivers/usb/Kconfig
Loading
Please register or sign in to comment