diff options
| author | David Rientjes <rientjes@google.com> | 2020-06-11 00:25:57 -0700 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2020-06-15 08:35:30 +0200 |
| commit | dbed452a078d56bc7f1abecc3edd6a75e8e4484e (patch) | |
| tree | 41c79e400f6c40dd8a4e97db5aa1b028514277c7 /kernel | |
| parent | 3ee06a6d532f75f20528ff4d2c473cda36c484fe (diff) | |
| download | linux-dbed452a078d56bc7f1abecc3edd6a75e8e4484e.tar.bz2 | |
dma-pool: decouple DMA_REMAP from DMA_COHERENT_POOL
DMA_REMAP is an unnecessary requirement for AMD SEV, which requires
DMA_COHERENT_POOL, so avoid selecting it when it is otherwise unnecessary.
The only other requirement for DMA coherent pools is DMA_DIRECT_REMAP, so
ensure that properly selects the config option when needed.
Fixes: 82fef0ad811f ("x86/mm: unencrypted non-blocking DMA allocations use coherent pools")
Reported-by: Alex Xu (Hello71) <alex_y_xu@yahoo.ca>
Signed-off-by: David Rientjes <rientjes@google.com>
Tested-by: Alex Xu (Hello71) <alex_y_xu@yahoo.ca>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/dma/Kconfig | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/dma/Kconfig b/kernel/dma/Kconfig index d006668c0027..a0ce3c1494fd 100644 --- a/kernel/dma/Kconfig +++ b/kernel/dma/Kconfig @@ -73,18 +73,18 @@ config SWIOTLB config DMA_NONCOHERENT_MMAP bool +config DMA_COHERENT_POOL + bool + config DMA_REMAP + bool depends on MMU select GENERIC_ALLOCATOR select DMA_NONCOHERENT_MMAP - bool - -config DMA_COHERENT_POOL - bool - select DMA_REMAP config DMA_DIRECT_REMAP bool + select DMA_REMAP select DMA_COHERENT_POOL config DMA_CMA |