Skip to contentSkip to conversation

dma-mapping: Add cache flush/invalidation to dma_{un}map_single

PATCH Superseded Vignesh Raghavendra 2 participants 10 messages Jan 16, 2020 – Jan 25, 2020

Subsystems (8)
lore
Share & tools
lore

Vignesh Raghavendra

author maintainer
#0 lore raw

v2 cover dma-mapping: Add cache flush/invalidation to dma_{un}map_single

Drivers (especially frameworks ported from Linux such as USB) expect dma_{un}map_single() APIs to take care of cache maintenance. But this is not the case in U-Boot and few drivers take care of flushing caches locally. Instead add flush/invalidate calls to DMA APIs in arch specific dma-mapping.h file so that per driver implementation of these APIs can be avoided.

travis-ci is green: https://travis-ci.org/r-vignesh/u-boot/builds/637784160

v2:
Fix compilation failure on AM335x etc due to recent U-Boot changes Collect R-bys

Vignesh Raghavendra (4):
asm: dma-mapping.h: Fix dma mapping functions
mmc: tmio-common: Drop custom dma mapping functions
mtd: denali: Drop custom dma mapping functions
net: macb: Drop local cache flush

 arch/arm/include/asm/dma-mapping.h   | 23 ++++++++++++++++--
 arch/nds32/include/asm/dma-mapping.h | 23 ++++++++++++++++--
 arch/riscv/include/asm/dma-mapping.h | 23 ++++++++++++++++--
 arch/x86/include/asm/dma-mapping.h   | 23 ++++++++++++++++--
 drivers/mmc/tmio-common.c            | 25 +++-----------------
 drivers/mtd/nand/raw/denali.c        | 35 +++-------------------------
 drivers/net/macb.c                   |  4 +---
 7 files changed, 91 insertions(+), 65 deletions(-)
Signature · 1 line
2.25.0
author maintainer
#1 lore raw

PATCH v2 1/4 asm: dma-mapping.h: Fix dma mapping functions

Subsystems such as USB expect dma_map_single() and dma_unmap_single() to do dcache flush/invalidate operations as required. For example, see see drivers/usb/gadget/udc/udc-core.c::usb_gadget_map_request(). Currently drivers do this locally, (see drivers/usb/dwc3/ep0.c, drivers/mtd/nand/raw/denali.c etc..)
Update arch specific dma_map_single() and dma_unmap_single() APIs to do cache flush/invalidate operations, so that drivers need not implement them locally.

---
 arch/arm/include/asm/dma-mapping.h   | 23 +++++++++++++++++++++--
 arch/nds32/include/asm/dma-mapping.h | 23 +++++++++++++++++++++--
 arch/riscv/include/asm/dma-mapping.h | 23 +++++++++++++++++++++--
 arch/x86/include/asm/dma-mapping.h   | 23 +++++++++++++++++++++--
 4 files changed, 84 insertions(+), 8 deletions(-)
arch/arm/include/asm/dma-mapping.h +21 -2
index fc5b8f634d54..d20703739fad 100644
@@ -7,7 +7,11 @@
 #ifndef __ASM_ARM_DMA_MAPPING_H
 #define __ASM_ARM_DMA_MAPPING_H
 
+#include <common.h>
+#include <asm/cache.h>
+#include <cpu_func.h>
 #include <linux/dma-direction.h>
+#include <malloc.h>
 
 #define	dma_mapping_error(x, y)	0
 
@@ -25,12 +29,27 @@ static inline void dma_free_coherent(void *addr)
 static inline unsigned long dma_map_single(volatile void *vaddr, size_t len,
 					   enum dma_data_direction dir)
 {
-	return (unsigned long)vaddr;
+	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(volatile void *vaddr, size_t len,
-				    unsigned long paddr)
+				    enum dma_data_direction dir)
 {
+	unsigned long addr = (unsigned long)vaddr;
+
+	len = ALIGN(len, ARCH_DMA_MINALIGN);
+
+	if (dir != DMA_TO_DEVICE)
+		invalidate_dcache_range(addr, addr + len);
 }
 
 #endif /* __ASM_ARM_DMA_MAPPING_H */
arch/nds32/include/asm/dma-mapping.h +21 -2
index e6808dc84089..c8876ceadda6 100644
@@ -6,7 +6,11 @@
 #ifndef __ASM_NDS_DMA_MAPPING_H
 #define __ASM_NDS_DMA_MAPPING_H
 
+#include <common.h>
+#include <asm/cache.h>
+#include <cpu_func.h>
 #include <linux/dma-direction.h>
+#include <malloc.h>
 
 static void *dma_alloc_coherent(size_t len, unsigned long *handle)
 {
@@ -17,12 +21,27 @@ static void *dma_alloc_coherent(size_t len, unsigned long *handle)
 static inline unsigned long dma_map_single(volatile void *vaddr, size_t len,
 					   enum dma_data_direction dir)
 {
-	return (unsigned long)vaddr;
+	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(volatile void *vaddr, size_t len,
-				    unsigned long paddr)
+				    enum dma_data_direction dir)
 {
+	unsigned long addr = (unsigned long)vaddr;
+
+	len = ALIGN(len, ARCH_DMA_MINALIGN);
+
+	if (dir != DMA_TO_DEVICE)
+		invalidate_dcache_range(addr, addr + len);
 }
 
 #endif /* __ASM_NDS_DMA_MAPPING_H */
arch/riscv/include/asm/dma-mapping.h +21 -2
index 3d930c90eceb..6cc39469590a 100644
@@ -9,7 +9,11 @@
 #ifndef __ASM_RISCV_DMA_MAPPING_H
 #define __ASM_RISCV_DMA_MAPPING_H
 
+#include <common.h>
+#include <asm/cache.h>
+#include <cpu_func.h>
 #include <linux/dma-direction.h>
+#include <malloc.h>
 
 #define dma_mapping_error(x, y)	0
 
@@ -27,12 +31,27 @@ static inline void dma_free_coherent(void *addr)
 static inline unsigned long dma_map_single(volatile void *vaddr, size_t len,
 					   enum dma_data_direction dir)
 {
-	return (unsigned long)vaddr;
+	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(volatile void *vaddr, size_t len,
-				    unsigned long paddr)
+				    enum dma_data_direction dir)
 {
+	unsigned long addr = (unsigned long)vaddr;
+
+	len = ALIGN(len, ARCH_DMA_MINALIGN);
+
+	if (dir != DMA_TO_DEVICE)
+		invalidate_dcache_range(addr, addr + len);
 }
 
 #endif /* __ASM_RISCV_DMA_MAPPING_H */
arch/x86/include/asm/dma-mapping.h +21 -2
index b353ff0bef59..900b99b8a69a 100644
@@ -7,7 +7,11 @@
 #ifndef __ASM_X86_DMA_MAPPING_H
 #define __ASM_X86_DMA_MAPPING_H
 
+#include <common.h>
+#include <asm/cache.h>
+#include <cpu_func.h>
 #include <linux/dma-direction.h>
+#include <malloc.h>
 
 #define	dma_mapping_error(x, y)	0
 
@@ -25,12 +29,27 @@ static inline void dma_free_coherent(void *addr)
 static inline unsigned long dma_map_single(volatile void *vaddr, size_t len,
 					   enum dma_data_direction dir)
 {
-	return (unsigned long)vaddr;
+	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(volatile void *vaddr, size_t len,
-				    unsigned long paddr)
+				    enum dma_data_direction dir)
 {
+	unsigned long addr = (unsigned long)vaddr;
+
+	len = ALIGN(len, ARCH_DMA_MINALIGN);
+
+	if (dir != DMA_TO_DEVICE)
+		invalidate_dcache_range(addr, addr + len);
 }
 
 #endif /* __ASM_X86_DMA_MAPPING_H */
Signature · 1 line
2.25.0
#2 lore raw

PATCH v2 1/4 asm: dma-mapping.h: Fix dma mapping functions

Quoted 9 lines · Vignesh Raghavendra

Subsystems such as USB expect dma_map_single() and dma_unmap_single() to do dcache flush/invalidate operations as required. For example, see see drivers/usb/gadget/udc/udc-core.c::usb_gadget_map_request(). Currently drivers do this locally, (see drivers/usb/dwc3/ep0.c, drivers/mtd/nand/raw/denali.c etc..)
Update arch specific dma_map_single() and dma_unmap_single() APIs to do cache flush/invalidate operations, so that drivers need not implement them locally.

Quoted 3 lines

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200125/687fc58c/attachment.sig>
author maintainer
#3 lore raw

PATCH v2 2/4 mmc: tmio-common: Drop custom dma mapping functions

In reply to Vignesh Raghavendra

Drop local dma_map_single() and dma_unmap_single() and use arch specific common implementation

---
 drivers/mmc/tmio-common.c | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)
drivers/mmc/tmio-common.c +3 -22
index 669410d97f6e..5a8506dcb6bd 100644
@@ -4,6 +4,7 @@
  *   Author: Masahiro Yamada <[email protected]>
  */
 
+#include <asm/dma-mapping.h>
 #include <common.h>
 #include <clk.h>
 #include <cpu_func.h>
@@ -76,26 +77,6 @@ void tmio_sd_writel(struct tmio_sd_priv *priv,
 		writel(val, priv->regbase + reg);
 }
 
-static dma_addr_t __dma_map_single(void *ptr, size_t size,
-				   enum dma_data_direction dir)
-{
-	unsigned long addr = (unsigned long)ptr;
-
-	if (dir == DMA_FROM_DEVICE)
-		invalidate_dcache_range(addr, addr + size);
-	else
-		flush_dcache_range(addr, addr + size);
-
-	return addr;
-}
-
-static void __dma_unmap_single(dma_addr_t addr, size_t size,
-			       enum dma_data_direction dir)
-{
-	if (dir != DMA_TO_DEVICE)
-		invalidate_dcache_range(addr, addr + size);
-}
-
 static int tmio_sd_check_error(struct udevice *dev, struct mmc_cmd *cmd)
 {
 	struct tmio_sd_priv *priv = dev_get_priv(dev);
@@ -362,7 +343,7 @@ static int tmio_sd_dma_xfer(struct udevice *dev, struct mmc_data *data)
 
 	tmio_sd_writel(priv, tmp, TMIO_SD_DMA_MODE);
 
-	dma_addr = __dma_map_single(buf, len, dir);
+	dma_addr = dma_map_single(buf, len, dir);
 
 	tmio_sd_dma_start(priv, dma_addr);
 
@@ -371,7 +352,7 @@ static int tmio_sd_dma_xfer(struct udevice *dev, struct mmc_data *data)
 	if (poll_flag == TMIO_SD_DMA_INFO1_END_RD)
 		udelay(1);
 
-	__dma_unmap_single(dma_addr, len, dir);
+	dma_unmap_single(buf, len, dir);
 
 	return ret;
 }
Signature · 1 line
2.25.0
#4 lore raw

PATCH v2 2/4 mmc: tmio-common: Drop custom dma mapping functions

Quoted 5 lines · Vignesh Raghavendra

Drop local dma_map_single() and dma_unmap_single() and use arch specific common implementation

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200125/8d685bba/attachment.sig>
author maintainer
#5 lore raw

PATCH v2 3/4 mtd: denali: Drop custom dma mapping functions

In reply to Vignesh Raghavendra

Drop local dma_map_single() and dma_unmap_single() and use arch specific common implementation

---
 drivers/mtd/nand/raw/denali.c | 35 +++--------------------------------
 1 file changed, 3 insertions(+), 32 deletions(-)
drivers/mtd/nand/raw/denali.c +3 -32
index 0a7ca8a8dfb4..8537c609fb62 100644
@@ -5,7 +5,7 @@
  * Copyright (C) 2009-2010, Intel Corporation and its suppliers.
  */
 
-#include <cpu_func.h>
+#include <asm/dma-mapping.h>
 #include <dm.h>
 #include <nand.h>
 #include <linux/bitfield.h>
@@ -17,35 +17,6 @@
 
 #include "denali.h"
 
-static dma_addr_t dma_map_single(void *dev, void *ptr, size_t size,
-				 enum dma_data_direction dir)
-{
-	unsigned long addr = (unsigned long)ptr;
-
-	size = ALIGN(size, ARCH_DMA_MINALIGN);
-
-	if (dir == DMA_FROM_DEVICE)
-		invalidate_dcache_range(addr, addr + size);
-	else
-		flush_dcache_range(addr, addr + size);
-
-	return addr;
-}
-
-static void dma_unmap_single(void *dev, dma_addr_t addr, size_t size,
-			     enum dma_data_direction dir)
-{
-	size = ALIGN(size, ARCH_DMA_MINALIGN);
-
-	if (dir != DMA_TO_DEVICE)
-		invalidate_dcache_range(addr, addr + size);
-}
-
-static int dma_mapping_error(void *dev, dma_addr_t addr)
-{
-	return 0;
-}
-
 #define DENALI_NAND_NAME    "denali-nand"
 
 /* for Indexed Addressing */
@@ -565,7 +536,7 @@ static int denali_dma_xfer(struct denali_nand_info *denali, void *buf,
 	enum dma_data_direction dir = write ? DMA_TO_DEVICE : DMA_FROM_DEVICE;
 	int ret = 0;
 
-	dma_addr = dma_map_single(denali->dev, buf, size, dir);
+	dma_addr = dma_map_single(buf, size, dir);
 	if (dma_mapping_error(denali->dev, dma_addr)) {
 		dev_dbg(denali->dev, "Failed to DMA-map buffer. Trying PIO.\n");
 		return denali_pio_xfer(denali, buf, size, page, raw, write);
@@ -606,7 +577,7 @@ static int denali_dma_xfer(struct denali_nand_info *denali, void *buf,
 
 	iowrite32(0, denali->reg + DMA_ENABLE);
 
-	dma_unmap_single(denali->dev, dma_addr, size, dir);
+	dma_unmap_single(buf, size, dir);
 
 	if (irq_status & INTR__ERASED_PAGE)
 		memset(buf, 0xff, size);
Signature · 1 line
2.25.0
#6 lore raw

PATCH v2 3/4 mtd: denali: Drop custom dma mapping functions

Quoted 5 lines · Vignesh Raghavendra

Drop local dma_map_single() and dma_unmap_single() and use arch specific common implementation

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200125/2ba797a8/attachment.sig>
author maintainer
#7 lore raw

PATCH v2 4/4 net: macb: Drop local cache flush

In reply to Vignesh Raghavendra

Now that arch specific dma mapping APIs take care of cache flush/invalidate, drop local cache flush operation. While at that fix dma_unmap_single() call to match new prototype

---
 drivers/net/macb.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/macb.c +1 -3
index 83594253787c..0d4929bec131 100644
@@ -327,8 +327,6 @@ static int _macb_send(struct macb_device *macb, const char *name, void *packet,
 	macb->tx_ring[tx_head].addr = paddr;
 	barrier();
 	macb_flush_ring_desc(macb, TX);
-	/* Do we need check paddr and length is dcache line aligned? */
-	flush_dcache_range(paddr, paddr + ALIGN(length, ARCH_DMA_MINALIGN));
 	macb_writel(macb, NCR, MACB_BIT(TE) | MACB_BIT(RE) | MACB_BIT(TSTART));
 
 	/*
@@ -344,7 +342,7 @@ static int _macb_send(struct macb_device *macb, const char *name, void *packet,
 		udelay(1);
 	}
 
-	dma_unmap_single(packet, length, paddr);
+	dma_unmap_single(packet, length, DMA_TO_DEVICE);
 
 	if (i <= MACB_TX_TIMEOUT) {
 		if (ctrl & MACB_BIT(TX_UNDERRUN))
Signature · 1 line
2.25.0
#8 lore raw

PATCH v2 4/4 net: macb: Drop local cache flush

Quoted 5 lines · Vignesh Raghavendra

Now that arch specific dma mapping APIs take care of cache flush/invalidate, drop local cache flush operation. While at that fix dma_unmap_single() call to match new prototype

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200125/205b584c/attachment.sig>
author maintainer
#9 lore raw

v2 cover dma-mapping: Add cache flush/invalidation to dma_{un}map_single

In reply to Vignesh Raghavendra

Hi Tom,

Quoted 9 lines · Vignesh Raghavendra

Drivers (especially frameworks ported from Linux such as USB) expect dma_{un}map_single() APIs to take care of cache maintenance. But this is not the case in U-Boot and few drivers take care of flushing caches locally. Instead add flush/invalidate calls to DMA APIs in arch specific dma-mapping.h file so that per driver implementation of these APIs can be avoided.

travis-ci is green: https://travis-ci.org/r-vignesh/u-boot/builds/637784160

Gentle ping...

Quoted 19 lines

v2:
Fix compilation failure on AM335x etc due to recent U-Boot changes Collect R-bys

Vignesh Raghavendra (4):
asm: dma-mapping.h: Fix dma mapping functions
mmc: tmio-common: Drop custom dma mapping functions
mtd: denali: Drop custom dma mapping functions
net: macb: Drop local cache flush

 arch/arm/include/asm/dma-mapping.h   | 23 ++++++++++++++++--
 arch/nds32/include/asm/dma-mapping.h | 23 ++++++++++++++++--
 arch/riscv/include/asm/dma-mapping.h | 23 ++++++++++++++++--
 arch/x86/include/asm/dma-mapping.h   | 23 ++++++++++++++++--
 drivers/mmc/tmio-common.c            | 25 +++-----------------
 drivers/mtd/nand/raw/denali.c        | 35 +++-------------------------
 drivers/net/macb.c                   |  4 +---
 7 files changed, 91 insertions(+), 65 deletions(-)
Signature · 2 lines
Regards
Vignesh