[GIT,PULL] dma-mapping updates for 5.7
mbox series

Message ID 20200404065855.GA656254@infradead.org
State In Next
Commit 6f43bae38269a55534e1f86a9917318167de6639
Headers show
Series
  • [GIT,PULL] dma-mapping updates for 5.7
Related show

Pull-request

git://git.infradead.org/users/hch/dma-mapping.git tags/dma-mapping-5.7

Message

Christoph Hellwig April 4, 2020, 6:58 a.m. UTC
The following changes since commit 11a48a5a18c63fd7621bb050228cebf13566e4d8:

  Linux 5.6-rc2 (2020-02-16 13:16:59 -0800)

are available in the Git repository at:

  git://git.infradead.org/users/hch/dma-mapping.git tags/dma-mapping-5.7

for you to fetch changes up to fd27a526bb381f43dded6db30b3b016468ab0e6c:

  ARM/dma-mapping: merge __dma_supported into arm_dma_supported (2020-03-20 11:43:21 +0100)

----------------------------------------------------------------
dma-mapping updates for 5.7

 - 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

----------------------------------------------------------------
Christoph Hellwig (8):
      dma-direct: remove the cached_kernel_address hook
      dma-direct: consolidate the error handling in dma_direct_alloc_pages
      dma-direct: make uncached_kernel_address more general
      dma-direct: provide a arch_dma_clear_uncached hook
      openrisc: use the generic in-place uncached DMA allocator
      ARM/dma-mapping: remove get_coherent_dma_mask
      ARM/dma-mapping: take the bus limit into account in __dma_alloc
      ARM/dma-mapping: merge __dma_supported into arm_dma_supported

Kevin Grandemange (1):
      dma-coherent: fix integer overflow in the reserved-memory dma allocation

 arch/Kconfig                     | 15 +++++---
 arch/arm/include/asm/dma-iommu.h |  2 --
 arch/arm/mm/dma-mapping.c        | 76 ++++++++++------------------------------
 arch/microblaze/Kconfig          |  2 +-
 arch/microblaze/mm/consistent.c  |  9 +----
 arch/mips/Kconfig                |  3 +-
 arch/mips/mm/dma-noncoherent.c   |  7 +---
 arch/nios2/Kconfig               |  3 +-
 arch/nios2/mm/dma-mapping.c      | 12 +------
 arch/openrisc/Kconfig            |  2 ++
 arch/openrisc/kernel/dma.c       | 55 ++++++-----------------------
 arch/xtensa/Kconfig              |  2 +-
 arch/xtensa/kernel/pci-dma.c     | 12 ++-----
 include/linux/dma-noncoherent.h  |  4 +--
 kernel/dma/coherent.c            | 13 +++----
 kernel/dma/direct.c              | 25 +++++++------
 16 files changed, 76 insertions(+), 166 deletions(-)

Comments

pr-tracker-bot@kernel.org April 4, 2020, 5:50 p.m. UTC | #1
The pull request you sent on Sat, 4 Apr 2020 08:58:55 +0200:

> git://git.infradead.org/users/hch/dma-mapping.git tags/dma-mapping-5.7

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/6f43bae38269a55534e1f86a9917318167de6639

Thank you!