Skip to contentSkip to conversation

ARM64: dma-mapping: support debug_dma_mapping_error

PATCH In review Shuah Khan 3 participants 7 messages Oct 25, 2012 – Nov 15, 2012 arm64

lore
Share & tools
lore

Shuah Khan

author
#0 lore raw

PATCH 1/1 ARM64: 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/arm64/include/asm/dma-mapping.h |    1 +
 1 file changed, 1 insertion(+)
arch/arm64/include/asm/dma-mapping.h +1 -0
index 538f4b4..9947768 100644
@@ -50,6 +50,7 @@ static inline phys_addr_t dma_to_phys(struct device *dev, dma_addr_t dev_addr)
 static inline int dma_mapping_error(struct device *dev, dma_addr_t dev_addr)
 {
 	struct dma_map_ops *ops = get_dma_ops(dev);
+	debug_dma_mapping_error(dev, dev_addr);
 	return ops->mapping_error(dev, dev_addr);
 }
 
Signature · 1 line
1.7.9.5
#1 lore raw
Quoted 7 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.

---

Looks good. Similar fix for 32bit ARM port is done in below commit.

From 871ae57adc5ed092c1341f411514d0e8482e2611 Mon Sep 17 00:00:00 2001
From: Ming Lei <[email protected]>
Date: Mon, 22 Oct 2012 20:44:03 +0800
Subject: [PATCH] ARM: dma-mapping: support debug_dma_mapping_error

Regards
Santosh

maintainer
#2 lore raw
In reply to Shuah Khan
Quoted 15 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.

---
 arch/arm64/include/asm/dma-mapping.h |    1 +
 1 file changed, 1 insertion(+)
arch/arm64/include/asm/dma-mapping.h +0 -0
index 538f4b4..9947768 100644

arch/arm64/include/asm/dma-mapping.h static inline phys_addr_t dma_to_phys(struct device *dev, dma_addr_t dev_addr) · line 55

Quoted 6 lines
arch/arm64/include/asm/dma-mapping.h +1 -0
@@ -50,6 +50,7 @@ static inline phys_addr_t dma_to_phys(struct device *dev, dma_addr_t dev_addr)
 static inline int dma_mapping_error(struct device *dev, dma_addr_t dev_addr)
 {
        struct dma_map_ops *ops = get_dma_ops(dev);
+       debug_dma_mapping_error(dev, dev_addr);
        return ops->mapping_error(dev, dev_addr);
 }

The patch looks fine but debug_dma_mapping_error() is not in mainline yet, so it will have to wait. If you want to add it to your series (which I assume adds debug_dma_mapping_error() support), you can add my Acked-by on the patch.

Signature · 1 line
Catalin
author
#3 lore raw

PATCH 1/1 ARM64: 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/arm64/include/asm/dma-mapping.h |    1 +
 1 file changed, 1 insertion(+)
arch/arm64/include/asm/dma-mapping.h +1 -0
index 538f4b4..9947768 100644
@@ -50,6 +50,7 @@ static inline phys_addr_t dma_to_phys(struct device *dev, dma_addr_t dev_addr)
 static inline int dma_mapping_error(struct device *dev, dma_addr_t dev_addr)
 {
 	struct dma_map_ops *ops = get_dma_ops(dev);
+	debug_dma_mapping_error(dev, dev_addr);
 	return ops->mapping_error(dev, dev_addr);
 }
 
Signature · 1 line
1.7.9.5
author
#4 lore raw
Quoted 7 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.

Do you want this patch going through linux-next or the ARM64 tree? Let me know your preference.

-- Shuah

Quoted 16 lines
---
 arch/arm64/include/asm/dma-mapping.h |    1 +
 1 file changed, 1 insertion(+)
arch/arm64/include/asm/dma-mapping.h +1 -0
index 538f4b4..9947768 100644
@@ -50,6 +50,7 @@ static inline phys_addr_t dma_to_phys(struct device *dev, dma_addr_t dev_addr)
 static inline int dma_mapping_error(struct device *dev, dma_addr_t dev_addr)
 {
 	struct dma_map_ops *ops = get_dma_ops(dev);
+	debug_dma_mapping_error(dev, dev_addr);
 	return ops->mapping_error(dev, dev_addr);
 }
 
maintainer
#5 lore raw
Quoted 11 lines · Shuah Khan
Quoted 7 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.

Do you want this patch going through linux-next or the ARM64 tree? Let me know your preference.

I think it can go together with your other patches since I can't tell when you'll push the debug_dma_mapping_error() implementation.

Signature · 1 line
Catalin
author
#6 lore raw
Quoted 7 lines · Catalin Marinas
Quoted 6 lines · Shuah Khan
Quoted 5 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.

Quoted 9 lines
Quoted 5 lines
Quoted 2 lines

Do you want this patch going through linux-next or the ARM64 tree? Let me know your preference.

I think it can go together with your other patches since I can't tell when you'll push the debug_dma_mapping_error() implementation.

Marek,

This one is for ARM64 and ARM tree has already been fixed.

-- Shuah