Skip to contentSkip to conversation

ARM: dma-mapping: Return 0 if no ->set_dma_mask()

RFC Superseded Hiroshi Doyu 2 participants 5 messages Jan 28, 2013 – Jan 29, 2013

Subsystems (2)
Arm (32-bit) Tegra architecture support
lore
Share & tools
lore

Hiroshi Doyu

author
#0 lore raw

RFC 1/1 ARM: dma-mapping: Return 0 if no ->set_dma_mask()

struct dma_map_ops iommu_ops doesn't have ->set_dma_mask, which causes crash when dma_set_mask() is called from some driver.

Signed-off-by Hiroshi Doyu <[email protected]>
---
 arch/arm/include/asm/dma-mapping.h |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
arch/arm/include/asm/dma-mapping.h +5 -1
index a58e0f5..95328bf 100644
@@ -32,7 +32,11 @@ static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops)
 
 static inline int dma_set_mask(struct device *dev, u64 mask)
 {
-	return get_dma_ops(dev)->set_dma_mask(dev, mask);
+	struct dma_map_ops *ops = get_dma_ops(dev);
+
+	if (ops->set_dma_mask)
+		return ops->set_dma_mask(dev, mask);
+	return 0;
 }
 
 #ifdef __arch_page_to_dma
Signature · 1 line
1.7.9.5
#1 lore raw

Hello,

Quoted 2 lines · Hiroshi Doyu

struct dma_map_ops iommu_ops doesn't have ->set_dma_mask, which causes crash when dma_set_mask() is called from some driver.

I think that the issue is a bit different. It looks that iommu_ops lacks the mandatory set_dma_mask callback. arm_dma_set_mask() can be used for it, so please update your patch to add this missing callback.

Quoted 12 lines
Signed-off-by Hiroshi Doyu <[email protected]>
---
  arch/arm/include/asm/dma-mapping.h |    6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
arch/arm/include/asm/dma-mapping.h +0 -0
index a58e0f5..95328bf 100644
@@ -32,7 +32,11 @@ static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops)
 
  static inline int dma_set_mask(struct device *dev, u64 mask)

arch/arm/include/asm/dma-mapping.h static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops) · line 42

Quoted 10 lines
arch/arm/include/asm/dma-mapping.h +5 -1
  {
-	return get_dma_ops(dev)->set_dma_mask(dev, mask);
+	struct dma_map_ops *ops = get_dma_ops(dev);
+
+	if (ops->set_dma_mask)
+		return ops->set_dma_mask(dev, mask);
+	return 0;
  }
 
  #ifdef __arch_page_to_dma

Best regards

Signature · 2 lines
Marek Szyprowski
Samsung Poland R&D Center
author
#2 lore raw

PATCH v2 1/1 ARM: dma-mapping: Call arm_dma_set_mask() if no ->set_dma_mask()

struct dma_map_ops iommu_ops doesn't have ->set_dma_mask, which causes crash when dma_set_mask() is called from some driver.

Signed-off-by Hiroshi Doyu <[email protected]>
---
 arch/arm/include/asm/dma-mapping.h |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
arch/arm/include/asm/dma-mapping.h +8 -3
index 5b579b9..63cc49c 100644
@@ -14,6 +14,7 @@
 #define DMA_ERROR_CODE	(~0)
 extern struct dma_map_ops arm_dma_ops;
 extern struct dma_map_ops arm_coherent_dma_ops;
+extern int arm_dma_set_mask(struct device *dev, u64 dma_mask);
 
 static inline struct dma_map_ops *get_dma_ops(struct device *dev)
 {

@@ -32,7 +33,13 @@ static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops)
 
 static inline int dma_set_mask(struct device *dev, u64 mask)
 {
-	return get_dma_ops(dev)->set_dma_mask(dev, mask);
+	struct dma_map_ops *ops = get_dma_ops(dev);
+	BUG_ON(!ops);
+
+	if (ops->set_dma_mask)
+		return ops->set_dma_mask(dev, mask);
+
+	return arm_dma_set_mask(dev, mask);
 }
 
 #ifdef __arch_page_to_dma

@@ -112,8 +119,6 @@ static inline void dma_free_noncoherent(struct device *dev, size_t size,
 
 extern int dma_supported(struct device *dev, u64 mask);
 
-extern int arm_dma_set_mask(struct device *dev, u64 dma_mask);
-
 /**
  * arm_dma_alloc - allocate consistent memory for DMA
  * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
Signature · 1 line
1.7.9.5
#3 lore raw

PATCH v2 1/1 ARM: dma-mapping: Call arm_dma_set_mask() if no ->set_dma_mask()

Hello,

Quoted 36 lines · Hiroshi Doyu

struct dma_map_ops iommu_ops doesn't have ->set_dma_mask, which causes crash when dma_set_mask() is called from some driver.

Signed-off-by Hiroshi Doyu <[email protected]>
---
  arch/arm/include/asm/dma-mapping.h |   11 ++++++++---
  1 file changed, 8 insertions(+), 3 deletions(-)
arch/arm/include/asm/dma-mapping.h +8 -1
index 5b579b9..63cc49c 100644
@@ -14,6 +14,7 @@
  #define DMA_ERROR_CODE	(~0)
  extern struct dma_map_ops arm_dma_ops;
  extern struct dma_map_ops arm_coherent_dma_ops;
+extern int arm_dma_set_mask(struct device *dev, u64 dma_mask);
 
  static inline struct dma_map_ops *get_dma_ops(struct device *dev)
  {

@@ -32,7 +33,13 @@ static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops)
 
  static inline int dma_set_mask(struct device *dev, u64 mask)
  {
-	return get_dma_ops(dev)->set_dma_mask(dev, mask);
+	struct dma_map_ops *ops = get_dma_ops(dev);
+	BUG_ON(!ops);
+
+	if (ops->set_dma_mask)
+		return ops->set_dma_mask(dev, mask);
+
+	return arm_dma_set_mask(dev, mask);
  }
 
  #ifdef __arch_page_to_dma

arch/arm/include/asm/dma-mapping.h static inline void dma_free_noncoherent(struct device *dev, size_t size, · line 124

Quoted 8 lines
arch/arm/include/asm/dma-mapping.h +0 -2
@@ -112,8 +119,6 @@ static inline void dma_free_noncoherent(struct device *dev, size_t size,
 
  extern int dma_supported(struct device *dev, u64 mask);
 
-extern int arm_dma_set_mask(struct device *dev, u64 dma_mask);
-
  /**
   * arm_dma_alloc - allocate consistent memory for DMA
   * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices

It can be done much simpler, please just add '.set_dma_mask = arm_dma_set_mask,'
to iommu_ops declaration. There is no point complicating the header files.

Best regards

Signature · 2 lines
Marek Szyprowski
Samsung Poland R&D Center
author
#4 lore raw

PATCH v3 1/1 ARM: dma-mapping: Set arm_dma_set_mask() for iommu->set_dma_mask()

struct dma_map_ops iommu_ops doesn't have ->set_dma_mask, which causes crash when dma_set_mask() is called from some driver.

Signed-off-by Hiroshi Doyu <[email protected]>
---
 arch/arm/mm/dma-mapping.c |    4 ++++
 1 file changed, 4 insertions(+)
arch/arm/mm/dma-mapping.c +4 -0
index 6b2fb87..5dfc71f 100644
@@ -1730,6 +1730,8 @@ struct dma_map_ops iommu_ops = {
 	.unmap_sg		= arm_iommu_unmap_sg,
 	.sync_sg_for_cpu	= arm_iommu_sync_sg_for_cpu,
 	.sync_sg_for_device	= arm_iommu_sync_sg_for_device,
+
+	.set_dma_mask		= arm_dma_set_mask,
 };
 
 struct dma_map_ops iommu_coherent_ops = {

@@ -1743,6 +1745,8 @@ struct dma_map_ops iommu_coherent_ops = {
 
 	.map_sg		= arm_coherent_iommu_map_sg,
 	.unmap_sg	= arm_coherent_iommu_unmap_sg,
+
+	.set_dma_mask	= arm_dma_set_mask,
 };
 
 /**
Signature · 1 line
1.7.9.5