diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-20 12:09:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-20 12:09:52 -0700 |
| commit | ac60602a6d8f6830dee89f4b87ee005f62eb7171 (patch) | |
| tree | ea8810e0d7abc82755c8db00904015ecbf99a8b4 /kernel/dma/Kconfig | |
| parent | Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| parent | dma-direct: correct the physical addr in dma_direct_sync_sg_for_cpu/device (diff) | |
| download | linux-dev-ac60602a6d8f6830dee89f4b87ee005f62eb7171.tar.xz linux-dev-ac60602a6d8f6830dee89f4b87ee005f62eb7171.zip | |
Merge tag 'dma-mapping-5.3-1' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping fixes from Christoph Hellwig:
"Fix various regressions:
- force unencrypted dma-coherent buffers if encryption bit can't fit
into the dma coherent mask (Tom Lendacky)
- avoid limiting request size if swiotlb is not used (me)
- fix swiotlb handling in dma_direct_sync_sg_for_cpu/device (Fugang
Duan)"
* tag 'dma-mapping-5.3-1' of git://git.infradead.org/users/hch/dma-mapping:
dma-direct: correct the physical addr in dma_direct_sync_sg_for_cpu/device
dma-direct: only limit the mapping size if swiotlb could be used
dma-mapping: add a dma_addressing_limited helper
dma-direct: Force unencrypted DMA under SME for certain DMA masks
Diffstat (limited to 'kernel/dma/Kconfig')
| -rw-r--r-- | kernel/dma/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/dma/Kconfig b/kernel/dma/Kconfig index 70f8f8d9200e..9decbba255fc 100644 --- a/kernel/dma/Kconfig +++ b/kernel/dma/Kconfig @@ -48,6 +48,9 @@ config ARCH_HAS_DMA_COHERENT_TO_PFN config ARCH_HAS_DMA_MMAP_PGPROT bool +config ARCH_HAS_FORCE_DMA_UNENCRYPTED + bool + config DMA_NONCOHERENT_CACHE_SYNC bool |