Merge tag 'dma-mapping-5.7' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping updates from Christoph Hellwig: - fix an integer overflow in the coherent pool (Kevin Grandemange) - provide support for in-place uncached remapping and use that for openrisc - fix the arm coherent allocator to take the bus limit into account * tag 'dma-mapping-5.7' of git://git.infradead.org/users/hch/dma-mapping: ARM/dma-mapping: merge __dma_supported into arm_dma_supported ARM/dma-mapping: take the bus limit into account in __dma_alloc ARM/dma-mapping: remove get_coherent_dma_mask openrisc: use the generic in-place uncached DMA allocator dma-direct: provide a arch_dma_clear_uncached hook dma-direct: make uncached_kernel_address more general dma-direct: consolidate the error handling in dma_direct_alloc_pages dma-direct: remove the cached_kernel_address hook dma-coherent: fix integer overflow in the reserved-memory dma allocation
Showing
- arch/Kconfig 11 additions, 4 deletionsarch/Kconfig
- arch/arm/include/asm/dma-iommu.h 0 additions, 2 deletionsarch/arm/include/asm/dma-iommu.h
- arch/arm/mm/dma-mapping.c 18 additions, 58 deletionsarch/arm/mm/dma-mapping.c
- arch/microblaze/Kconfig 1 addition, 1 deletionarch/microblaze/Kconfig
- arch/microblaze/mm/consistent.c 1 addition, 8 deletionsarch/microblaze/mm/consistent.c
- arch/mips/Kconfig 2 additions, 1 deletionarch/mips/Kconfig
- arch/mips/mm/dma-noncoherent.c 1 addition, 6 deletionsarch/mips/mm/dma-noncoherent.c
- arch/nios2/Kconfig 2 additions, 1 deletionarch/nios2/Kconfig
- arch/nios2/mm/dma-mapping.c 1 addition, 11 deletionsarch/nios2/mm/dma-mapping.c
- arch/openrisc/Kconfig 2 additions, 0 deletionsarch/openrisc/Kconfig
- arch/openrisc/kernel/dma.c 10 additions, 45 deletionsarch/openrisc/kernel/dma.c
- arch/xtensa/Kconfig 1 addition, 1 deletionarch/xtensa/Kconfig
- arch/xtensa/kernel/pci-dma.c 3 additions, 9 deletionsarch/xtensa/kernel/pci-dma.c
- include/linux/dma-noncoherent.h 2 additions, 2 deletionsinclude/linux/dma-noncoherent.h
- kernel/dma/coherent.c 7 additions, 6 deletionskernel/dma/coherent.c
- kernel/dma/direct.c 14 additions, 11 deletionskernel/dma/direct.c
Loading
Please register or sign in to comment