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>

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 8e6a67ecf06981915b4bc607d28303d3687199c5..1fd9645b0c6766eeb70d4ef9d59e120c508a9e2b 100644 (file)
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -10,6 +10,7 @@ config ALPHA
        select HAVE_OPROFILE
        select HAVE_PCSPKR_PLATFORM
        select HAVE_PERF_EVENTS
+       select NEED_DMA_MAP_STATE
        select NEED_SG_DMA_LENGTH
        select VIRT_TO_BUS
        select GENERIC_IRQ_PROBE
@@ -68,9 +69,6 @@ config ZONE_DMA
 config ARCH_DMA_ADDR_T_64BIT
        def_bool y
 
-config NEED_DMA_MAP_STATE
-       def_bool y
-
 config GENERIC_ISA_DMA
        bool
        default y

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 0d2930df7580d9fb36f5ac79a007d03af67a4668..924ccac1836b320238ea7477ffd01919fd4217ad 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -95,6 +95,7 @@ config ARM
        select HAVE_VIRT_CPU_ACCOUNTING_GEN
        select IRQ_FORCED_THREADING
        select MODULES_USE_ELF_REL
+       select NEED_DMA_MAP_STATE
        select NO_BOOTMEM
        select OF_EARLY_FLATTREE if OF
        select OF_RESERVED_MEM if OF
@@ -220,9 +221,6 @@ config ARCH_MAY_HAVE_PC_FDC
 config ZONE_DMA
        bool
 
-config NEED_DMA_MAP_STATE
-       def_bool y
-
 config ARCH_SUPPORTS_UPROBES
        def_bool y
 

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index eab772a51aad628d3e8e726b6cddc381d3516d20..7259ca83212094993173b068790a7eb768090dad 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -132,6 +132,7 @@ config ARM64
        select IRQ_FORCED_THREADING
        select MODULES_USE_ELF_RELA
        select MULTI_IRQ_HANDLER
+       select NEED_DMA_MAP_STATE
        select NEED_SG_DMA_LENGTH
        select NO_BOOTMEM
        select OF
@@ -240,9 +241,6 @@ config HAVE_GENERIC_GUP
 config ARCH_DMA_ADDR_T_64BIT
        def_bool y
 
-config NEED_DMA_MAP_STATE
-       def_bool y
-
 config SMP
        def_bool y
 

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 5381e46fe21df7df2e371c4acaa392d28eab0ce0..7fd94b41b6da1ebfe769db1c5737150f2402730b 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -53,6 +53,7 @@ config IA64
        select MODULES_USE_ELF_RELA
        select ARCH_USE_CMPXCHG_LOCKREF
        select HAVE_ARCH_AUDITSYSCALL
+       select NEED_DMA_MAP_STATE
        select NEED_SG_DMA_LENGTH
        default y
        help
@@ -81,9 +82,6 @@ config MMU
 config ARCH_DMA_ADDR_T_64BIT
        def_bool y
 
-config NEED_DMA_MAP_STATE
-       def_bool y
-
 config SWIOTLB
        bool
 

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index fa7e9bbfdd9692306371773dc7b23d1ab9362740..2f53a486c86ac9dc76585c502470c85cc053db0c 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1121,9 +1121,6 @@ config DMA_NONCOHERENT
        bool
        select NEED_DMA_MAP_STATE
 
-config NEED_DMA_MAP_STATE
-       bool
-
 config SYS_HAS_EARLY_PRINTK
        bool
 

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 89caea87556eb05b7abc249e2aec3ba1d0e2cce4..4d8f64d4859790b97b11f337f8e7774164f1ee59 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -51,6 +51,7 @@ config PARISC
        select GENERIC_CLOCKEVENTS
        select ARCH_NO_COHERENT_DMA_MMAP
        select CPU_NO_EFFICIENT_FFS
+       select NEED_DMA_MAP_STATE
        select NEED_SG_DMA_LENGTH
 
        help
@@ -112,9 +113,6 @@ config PM
 config STACKTRACE_SUPPORT
        def_bool y
 
-config NEED_DMA_MAP_STATE
-       def_bool y
-
 config ISA_DMA_API
        bool
 

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index a36b4e4e010ac9143a940309fdaa5399429d7e1e..6bdac4c2a64aaddb183567ae81fd37fe18b8124b 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -710,6 +710,7 @@ menuconfig PCI
        select PCI_MSI
        select IOMMU_HELPER
        select IOMMU_SUPPORT
+       select NEED_DMA_MAP_STATE
        select NEED_SG_DMA_LENGTH
 
        help
@@ -735,9 +736,6 @@ config PCI_DOMAINS
 config HAS_IOMEM
        def_bool PCI
 
-config NEED_DMA_MAP_STATE
-       def_bool PCI
-
 config CHSC_SCH
        def_tristate m
        prompt "Support for CHSC subchannels"

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index a0f1c4a8a093010477aecc03ae200a07be080e32..7d521926041e6d119d96b01e8f9c2e8f877f44ba 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -49,6 +49,7 @@ config SUPERH
        select HAVE_ARCH_AUDITSYSCALL
        select HAVE_FUTEX_CMPXCHG if FUTEX
        select HAVE_NMI
+       select NEED_DMA_MAP_STATE
        select NEED_SG_DMA_LENGTH
 
        help
@@ -161,9 +162,6 @@ config DMA_COHERENT
 config DMA_NONCOHERENT
        def_bool !DMA_COHERENT
 
-config NEED_DMA_MAP_STATE
-       def_bool DMA_NONCOHERENT
-
 config PGTABLE_LEVELS
        default 3 if X2TLB
        default 2

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index a2f4483d9b6eef490646c24a789b6b0a5cae147b..304c94b50171070e1a8fba2b197074c4c0142774 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -43,6 +43,7 @@ config SPARC
        select ARCH_HAS_SG_CHAIN
        select CPU_NO_EFFICIENT_FFS
        select LOCKDEP_SMALL if LOCKDEP
+       select NEED_DMA_MAP_STATE
        select NEED_SG_DMA_LENGTH
 
 config SPARC32
@@ -143,9 +144,6 @@ config ZONE_DMA
        bool
        default y if SPARC32
 
-config NEED_DMA_MAP_STATE
-       def_bool y
-
 config GENERIC_ISA_DMA
        bool
        default y if SPARC32

diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
index 462e59a7ae7832a3b34bd7afaa9d3ec9343408b1..82195714d20b29dfb0729642fb975ee66652f0be 100644 (file)
--- a/arch/unicore32/Kconfig
+++ b/arch/unicore32/Kconfig
@@ -19,6 +19,7 @@ config UNICORE32
        select ARCH_WANT_FRAME_POINTERS
        select GENERIC_IOMAP
        select MODULES_USE_ELF_REL
+       select NEED_DMA_MAP_STATE
        help
          UniCore-32 is 32-bit Instruction Set Architecture,
          including a series of low-power-consumption RISC chip
@@ -61,9 +62,6 @@ config ARCH_MAY_HAVE_PC_FDC
 config ZONE_DMA
        def_bool y
 
-config NEED_DMA_MAP_STATE
-       def_bool y
-
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 9cbadd6ba27be5ed880f0732c30fc46d17cd2007..06eea9bffecb6a532d66ac7d7bd06aa3e4f58d58 100644 (file)
--- 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

diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index df171cb8582296b91eb1547b51b480cc12184f22..5b714a062fa7119188f745c4ebbe3586e6c468b7 100644 (file)
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -146,6 +146,7 @@ config INTEL_IOMMU
        select DMA_DIRECT_OPS
        select IOMMU_API
        select IOMMU_IOVA
+       select NEED_DMA_MAP_STATE
        select DMAR_TABLE
        help
          DMA remapping (DMAR) devices support enables independent address

diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index a6d4ac8b81e46a6276bc160cf126f43fb846b560..25a9a2b04f7853c176790cd9e8945bff9013055e 100644 (file)
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -838,7 +838,7 @@ static inline int dma_mmap_wc(struct device *dev,
 #define dma_mmap_writecombine dma_mmap_wc
 #endif
 
-#if defined(CONFIG_NEED_DMA_MAP_STATE) || defined(CONFIG_DMA_API_DEBUG)
+#ifdef CONFIG_NEED_DMA_MAP_STATE
 #define DEFINE_DMA_UNMAP_ADDR(ADDR_NAME)        dma_addr_t ADDR_NAME
 #define DEFINE_DMA_UNMAP_LEN(LEN_NAME)          __u32 LEN_NAME
 #define dma_unmap_addr(PTR, ADDR_NAME)           ((PTR)->ADDR_NAME)

diff --git a/lib/Kconfig b/lib/Kconfig
index aeb7fae16bc2f542e350247b7c13b346fa34a869..ce9fa962d59b0ab507a2d809b4b911aaaf2f4447 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -432,6 +432,9 @@ config SGL_ALLOC
 config NEED_SG_DMA_LENGTH
        bool
 
+config NEED_DMA_MAP_STATE
+       bool
+
 config IOMMU_HELPER
        bool
 

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 45100eda1dab0e4584669e049309f8cf68a1594f..d5175eb7b917d94049ddad72b53a5bb1d005fd7d 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1634,6 +1634,7 @@ config PROVIDE_OHCI1394_DMA_INIT
 
 config DMA_API_DEBUG
        bool "Enable debugging of DMA-API usage"
+       select NEED_DMA_MAP_STATE
        help
          Enable this option to debug the use of the DMA API by device drivers.
          With this option you will be able to detect common bugs in device