Merge tag 'dma-rename-4.18' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping rename from Christoph Hellwig:
 "Move all the dma-mapping code to kernel/dma and lose their dma-*
  prefixes"

* tag 'dma-rename-4.18' of git://git.infradead.org/users/hch/dma-mapping:
  dma-mapping: move all DMA mapping code to kernel/dma
  dma-mapping: use obj-y instead of lib-y for generic dma ops

18 files changed, 69 insertions, 72 deletions

diff --git a/Documentation/driver-api/infrastructure.rst b/Documentation/driver-api/infrastructure.rst
index bee1b9a1702f..6172f3cc3d0b 100644
--- a/Documentation/driver-api/infrastructure.rst
+++ b/Documentation/driver-api/infrastructure.rst
@@ -49,10 +49,10 @@ Device Drivers Base
 Device Drivers DMA Management
 -----------------------------
 
-.. kernel-doc:: drivers/base/dma-coherent.c
+.. kernel-doc:: kernel/dma/coherent.c
    :export:
 
-.. kernel-doc:: drivers/base/dma-mapping.c
+.. kernel-doc:: kernel/dma/mapping.c
    :export:
 
 Device drivers PnP support
diff --git a/MAINTAINERS b/MAINTAINERS
index 624c3fd11d04..1d7d648d8aad 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4360,12 +4360,7 @@ L:	iommu@lists.linux-foundation.org
 T:      git git://git.infradead.org/users/hch/dma-mapping.git
 W:      http://git.infradead.org/users/hch/dma-mapping.git
 S:      Supported
-F:      lib/dma-debug.c
-F:      lib/dma-direct.c
-F:      lib/dma-noncoherent.c
-F:      lib/dma-virt.c
-F:      drivers/base/dma-mapping.c
-F:      drivers/base/dma-coherent.c
+F:      kernel/dma/
 F:      include/asm-generic/dma-mapping.h
 F:      include/linux/dma-direct.h
 F:      include/linux/dma-mapping.h
@@ -13648,7 +13643,7 @@ M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 L:      iommu@lists.linux-foundation.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git
 S:      Supported
-F:      lib/swiotlb.c
+F:      kernel/dma/swiotlb.c
 F:      arch/*/kernel/pci-swiotlb.c
 F:      include/linux/swiotlb.h
 
diff --git a/drivers/base/Makefile b/drivers/base/Makefile
index b074f242a435..704f44295810 100644
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@ -8,10 +8,7 @@ obj-y			:= component.o core.o bus.o dd.o syscore.o \
                            topology.o container.o property.o cacheinfo.o \
                            devcon.o
 obj-$(CONFIG_DEVTMPFS)  += devtmpfs.o
-obj-$(CONFIG_DMA_CMA) += dma-contiguous.o
 obj-y                   += power/
-obj-$(CONFIG_HAS_DMA)   += dma-mapping.o
-obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o
 obj-$(CONFIG_ISA_BUS_API)       += isa.o
 obj-y                           += firmware_loader/
 obj-$(CONFIG_NUMA)      += node.o
diff --git a/include/linux/dma-contiguous.h b/include/linux/dma-contiguous.h
index b67bf6ac907d..3c5a4cb3eb95 100644
--- a/include/linux/dma-contiguous.h
+++ b/include/linux/dma-contiguous.h
@@ -48,7 +48,7 @@
  *   CMA should not be used by the device drivers directly. It is
  *   only a helper framework for dma-mapping subsystem.
  *
- *   For more information, see kernel-docs in drivers/base/dma-contiguous.c
+ *   For more information, see kernel-docs in kernel/dma/contiguous.c
  */
 
 #ifdef __KERNEL__
diff --git a/init/Kconfig b/init/Kconfig
index 5a52f07259a2..fde3d09e8b27 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1719,10 +1719,6 @@ source "arch/Kconfig"
 
 endmenu         # General setup
 
-config HAVE_GENERIC_DMA_COHERENT
-        bool
-        default n
-
 config RT_MUTEXES
         bool
 
diff --git a/kernel/Makefile b/kernel/Makefile
index d2001624fe7a..04bc07c2b42a 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -41,6 +41,7 @@ obj-y += printk/
 obj-y += irq/
 obj-y += rcu/
 obj-y += livepatch/
+obj-y += dma/
 
 obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o
 obj-$(CONFIG_FREEZER) += freezer.o
diff --git a/kernel/dma/Kconfig b/kernel/dma/Kconfig
new file mode 100644
index 000000000000..9bd54304446f
--- /dev/null
+++ b/kernel/dma/Kconfig
@@ -0,0 +1,50 @@
+
+config HAS_DMA
+        bool
+        depends on !NO_DMA
+        default y
+
+config NEED_SG_DMA_LENGTH
+        bool
+
+config NEED_DMA_MAP_STATE
+        bool
+
+config ARCH_DMA_ADDR_T_64BIT
+        def_bool 64BIT || PHYS_ADDR_T_64BIT
+
+config HAVE_GENERIC_DMA_COHERENT
+        bool
+
+config ARCH_HAS_SYNC_DMA_FOR_DEVICE
+        bool
+
+config ARCH_HAS_SYNC_DMA_FOR_CPU
+        bool
+        select NEED_DMA_MAP_STATE
+
+config DMA_DIRECT_OPS
+        bool
+        depends on HAS_DMA
+
+config DMA_NONCOHERENT_OPS
+        bool
+        depends on HAS_DMA
+        select DMA_DIRECT_OPS
+
+config DMA_NONCOHERENT_MMAP
+        bool
+        depends on DMA_NONCOHERENT_OPS
+
+config DMA_NONCOHERENT_CACHE_SYNC
+        bool
+        depends on DMA_NONCOHERENT_OPS
+
+config DMA_VIRT_OPS
+        bool
+        depends on HAS_DMA
+
+config SWIOTLB
+        bool
+        select DMA_DIRECT_OPS
+        select NEED_DMA_MAP_STATE
diff --git a/kernel/dma/Makefile b/kernel/dma/Makefile
new file mode 100644
index 000000000000..6de44e4eb454
--- /dev/null
+++ b/kernel/dma/Makefile
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_HAS_DMA)                   += mapping.o
+obj-$(CONFIG_DMA_CMA)                   += contiguous.o
+obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += coherent.o
+obj-$(CONFIG_DMA_DIRECT_OPS)            += direct.o
+obj-$(CONFIG_DMA_NONCOHERENT_OPS)       += noncoherent.o
+obj-$(CONFIG_DMA_VIRT_OPS)              += virt.o
+obj-$(CONFIG_DMA_API_DEBUG)             += debug.o
+obj-$(CONFIG_SWIOTLB)                   += swiotlb.o
+
diff --git a/drivers/base/dma-coherent.c b/kernel/dma/coherent.c
index 597d40893862..597d40893862 100644
--- a/drivers/base/dma-coherent.c
+++ b/kernel/dma/coherent.c
diff --git a/drivers/base/dma-contiguous.c b/kernel/dma/contiguous.c
index d987dcd1bd56..d987dcd1bd56 100644
--- a/drivers/base/dma-contiguous.c
+++ b/kernel/dma/contiguous.c
diff --git a/lib/dma-debug.c b/kernel/dma/debug.c
index c007d25bee09..c007d25bee09 100644
--- a/lib/dma-debug.c
+++ b/kernel/dma/debug.c
diff --git a/lib/dma-direct.c b/kernel/dma/direct.c
index 8be8106270c2..8be8106270c2 100644
--- a/lib/dma-direct.c
+++ b/kernel/dma/direct.c
diff --git a/drivers/base/dma-mapping.c b/kernel/dma/mapping.c
index f831a582209c..d2a92ddaac4d 100644
--- a/drivers/base/dma-mapping.c
+++ b/kernel/dma/mapping.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * drivers/base/dma-mapping.c - arch-independent dma-mapping routines
+ * arch-independent dma-mapping routines
  *
  * Copyright (c) 2006  SUSE Linux Products GmbH
  * Copyright (c) 2006  Tejun Heo <teheo@suse.de>
diff --git a/lib/dma-noncoherent.c b/kernel/dma/noncoherent.c
index 79e9a757387f..79e9a757387f 100644
--- a/lib/dma-noncoherent.c
+++ b/kernel/dma/noncoherent.c
diff --git a/lib/swiotlb.c b/kernel/dma/swiotlb.c
index 04b68d9dffac..04b68d9dffac 100644
--- a/lib/swiotlb.c
+++ b/kernel/dma/swiotlb.c
diff --git a/lib/dma-virt.c b/kernel/dma/virt.c
index 8e61a02ef9ca..631ddec4b60a 100644
--- a/lib/dma-virt.c
+++ b/kernel/dma/virt.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- *      lib/dma-virt.c
- *
  * DMA operations that map to virtual addresses without flushing memory.
  */
 #include <linux/export.h>
diff --git a/lib/Kconfig b/lib/Kconfig
index e34b04b56057..706836ec314d 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -420,60 +420,15 @@ config HAS_IOPORT_MAP
         depends on HAS_IOMEM && !NO_IOPORT_MAP
         default y
 
-config HAS_DMA
-        bool
-        depends on !NO_DMA
-        default y
+source "kernel/dma/Kconfig"
 
 config SGL_ALLOC
         bool
         default n
 
-config NEED_SG_DMA_LENGTH
-        bool
-
-config NEED_DMA_MAP_STATE
-        bool
-
-config ARCH_DMA_ADDR_T_64BIT
-        def_bool 64BIT || PHYS_ADDR_T_64BIT
-
 config IOMMU_HELPER
         bool
 
-config ARCH_HAS_SYNC_DMA_FOR_DEVICE
-        bool
-
-config ARCH_HAS_SYNC_DMA_FOR_CPU
-        bool
-        select NEED_DMA_MAP_STATE
-
-config DMA_DIRECT_OPS
-        bool
-        depends on HAS_DMA
-
-config DMA_NONCOHERENT_OPS
-        bool
-        depends on HAS_DMA
-        select DMA_DIRECT_OPS
-
-config DMA_NONCOHERENT_MMAP
-        bool
-        depends on DMA_NONCOHERENT_OPS
-
-config DMA_NONCOHERENT_CACHE_SYNC
-        bool
-        depends on DMA_NONCOHERENT_OPS
-
-config DMA_VIRT_OPS
-        bool
-        depends on HAS_DMA
-
-config SWIOTLB
-        bool
-        select DMA_DIRECT_OPS
-        select NEED_DMA_MAP_STATE
-
 config CHECK_SIGNATURE
         bool
 
diff --git a/lib/Makefile b/lib/Makefile
index 956b320292fe..8153fdab287f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -29,9 +29,6 @@ lib-y := ctype.o string.o vsprintf.o cmdline.o \
 lib-$(CONFIG_PRINTK) += dump_stack.o
 lib-$(CONFIG_MMU) += ioremap.o
 lib-$(CONFIG_SMP) += cpumask.o
-lib-$(CONFIG_DMA_DIRECT_OPS) += dma-direct.o
-lib-$(CONFIG_DMA_NONCOHERENT_OPS) += dma-noncoherent.o
-lib-$(CONFIG_DMA_VIRT_OPS) += dma-virt.o
 
 lib-y   += kobject.o klist.o
 obj-y   += lockref.o
@@ -148,7 +145,6 @@ obj-$(CONFIG_SMP) += percpu_counter.o
 obj-$(CONFIG_AUDIT_GENERIC) += audit.o
 obj-$(CONFIG_AUDIT_COMPAT_GENERIC) += compat_audit.o
 
-obj-$(CONFIG_SWIOTLB) += swiotlb.o
 obj-$(CONFIG_IOMMU_HELPER) += iommu-helper.o
 obj-$(CONFIG_FAULT_INJECTION) += fault-inject.o
 obj-$(CONFIG_NOTIFIER_ERROR_INJECTION) += notifier-error-inject.o
@@ -169,8 +165,6 @@ obj-$(CONFIG_NLATTR) += nlattr.o
 
 obj-$(CONFIG_LRU_CACHE) += lru_cache.o
 
-obj-$(CONFIG_DMA_API_DEBUG) += dma-debug.o
-
 obj-$(CONFIG_GENERIC_CSUM) += checksum.o
 
 obj-$(CONFIG_GENERIC_ATOMIC64) += atomic64.o