dma-mapping: move dma_map_(un)single() to <linux/dma-mapping.h>

The implementation of dma_map_single() and dma_unmap_single() is
exactly the same for all the architectures that support them.

Factor them out to <linux/dma-mapping.h>, and make all drivers to
include <linux/dma-mapping.h> instead of <asm/dma-mapping.h>.

If we need to differentiate them for some architectures, we can
move the generic definitions to <asm-generic/dma-mapping.h>.

Add some comments to the helpers. The concept is quite similar to
the DMA-API of Linux kernel. Drivers are agnostic about what is
going on behind the scene. Just call dma_map_single() before the
DMA, and dma_unmap_single() after it.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h
index efdbed7280dd98f5719659b3f80c12523c1cbb37..8bb3fa2e0ee7a8508aabed7abbfbe0c7284481e5 100644 (file)
--- a/arch/arm/include/asm/dma-mapping.h
+++ b/arch/arm/include/asm/dma-mapping.h
@@ -14,8 +14,6 @@
 #include <linux/types.h>
 #include <malloc.h>
 
-#define        dma_mapping_error(x, y) 0
-
 static inline void *dma_alloc_coherent(size_t len, unsigned long *handle)
 {
        *handle = (unsigned long)memalign(ARCH_DMA_MINALIGN, ROUND(len, ARCH_DMA_MINALIGN));
@@ -27,28 +25,4 @@ static inline void dma_free_coherent(void *addr)
        free(addr);
 }
 
-static inline dma_addr_t dma_map_single(void *vaddr, size_t len,
-                                       enum dma_data_direction dir)
-{
-       unsigned long addr = (unsigned long)vaddr;
-
-       len = ALIGN(len, ARCH_DMA_MINALIGN);
-
-       if (dir == DMA_FROM_DEVICE)
-               invalidate_dcache_range(addr, addr + len);
-       else
-               flush_dcache_range(addr, addr + len);
-
-       return addr;
-}
-
-static inline void dma_unmap_single(dma_addr_t addr, size_t len,
-                                   enum dma_data_direction dir)
-{
-       len = ALIGN(len, ARCH_DMA_MINALIGN);
-
-       if (dir != DMA_TO_DEVICE)
-               invalidate_dcache_range(addr, addr + len);
-}
-
 #endif /* __ASM_ARM_DMA_MAPPING_H */

diff --git a/arch/nds32/include/asm/dma-mapping.h b/arch/nds32/include/asm/dma-mapping.h
index 784f489db54ebd67a9ff16493f8601a1db4326bd..f8668f1fe5dba67105efded4cd6a6f18ea155626 100644 (file)
--- a/arch/nds32/include/asm/dma-mapping.h
+++ b/arch/nds32/include/asm/dma-mapping.h
@@ -19,28 +19,4 @@ static void *dma_alloc_coherent(size_t len, unsigned long *handle)
        return (void *)*handle;
 }
 
-static inline dma_addr_t dma_map_single(void *vaddr, size_t len,
-                                       enum dma_data_direction dir)
-{
-       unsigned long addr = (unsigned long)vaddr;
-
-       len = ALIGN(len, ARCH_DMA_MINALIGN);
-
-       if (dir == DMA_FROM_DEVICE)
-               invalidate_dcache_range(addr, addr + len);
-       else
-               flush_dcache_range(addr, addr + len);
-
-       return addr;
-}
-
-static inline void dma_unmap_single(dma_addr_t addr, size_t len,
-                                   enum dma_data_direction dir)
-{
-       len = ALIGN(len, ARCH_DMA_MINALIGN);
-
-       if (dir != DMA_TO_DEVICE)
-               invalidate_dcache_range(addr, addr + len);
-}
-
 #endif /* __ASM_NDS_DMA_MAPPING_H */

diff --git a/arch/riscv/include/asm/dma-mapping.h b/arch/riscv/include/asm/dma-mapping.h
index 1ac4a4fed58d7df137a34302fc395c2cc045b9c0..6ecadab41cd9cc61b129c8ee378f67aba13976f3 100644 (file)
--- a/arch/riscv/include/asm/dma-mapping.h
+++ b/arch/riscv/include/asm/dma-mapping.h
@@ -16,8 +16,6 @@
 #include <linux/dma-direction.h>
 #include <malloc.h>
 
-#define dma_mapping_error(x, y)        0
-
 static inline void *dma_alloc_coherent(size_t len, unsigned long *handle)
 {
        *handle = (unsigned long)memalign(ARCH_DMA_MINALIGN, len);
@@ -29,28 +27,4 @@ static inline void dma_free_coherent(void *addr)
        free(addr);
 }
 
-static inline dma_addr_t dma_map_single(void *vaddr, size_t len,
-                                       enum dma_data_direction dir)
-{
-       unsigned long addr = (unsigned long)vaddr;
-
-       len = ALIGN(len, ARCH_DMA_MINALIGN);
-
-       if (dir == DMA_FROM_DEVICE)
-               invalidate_dcache_range(addr, addr + len);
-       else
-               flush_dcache_range(addr, addr + len);
-
-       return addr;
-}
-
-static inline void dma_unmap_single(dma_addr_t addr, size_t len,
-                                   enum dma_data_direction dir)
-{
-       len = ALIGN(len, ARCH_DMA_MINALIGN);
-
-       if (dir != DMA_TO_DEVICE)
-               invalidate_dcache_range(addr, addr + len);
-}
-
 #endif /* __ASM_RISCV_DMA_MAPPING_H */

diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h
index 37704da5dd4ff66d68d911799e0b5f3e858ebb48..8be1003e6baf86fe4e55411f5af7b57ef8fc3450 100644 (file)
--- a/arch/x86/include/asm/dma-mapping.h
+++ b/arch/x86/include/asm/dma-mapping.h
@@ -14,8 +14,6 @@
 #include <linux/types.h>
 #include <malloc.h>
 
-#define        dma_mapping_error(x, y) 0
-
 static inline void *dma_alloc_coherent(size_t len, unsigned long *handle)
 {
        *handle = (unsigned long)memalign(ARCH_DMA_MINALIGN, len);
@@ -27,28 +25,4 @@ static inline void dma_free_coherent(void *addr)
        free(addr);
 }
 
-static inline dma_addr_t dma_map_single(void *vaddr, size_t len,
-                                       enum dma_data_direction dir)
-{
-       unsigned long addr = (unsigned long)vaddr;
-
-       len = ALIGN(len, ARCH_DMA_MINALIGN);
-
-       if (dir == DMA_FROM_DEVICE)
-               invalidate_dcache_range(addr, addr + len);
-       else
-               flush_dcache_range(addr, addr + len);
-
-       return addr;
-}
-
-static inline void dma_unmap_single(dma_addr_t addr, size_t len,
-                                   enum dma_data_direction dir)
-{
-       len = ALIGN(len, ARCH_DMA_MINALIGN);
-
-       if (dir != DMA_TO_DEVICE)
-               invalidate_dcache_range(addr, addr + len);
-}
-
 #endif /* __ASM_X86_DMA_MAPPING_H */

diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c
index f274100f32227b6df1df2e3baae4ff218a78dc57..e587f1fcb2b47c5763d3ef9cb91a21adece11c8b 100644 (file)
--- a/drivers/dma/ti/k3-udma.c
+++ b/drivers/dma/ti/k3-udma.c
@@ -10,7 +10,7 @@
 #include <asm/io.h>
 #include <asm/bitops.h>
 #include <malloc.h>
-#include <asm/dma-mapping.h>
+#include <linux/dma-mapping.h>
 #include <dm.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>

diff --git a/drivers/mmc/tmio-common.c b/drivers/mmc/tmio-common.c
index 53213888473b589f421fbcd1224b85d33d7818f9..faf18191b30d24bb52c33e9c60cbb432fbabada4 100644 (file)
--- a/drivers/mmc/tmio-common.c
+++ b/drivers/mmc/tmio-common.c
@@ -4,7 +4,6 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
-#include <asm/dma-mapping.h>
 #include <common.h>
 #include <clk.h>
 #include <cpu_func.h>
@@ -14,7 +13,7 @@
 #include <dm/device_compat.h>
 #include <dm/pinctrl.h>
 #include <linux/compat.h>
-#include <linux/dma-direction.h>
+#include <linux/dma-mapping.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
 #include <power/regulator.h>

diff --git a/drivers/mtd/nand/raw/denali.c b/drivers/mtd/nand/raw/denali.c
index 3e0ac39777d8c9c3114e36d5efca4e401120c6ad..b525b1be54963c6fec2d2e1b4191aacbbf776ff9 100644 (file)
--- a/drivers/mtd/nand/raw/denali.c
+++ b/drivers/mtd/nand/raw/denali.c
@@ -5,14 +5,13 @@
  * Copyright (C) 2009-2010, Intel Corporation and its suppliers.
  */
 
-#include <asm/dma-mapping.h>
 #include <dm.h>
 #include <malloc.h>
 #include <nand.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <linux/bitfield.h>
-#include <linux/dma-direction.h>
+#include <linux/dma-mapping.h>
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/io.h>

diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c
index aabddd6bb698d609bafe3ae32cd584ebf3f8c4ac..a511068d9ae100c2b01d73c34b106ab03d098be4 100644 (file)
--- a/drivers/net/altera_tse.c
+++ b/drivers/net/altera_tse.c
@@ -17,7 +17,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <asm/cache.h>
-#include <asm/dma-mapping.h>
+#include <linux/dma-mapping.h>
 #include <asm/io.h>
 #include "altera_tse.h"
 

diff --git a/drivers/net/ftmac110.c b/drivers/net/ftmac110.c
index 1fa93d4d58550acdbc38314b932b04638b0470d2..84082407d277b4197084fecbe3a267735bd64c23 100644 (file)
--- a/drivers/net/ftmac110.c
+++ b/drivers/net/ftmac110.c
@@ -12,7 +12,7 @@
 #include <net.h>
 #include <linux/errno.h>
 #include <asm/io.h>
-#include <asm/dma-mapping.h>
+#include <linux/dma-mapping.h>
 
 #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
 #include <miiphy.h>

diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 7a2b1abeeb03a135641a56fe45d704598d51de4d..631b53b0930a8d74d235c4b69788e43d0feda358 100644 (file)
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -38,7 +38,7 @@
 
 #include <linux/mii.h>
 #include <asm/io.h>
-#include <asm/dma-mapping.h>
+#include <linux/dma-mapping.h>
 #include <asm/arch/clk.h>
 #include <linux/errno.h>
 

diff --git a/drivers/soc/ti/k3-navss-ringacc.c b/drivers/soc/ti/k3-navss-ringacc.c
index 8cbfe2bf49c36bcce71bf306f6c3698d3732bf0d..c5661c52facc70056d85fedce624605f297ebca9 100644 (file)
--- a/drivers/soc/ti/k3-navss-ringacc.c
+++ b/drivers/soc/ti/k3-navss-ringacc.c
@@ -9,7 +9,6 @@
 #include <cpu_func.h>
 #include <asm/io.h>
 #include <malloc.h>
-#include <asm/dma-mapping.h>
 #include <asm/bitops.h>
 #include <dm.h>
 #include <dm/device_compat.h>
@@ -17,6 +16,7 @@
 #include <dm/read.h>
 #include <dm/uclass.h>
 #include <linux/compat.h>
+#include <linux/dma-mapping.h>
 #include <linux/err.h>
 #include <linux/soc/ti/k3-navss-ringacc.h>
 #include <linux/soc/ti/ti_sci_protocol.h>

diff --git a/drivers/ufs/ufs.c b/drivers/ufs/ufs.c
index c9346c2edc8f265662a8702cb8017699a5496485..24e1bc2a19c2c4309dd2b4d36198f1c9ba8bcfd3 100644 (file)
--- a/drivers/ufs/ufs.c
+++ b/drivers/ufs/ufs.c
@@ -19,7 +19,7 @@
 #include <hexdump.h>
 #include <scsi.h>
 
-#include <asm/dma-mapping.h>
+#include <linux/dma-mapping.h>
 
 #include "ufs.h"
 

diff --git a/drivers/usb/cdns3/gadget.c b/drivers/usb/cdns3/gadget.c
index 22e90a57179fde5d3c29008eb55c15a41d5c0627..8377eb458b6a8eeabff02d0e80eb34e018a4c880 100644 (file)
--- a/drivers/usb/cdns3/gadget.c
+++ b/drivers/usb/cdns3/gadget.c
@@ -63,7 +63,7 @@
 #include <linux/usb/gadget.h>
 #include <linux/compat.h>
 #include <linux/iopoll.h>
-#include <asm/dma-mapping.h>
+#include <linux/dma-mapping.h>
 #include <linux/bitmap.h>
 #include <linux/bug.h>
 

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 6ad1000c9af63f1bb7c332e2b21575037354f149..4ec3f6df6a9a8130704e47c73bc193ea2e3c2bc4 100644 (file)
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -17,9 +17,9 @@
 #include <cpu_func.h>
 #include <malloc.h>
 #include <dwc3-uboot.h>
-#include <asm/dma-mapping.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
+#include <linux/dma-mapping.h>
 #include <linux/err.h>
 #include <linux/ioport.h>
 #include <dm.h>

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 1502d67362a962c2c5425b1787a12b60bdcafd40..e445c705f18e32643cbd20037273a56711285f0a 100644 (file)
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -16,10 +16,10 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <malloc.h>
-#include <asm/dma-mapping.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <linux/bug.h>
+#include <linux/dma-mapping.h>
 #include <linux/list.h>
 
 #include <linux/usb/ch9.h>

diff --git a/drivers/usb/gadget/udc/udc-core.c b/drivers/usb/gadget/udc/udc-core.c
index 528874507b41ae65fd02ebd8a99c40da636e5275..7f73926cb3e1247405406bb352965c23916bba80 100644 (file)
--- a/drivers/usb/gadget/udc/udc-core.c
+++ b/drivers/usb/gadget/udc/udc-core.c
@@ -18,7 +18,7 @@
 #include <linux/compat.h>
 #include <malloc.h>
 #include <asm/cache.h>
-#include <asm/dma-mapping.h>
+#include <linux/dma-mapping.h>
 #include <common.h>
 #include <dm.h>
 #include <dm/device-internal.h>

diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
new file mode 100644 (file)
index 0000000..20b6d60
--- /dev/null
+++ b/include/linux/dma-mapping.h
@@ -0,0 +1,63 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _LINUX_DMA_MAPPING_H
+#define _LINUX_DMA_MAPPING_H
+
+#include <linux/dma-direction.h>
+#include <linux/types.h>
+#include <asm/dma-mapping.h>
+#include <cpu_func.h>
+
+#define dma_mapping_error(x, y)        0
+
+/**
+ * Map a buffer to make it available to the DMA device
+ *
+ * Linux-like DMA API that is intended to be used from drivers. This hides the
+ * underlying cache operation from drivers. Call this before starting the DMA
+ * transfer. In most of architectures in U-Boot, the virtual address matches to
+ * the physical address (but we have exceptions like sandbox). U-Boot does not
+ * support iommu at the driver level, so it also matches to the DMA address.
+ * Hence, this helper currently just performs the cache operation, then returns
+ * straight-mapped dma_address, which is intended to be set to the register of
+ * the DMA device.
+ *
+ * @vaddr: address of the buffer
+ * @len: length of the buffer
+ * @dir: the direction of DMA
+ */
+static inline dma_addr_t dma_map_single(void *vaddr, size_t len,
+                                       enum dma_data_direction dir)
+{
+       unsigned long addr = (unsigned long)vaddr;
+
+       len = ALIGN(len, ARCH_DMA_MINALIGN);
+
+       if (dir == DMA_FROM_DEVICE)
+               invalidate_dcache_range(addr, addr + len);
+       else
+               flush_dcache_range(addr, addr + len);
+
+       return addr;
+}
+
+/**
+ * Unmap a buffer to make it available to CPU
+ *
+ * Linux-like DMA API that is intended to be used from drivers. This hides the
+ * underlying cache operation from drivers. Call this after finishin the DMA
+ * transfer.
+ *
+ * @addr: DMA address
+ * @len: length of the buffer
+ * @dir: the direction of DMA
+ */
+static inline void dma_unmap_single(dma_addr_t addr, size_t len,
+                                   enum dma_data_direction dir)
+{
+       len = ALIGN(len, ARCH_DMA_MINALIGN);
+
+       if (dir != DMA_TO_DEVICE)
+               invalidate_dcache_range(addr, addr + len);
+}
+
+#endif