diff options
| author | Linus Torvalds | 2019-07-20 21:09:52 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2019-07-20 21:09:52 +0200 |
| commit | ac60602a6d8f6830dee89f4b87ee005f62eb7171 (patch) | |
| tree | ea8810e0d7abc82755c8db00904015ecbf99a8b4 /arch/x86/Kconfig | |
| parent | Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | dma-direct: correct the physical addr in dma_direct_sync_sg_for_cpu/device (diff) | |
| download | kernel-qcow2-linux-ac60602a6d8f6830dee89f4b87ee005f62eb7171.tar.gz kernel-qcow2-linux-ac60602a6d8f6830dee89f4b87ee005f62eb7171.tar.xz kernel-qcow2-linux-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 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 78772870facd..222855cc0158 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1526,6 +1526,7 @@ config AMD_MEM_ENCRYPT depends on X86_64 && CPU_SUP_AMD select DYNAMIC_PHYSICAL_MASK select ARCH_USE_MEMREMAP_PROT + select ARCH_HAS_FORCE_DMA_UNENCRYPTED ---help--- Say yes to enable support for the encryption of system memory. This requires an AMD processor that supports Secure Memory |