dma-mapping: make support for dma ops optional

Avoid the overhead of the dma ops support for tiny builds that only
use the direct mapping.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Tested-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 10862c5a8c7682661bb50c8131c340b8e703398a..9c5f06e8eb9bc026dd32691660eafd731a2a0048 100644 (file)
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -7,6 +7,7 @@ config ALPHA
        select ARCH_NO_PREEMPT
        select ARCH_NO_SG_CHAIN
        select ARCH_USE_CMPXCHG_LOCKREF
+       select DMA_OPS if PCI
        select FORCE_PCI if !ALPHA_JENSEN
        select PCI_DOMAINS if PCI
        select PCI_SYSCALL if PCI

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2ac74904a3ce586aa003c56752c85bb613ef6f53..bee35b0187e452d8c1fcecec8ea54a541ea9feee 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -41,6 +41,7 @@ config ARM
        select CPU_PM if SUSPEND || CPU_IDLE
        select DCACHE_WORD_ACCESS if HAVE_EFFICIENT_UNALIGNED_ACCESS
        select DMA_DECLARE_COHERENT
+       select DMA_OPS
        select DMA_REMAP if MMU
        select EDAC_SUPPORT
        select EDAC_ATOMIC_SCRUB

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 1fa2fe2ef053f8803da946a9cbf0c83185fbb949..5b4ec80bf5863ad09a1be531f98ecad6cc453193 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -192,6 +192,7 @@ config IA64_SGI_UV
 
 config IA64_HP_SBA_IOMMU
        bool "HP SBA IOMMU support"
+       select DMA_OPS
        default y
        help
          Say Y here to add support for the SBA IOMMU found on HP zx1 and

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 6fee1a133e9d6a938351c5eff65bc58c9bcd02bb..8a458105e445b6ed4501f63cf62eb94ffcc3618c 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -367,6 +367,7 @@ config MACH_JAZZ
        select ARC_PROMLIB
        select ARCH_MIGHT_HAVE_PC_PARPORT
        select ARCH_MIGHT_HAVE_PC_SERIO
+       select DMA_OPS
        select FW_ARC
        select FW_ARC32
        select ARCH_MAY_HAVE_PC_FDC

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 8e4c3708773d0897f8934126cd39fc0c28d3b579..38c1eafc1f1ae925fc93fb7ad9b181207dd89fe0 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -14,6 +14,7 @@ config PARISC
        select ARCH_HAS_UBSAN_SANITIZE_ALL
        select ARCH_NO_SG_CHAIN
        select ARCH_SUPPORTS_MEMORY_FAILURE
+       select DMA_OPS
        select RTC_CLASS
        select RTC_DRV_GENERIC
        select INIT_ALL_POSSIBLE

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 9fa23eb320ff5acd856fce7f31589fb09a17027e..e9b091d35872222f364048ae8d3121aecec84475 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -151,6 +151,7 @@ config PPC
        select BUILDTIME_TABLE_SORT
        select CLONE_BACKWARDS
        select DCACHE_WORD_ACCESS               if PPC64 && CPU_LITTLE_ENDIAN
+       select DMA_OPS                          if PPC64
        select DYNAMIC_FTRACE                   if FUNCTION_TRACER
        select EDAC_ATOMIC_SCRUB
        select EDAC_SUPPORT

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index c7d7ede6300c59d3fa5299895f84fb1e167d154e..687fe23f61cc8d1e0dbfca3d4fea78a8f58e5b03 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -113,6 +113,7 @@ config S390
        select ARCH_WANT_IPC_PARSE_VERSION
        select BUILDTIME_TABLE_SORT
        select CLONE_BACKWARDS2
+       select DMA_OPS if PCI
        select DYNAMIC_FTRACE if FUNCTION_TRACER
        select GENERIC_CLOCKEVENTS
        select GENERIC_CPU_AUTOPROBE

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 5bf2dc163540fc4af8eb774e6263c2293b76f343..5db1faaaee31c84a70d5449eff4de479b4eadc56 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -15,6 +15,7 @@ config SPARC
        default y
        select ARCH_MIGHT_HAVE_PC_PARPORT if SPARC64 && PCI
        select ARCH_MIGHT_HAVE_PC_SERIO
+       select DMA_OPS
        select OF
        select OF_PROMTREE
        select HAVE_ASM_MODVERSIONS

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 883da0abf7790c3ef8b01fe0e39688a4531cd5ac..96ab92754158dddbb95da262c387b6c16a4f1b91 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -909,6 +909,7 @@ config DMI
 
 config GART_IOMMU
        bool "Old AMD GART IOMMU support"
+       select DMA_OPS
        select IOMMU_HELPER
        select SWIOTLB
        depends on X86_64 && PCI && AMD_NB

diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
index 905a2beaf88501344903163848d6c0b3a42a6cb8..2927a9d16eaa696d2c5c791d6c3e354a22d4eb23 100644 (file)
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -1183,6 +1183,8 @@ static void setup_dma_device(struct ib_device *device)
        struct device *parent = device->dev.parent;
 
        WARN_ON_ONCE(device->dma_device);
+
+#ifdef CONFIG_DMA_OPS
        if (device->dev.dma_ops) {
                /*
                 * The caller provided custom DMA operations. Copy the
@@ -1203,7 +1205,9 @@ static void setup_dma_device(struct ib_device *device)
                        else
                                WARN_ON_ONCE(true);
                }
-       } else {
+       } else
+#endif /* CONFIG_DMA_OPS */
+       {
                /*
                 * The caller did not provide custom DMA operations. Use the
                 * DMA mapping operations of the parent device.

diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index b0f308cb7f7c2fc2af592b63b38ef5762f9c9a83..b622af72448f06f44fa366331726699c126ff0b6 100644 (file)
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -97,6 +97,7 @@ config OF_IOMMU
 # IOMMU-agnostic DMA-mapping layer
 config IOMMU_DMA
        bool
+       select DMA_OPS
        select IOMMU_API
        select IOMMU_IOVA
        select IRQ_MSI_IOMMU
@@ -183,6 +184,7 @@ config DMAR_TABLE
 config INTEL_IOMMU
        bool "Support for Intel IOMMU using DMA Remapping Devices"
        depends on PCI_MSI && ACPI && (X86 || IA64)
+       select DMA_OPS
        select IOMMU_API
        select IOMMU_IOVA
        select NEED_DMA_MAP_STATE

diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
index 92d142d2b75f45d2755a3afadc2b4b7de839b187..49af60bdac9287d71f1d3facb70565c23c5f8e70 100644 (file)
--- a/drivers/macintosh/macio_asic.c
+++ b/drivers/macintosh/macio_asic.c
@@ -382,7 +382,7 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip,
        dma_set_max_seg_size(&dev->ofdev.dev, 65536);
        dma_set_seg_boundary(&dev->ofdev.dev, 0xffffffff);
 
-#ifdef CONFIG_PCI
+#if defined(CONFIG_PCI) && defined(CONFIG_DMA_OPS)
        /* Set the DMA ops to the ones from the PCI device, this could be
         * fishy if we didn't know that on PowerMac it's always direct ops
         * or iommu ops that will work fine
@@ -391,7 +391,7 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip,
         */
        dev->ofdev.dev.archdata = chip->lbus.pdev->dev.archdata;
        dev->ofdev.dev.dma_ops = chip->lbus.pdev->dev.dma_ops;
-#endif /* CONFIG_PCI */
+#endif /* CONFIG_PCI && CONFIG_DMA_OPS */
 
 #ifdef DEBUG
        printk("preparing mdev @%p, ofdev @%p, dev @%p, kobj @%p\n",

diff --git a/drivers/misc/mic/Kconfig b/drivers/misc/mic/Kconfig
index 8f201d019f5a4d072255284d31f73c450786c4ef..b9bb086785db4849814ce65d65a0249ded0a7fcf 100644 (file)
--- a/drivers/misc/mic/Kconfig
+++ b/drivers/misc/mic/Kconfig
@@ -4,6 +4,7 @@ menu "Intel MIC & related support"
 config INTEL_MIC_BUS
        tristate "Intel MIC Bus Driver"
        depends on 64BIT && PCI && X86
+       select DMA_OPS
        help
          This option is selected by any driver which registers a
          device or driver on the MIC Bus, such as CONFIG_INTEL_MIC_HOST,
@@ -19,6 +20,7 @@ config INTEL_MIC_BUS
 config SCIF_BUS
        tristate "SCIF Bus Driver"
        depends on 64BIT && PCI && X86
+       select DMA_OPS
        help
          This option is selected by any driver which registers a
          device or driver on the SCIF Bus, such as CONFIG_INTEL_MIC_HOST
@@ -33,6 +35,7 @@ config SCIF_BUS
 
 config VOP_BUS
        tristate "VOP Bus Driver"
+       select DMA_OPS
        help
          This option is selected by any driver which registers a
          device or driver on the VOP Bus, such as CONFIG_INTEL_MIC_HOST
@@ -49,6 +52,7 @@ config INTEL_MIC_HOST
        tristate "Intel MIC Host Driver"
        depends on 64BIT && PCI && X86
        depends on INTEL_MIC_BUS && SCIF_BUS && MIC_COSM && VOP_BUS
+       select DMA_OPS
        help
          This enables Host Driver support for the Intel Many Integrated
          Core (MIC) family of PCIe form factor coprocessor devices that

diff --git a/drivers/vdpa/Kconfig b/drivers/vdpa/Kconfig
index 3e1ceb8e9f2b52695ff9bbbeab1defe8afd911ea..d93a69b12f81e3c26d556757162d0f04df7f5ef3 100644 (file)
--- a/drivers/vdpa/Kconfig
+++ b/drivers/vdpa/Kconfig
@@ -11,6 +11,7 @@ if VDPA
 config VDPA_SIM
        tristate "vDPA device simulator"
        depends on RUNTIME_TESTING_MENU && HAS_DMA
+       select DMA_OPS
        select VHOST_RING
        default n
        help

diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index 727f11eb46b2bffc8b982a5aaaf42a8492263711..1d339ef924228c84daedd4d3472d2ef7bf0176d1 100644 (file)
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -179,6 +179,7 @@ config XEN_GRANT_DMA_ALLOC
 
 config SWIOTLB_XEN
        def_bool y
+       select DMA_OPS
        select SWIOTLB
 
 config XEN_PCIDEV_BACKEND

diff --git a/include/linux/device.h b/include/linux/device.h
index 15460a5ac024a1559aa91fdee4f7471088c8ac44..4c4af98321ebd67d087f09855d1bdf456a57c4e1 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -568,8 +568,9 @@ struct device {
 #ifdef CONFIG_GENERIC_MSI_IRQ
        struct list_head        msi_list;
 #endif
-
+#ifdef CONFIG_DMA_OPS
        const struct dma_map_ops *dma_ops;
+#endif
        u64             *dma_mask;      /* dma mask (if dma'able device) */
        u64             coherent_dma_mask;/* Like dma_mask, but for
                                             alloc_coherent mappings as

diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index bd0a6f5ee445815b5d4e565c318e5e69b260e559..39da883c8619544e91fea3df2f8fd4d253f6ae00 100644 (file)
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -191,6 +191,7 @@ static inline int dma_mmap_from_global_coherent(struct vm_area_struct *vma,
 #ifdef CONFIG_HAS_DMA
 #include <asm/dma-mapping.h>
 
+#ifdef CONFIG_DMA_OPS
 static inline const struct dma_map_ops *get_dma_ops(struct device *dev)
 {
        if (dev->dma_ops)
@@ -203,7 +204,16 @@ static inline void set_dma_ops(struct device *dev,
 {
        dev->dma_ops = dma_ops;
 }
-
+#else /* CONFIG_DMA_OPS */
+static inline const struct dma_map_ops *get_dma_ops(struct device *dev)
+{
+       return NULL;
+}
+static inline void set_dma_ops(struct device *dev,
+                              const struct dma_map_ops *dma_ops)
+{
+}
+#endif /* CONFIG_DMA_OPS */
 
 static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
 {

diff --git a/kernel/dma/Kconfig b/kernel/dma/Kconfig
index 1da3f44f2565b4ff423ceb2ac027ea0cba4e9a47..5cfb2428593ac7dabf65139a73b57873fa17aedc 100644 (file)
--- a/kernel/dma/Kconfig
+++ b/kernel/dma/Kconfig
@@ -5,6 +5,9 @@ config HAS_DMA
        depends on !NO_DMA
        default y
 
+config DMA_OPS
+       bool
+
 config NEED_SG_DMA_LENGTH
        bool
 
@@ -60,6 +63,7 @@ config DMA_NONCOHERENT_CACHE_SYNC
 config DMA_VIRT_OPS
        bool
        depends on HAS_DMA
+       select DMA_OPS
 
 config SWIOTLB
        bool

diff --git a/kernel/dma/Makefile b/kernel/dma/Makefile
index 370f63344e9cd9de663eb51a7738777968b74c3d..32c7c1942bbd6cf3eb8c16019a10ec07d0520f98 100644 (file)
--- a/kernel/dma/Makefile
+++ b/kernel/dma/Makefile
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 
-obj-$(CONFIG_HAS_DMA)                  += mapping.o direct.o dummy.o
+obj-$(CONFIG_HAS_DMA)                  += mapping.o direct.o
+obj-$(CONFIG_DMA_OPS)                  += dummy.o
 obj-$(CONFIG_DMA_CMA)                  += contiguous.o
 obj-$(CONFIG_DMA_DECLARE_COHERENT)     += coherent.o
 obj-$(CONFIG_DMA_VIRT_OPS)             += virt.o