Skip to contentSkip to conversation

frv: dma-mapping: support debug_dma_mapping_error

PATCH In review Shuah Khan 1 participant 3 messages Oct 26, 2012 – Nov 15, 2012

lore
Share & tools
lore

Shuah Khan

author
#0 lore raw

PATCH 1/1 frv: dma-mapping: support debug_dma_mapping_error

Add support for debug_dma_mapping_error() call to avoid warning from debug_dma_unmap() interface when it checks for mapping error checked status. Without this patch, device driver failed to check map error warning is generated.

---
 arch/frv/include/asm/dma-mapping.h |    2 ++
 1 file changed, 2 insertions(+)
arch/frv/include/asm/dma-mapping.h +2 -0
index dfb8110..d8a8aac 100644
@@ -6,6 +6,7 @@
 #include <asm/cacheflush.h>
 #include <asm/scatterlist.h>
 #include <asm/io.h>
+#include <linux/dma-debug.h>
 
 /*
  * See Documentation/DMA-API.txt for the description of how the
@@ -97,6 +98,7 @@ void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nele
 static inline
 int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
 {
+	debug_dma_mapping_error(dev, dma_addr);
 	return 0;
 }
 
Signature · 1 line
1.7.9.5
author
#1 lore raw
Quoted 6 lines · Shuah Khan

Add support for debug_dma_mapping_error() call to avoid warning from debug_dma_unmap() interface when it checks for mapping error checked status. Without this patch, device driver failed to check map error warning is generated.

Please ignore this patch if frv doesn't use dma_map_page() and dma_map_single() from arch/mips/include/asm/dma-mapping.

frv defines dma_map_page() and dma_map_single() in arch/frv/mb93090-mb00/pci-dma.c and arch/frv/mb93090-mb00/pci-dma-nommu.c

-- Shuah

Quoted 24 lines
---
 arch/frv/include/asm/dma-mapping.h |    2 ++
 1 file changed, 2 insertions(+)
arch/frv/include/asm/dma-mapping.h +2 -0
index dfb8110..d8a8aac 100644
@@ -6,6 +6,7 @@
 #include <asm/cacheflush.h>
 #include <asm/scatterlist.h>
 #include <asm/io.h>
+#include <linux/dma-debug.h>
 
 /*
  * See Documentation/DMA-API.txt for the description of how the
@@ -97,6 +98,7 @@ void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nele
 static inline
 int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
 {
+	debug_dma_mapping_error(dev, dma_addr);
 	return 0;
 }
 
author
#2 lore raw
Quoted 30 lines · Shuah Khan
Quoted 6 lines · Shuah Khan

Add support for debug_dma_mapping_error() call to avoid warning from debug_dma_unmap() interface when it checks for mapping error checked status. Without this patch, device driver failed to check map error warning is generated.

Please ignore this patch if frv doesn't use dma_map_page() and dma_map_single() from arch/mips/include/asm/dma-mapping.

frv defines dma_map_page() and dma_map_single() in arch/frv/mb93090-mb00/pci-dma.c and arch/frv/mb93090-mb00/pci-dma-nommu.c

-- Shuah

Quoted 14 lines
---
 arch/frv/include/asm/dma-mapping.h |    2 ++
 1 file changed, 2 insertions(+)
arch/frv/include/asm/dma-mapping.h +1 -0
index dfb8110..d8a8aac 100644
@@ -6,6 +6,7 @@
 #include <asm/cacheflush.h>
 #include <asm/scatterlist.h>
 #include <asm/io.h>
+#include <linux/dma-debug.h>
 
Quoted 11 lines

arch/frv/include/asm/dma-mapping.h void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nele · line 104

Quoted 10 lines
arch/frv/include/asm/dma-mapping.h +1 -0
 /*
  * See Documentation/DMA-API.txt for the description of how the
@@ -97,6 +98,7 @@ void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nele
 static inline
 int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
 {
+	debug_dma_mapping_error(dev, dma_addr);
 	return 0;
 }
 

Marek,

This one is for frv to go through your tree with the other arch patches for debug_dmap_mapping_error(). However, I am not very sure if this change is necessary for frv if it doesn't use generic dma interfaces. I will defer to you and David on deciding if this patch is needed.

frv defines dma_map_page() and dma_map_single() in arch/frv/mb93090-mb00/pci-dma.c and
arch/frv/mb93090-mb00/pci-dma-nommu.c

Thanks,
-- Shuah