summaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorChristoph Hellwig2018-05-09 06:53:49 +0200
committerChristoph Hellwig2018-05-09 06:56:08 +0200
commitf616ab59c294b6ea6efa94f6139ea3eda2f52be0 (patch)
tree7433ad06ac074cb3c94196bab89615e66c0c86a8 /arch/x86/Kconfig
parentscatterlist: move the NEED_SG_DMA_LENGTH config symbol to lib/Kconfig (diff)
downloadkernel-qcow2-linux-f616ab59c294b6ea6efa94f6139ea3eda2f52be0.tar.gz
kernel-qcow2-linux-f616ab59c294b6ea6efa94f6139ea3eda2f52be0.tar.xz
kernel-qcow2-linux-f616ab59c294b6ea6efa94f6139ea3eda2f52be0.zip
dma-mapping: move the NEED_DMA_MAP_STATE config symbol to lib/Kconfig
This way we have one central definition of it, and user can select it as needed. Note that we now also always select it when CONFIG_DMA_API_DEBUG is select, which fixes some incorrect checks in a few network drivers. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Anshuman Khandual <khandual@linux.vnet.ibm.com>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 9cbadd6ba27b..06eea9bffecb 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -28,6 +28,7 @@ config X86_64
select ARCH_USE_CMPXCHG_LOCKREF
select HAVE_ARCH_SOFT_DIRTY
select MODULES_USE_ELF_RELA
+ select NEED_DMA_MAP_STATE
select X86_DEV_DMA_OPS
select ARCH_HAS_SYSCALL_WRAPPER
@@ -236,10 +237,6 @@ config ARCH_MMAP_RND_COMPAT_BITS_MAX
config SBUS
bool
-config NEED_DMA_MAP_STATE
- def_bool y
- depends on X86_64 || INTEL_IOMMU || DMA_API_DEBUG || SWIOTLB
-
config GENERIC_ISA_DMA
def_bool y
depends on ISA_DMA_API
@@ -925,6 +922,7 @@ config CALGARY_IOMMU_ENABLED_BY_DEFAULT
# need this always selected by IOMMU for the VIA workaround
config SWIOTLB
def_bool y if X86_64
+ select NEED_DMA_MAP_STATE
---help---
Support for software bounce buffers used on x86-64 systems
which don't have a hardware IOMMU. Using this PCI devices