Skip to contentSkip to conversation

dma-mapping updates for 5.9

GIT PULL Merged Christoph Hellwig 2 participants 2 messages Aug 3, 2020 – Aug 5, 2020

lore
Share & tools
lore
#0 lore raw

Note that this adds a select to drivers/iommu/Kconfig symbols which moves to drivers/iommu/intel/Kconfig in the iommu tree.

The following changes since commit d9765e41d8e9ea2251bf73735a2895c8bad546fc:

dma-pool: do not allocate pool memory from CMA (2020-07-14 15:46:32 +0200)

are available in the Git repository at:

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

for you to fetch changes up to 274b3f7bf34415eed106e479e4815e897ce5d763:

dma-contiguous: cleanup dma_alloc_contiguous (2020-07-28 13:42:15 +0200)

----------------------------------------------------------------
dma-mapping updates for 5.9

- make support for dma_ops optional
- move more code out of line
- add generic support for a dma_ops bypass mode
- misc cleanups

----------------------------------------------------------------
Christoph Hellwig (7):
dma-mapping: move the remaining DMA API calls out of line
dma-mapping: inline the fast path dma-direct calls
dma-mapping: make support for dma ops optional
dma-mapping: add a dma_ops_bypass flag to struct device
powerpc: use the generic dma_ops_bypass mode
dma-debug: use named initializers for dir2name
dma-contiguous: cleanup dma_alloc_contiguous

 arch/alpha/Kconfig                |   1 +
 arch/arm/Kconfig                  |   1 +
 arch/ia64/Kconfig                 |   1 +
 arch/mips/Kconfig                 |   1 +
 arch/parisc/Kconfig               |   1 +
 arch/powerpc/Kconfig              |   2 +
 arch/powerpc/include/asm/device.h |   5 -
 arch/powerpc/kernel/dma-iommu.c   |  90 ++------------
 arch/s390/Kconfig                 |   1 +
 arch/sparc/Kconfig                |   1 +
 arch/x86/Kconfig                  |   1 +
 drivers/infiniband/core/device.c  |   6 +-
 drivers/iommu/Kconfig             |   2 +
 drivers/macintosh/macio_asic.c    |   4 +-
 drivers/misc/mic/Kconfig          |   4 +
 drivers/vdpa/Kconfig              |   1 +
 drivers/xen/Kconfig               |   1 +
 include/linux/device.h            |  11 +-
 include/linux/dma-direct.h        | 104 ++++++++++++++++
 include/linux/dma-mapping.h       | 251 +++++---------------------------------
 kernel/dma/Kconfig                |  12 ++
 kernel/dma/Makefile               |   3 +-
 kernel/dma/contiguous.c           |  31 +++--
 kernel/dma/debug.c                |   8 +-
 kernel/dma/direct.c               |  74 -----------
 kernel/dma/mapping.c              | 214 ++++++++++++++++++++++++++++++--
 26 files changed, 415 insertions(+), 416 deletions(-)
merge bot Merged
#1 lore raw
The pull request you sent on Mon, 3 Aug 2020 16:15:47 +0200:

The pull request you sent on Mon, 3 Aug 2020 16:15:47 +0200:

Quoted 1 line

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

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/2ed90dbbf7be3b7cd2790fc6fa946c478ab496b8

Thank you!

Signature · 6 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu