Skip to contentSkip to conversation

dma-coherent: fix rmem_dma_device_init regression

PATCH Applied Arnd Bergmann 3 participants 3 messages Sep 15, 2017 – Sep 17, 2017 Driver core

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dma-coherent: fix rmem_dma_device_init regression

My recent bug fix introduced another bug, which caused rmem_dma_device_init to always fail, as rmem->priv is never set to anything.

This restores the previous behavior, calling dma_init_coherent_memory() whenever ->priv is NULL.

Fixes d35b0996fef3 ("dma-coherent: fix dma_declare_coherent_memory() logic error")

---
Roy, can you test this new fix?

---
 drivers/base/dma-coherent.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)
drivers/base/dma-coherent.c +9 -10
index a39b2166b145..744f64f43454 100644
@@ -348,16 +348,15 @@ static int rmem_dma_device_init(struct reserved_mem *rmem, struct device *dev)
 	struct dma_coherent_mem *mem = rmem->priv;
 	int ret;
 
-	if (!mem)
-		return -ENODEV;
-
-	ret = dma_init_coherent_memory(rmem->base, rmem->base, rmem->size,
-				       DMA_MEMORY_EXCLUSIVE, &mem);
-
-	if (ret) {
-		pr_err("Reserved memory: failed to init DMA memory pool at %pa, size %ld MiB\n",
-			&rmem->base, (unsigned long)rmem->size / SZ_1M);
-		return ret;
+	if (!mem) {
+		ret = dma_init_coherent_memory(rmem->base, rmem->base,
+					       rmem->size,
+					       DMA_MEMORY_EXCLUSIVE, &mem);
+		if (ret) {
+			pr_err("Reserved memory: failed to init DMA memory pool at %pa, size %ld MiB\n",
+				&rmem->base, (unsigned long)rmem->size / SZ_1M);
+			return ret;
+		}
 	}
 	mem->use_dev_dma_pfn_offset = true;
 	rmem->priv = mem;
Signature · 1 line
2.9.0
Tested-by on v1 1/1
#1 lore raw
Quoted 36 lines · Arnd Bergmann

My recent bug fix introduced another bug, which caused rmem_dma_device_init to always fail, as rmem->priv is never set to anything.

This restores the previous behavior, calling dma_init_coherent_memory() whenever ->priv is NULL.

Fixes d35b0996fef3 ("dma-coherent: fix dma_declare_coherent_memory() logic error")

---
Roy, can you test this new fix?

---
  drivers/base/dma-coherent.c | 19 +++++++++----------
  1 file changed, 9 insertions(+), 10 deletions(-)
drivers/base/dma-coherent.c +2 -10
index a39b2166b145..744f64f43454 100644
@@ -348,16 +348,15 @@ static int rmem_dma_device_init(struct reserved_mem *rmem, struct device *dev)
  	struct dma_coherent_mem *mem = rmem->priv;
  	int ret;
 
-	if (!mem)
-		return -ENODEV;
-
-	ret = dma_init_coherent_memory(rmem->base, rmem->base, rmem->size,
-				       DMA_MEMORY_EXCLUSIVE, &mem);
-
-	if (ret) {
-		pr_err("Reserved memory: failed to init DMA memory pool at %pa, size %ld MiB\n",
-			&rmem->base, (unsigned long)rmem->size / SZ_1M);
-		return ret;
+	if (!mem) {
+		ret = dma_init_coherent_memory(rmem->base, rmem->base,

drivers/base/dma-coherent.c static int rmem_dma_device_init(struct reserved_mem *rmem, struct device *dev) · line 362

Quoted 10 lines
drivers/base/dma-coherent.c +7 -0
+					       rmem->size,
+					       DMA_MEMORY_EXCLUSIVE, &mem);
+		if (ret) {
+			pr_err("Reserved memory: failed to init DMA memory pool at %pa, size %ld MiB\n",
+				&rmem->base, (unsigned long)rmem->size / SZ_1M);
+			return ret;
+		}
  	}
  	mem->use_dev_dma_pfn_offset = true;
  	rmem->priv = mem;

I tried this and it solves the issue I was seeing. Thanks for the quick fix.