Skip to contentSkip to conversation

remoteproc: k3: Call of_node_put(rmem_np) only once in three functions

PATCH Applied Markus Elfring 4 participants 4 messages Sep 24, 2024 – Sep 30, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 remoteproc: k3: Call of_node_put(rmem_np) only once in three functions

From: Markus Elfring <[email protected]>
Date: Tue, 24 Sep 2024 14:28:35 +0200

An of_node_put(rmem_np) call was immediately used after a pointer check for a of_reserved_mem_lookup() call in three function implementations. Thus call such a function only once instead directly before the checks.

This issue was transformed by using the Coccinelle software.

---
 drivers/remoteproc/ti_k3_dsp_remoteproc.c | 6 ++----
 drivers/remoteproc/ti_k3_m4_remoteproc.c  | 6 ++----
 drivers/remoteproc/ti_k3_r5_remoteproc.c  | 3 +--
 3 files changed, 5 insertions(+), 10 deletions(-)
drivers/remoteproc/ti_k3_dsp_remoteproc.c +2 -4
index 8be3f631c192..d08a3a98ada1 100644
@@ -576,11 +576,9 @@ static int k3_dsp_reserved_mem_init(struct k3_dsp_rproc *kproc)
 			return -EINVAL;
 
 		rmem = of_reserved_mem_lookup(rmem_np);
-		if (!rmem) {
-			of_node_put(rmem_np);
-			return -EINVAL;
-		}
 		of_node_put(rmem_np);
+		if (!rmem)
+			return -EINVAL;
 
 		kproc->rmem[i].bus_addr = rmem->base;
 		/* 64-bit address regions currently not supported */
drivers/remoteproc/ti_k3_m4_remoteproc.c +2 -4
index 09f0484a90e1..a16fb165fced 100644
@@ -433,11 +433,9 @@ static int k3_m4_reserved_mem_init(struct k3_m4_rproc *kproc)
 			return -EINVAL;
 
 		rmem = of_reserved_mem_lookup(rmem_np);
-		if (!rmem) {
-			of_node_put(rmem_np);
-			return -EINVAL;
-		}
 		of_node_put(rmem_np);
+		if (!rmem)
+			return -EINVAL;
 
 		kproc->rmem[i].bus_addr = rmem->base;
 		/* 64-bit address regions currently not supported */
drivers/remoteproc/ti_k3_r5_remoteproc.c +1 -2
index 747ee467da88..d0ebdd5cfa70 100644
@@ -1001,12 +1001,11 @@ static int k3_r5_reserved_mem_init(struct k3_r5_rproc *kproc)
 		}
 
 		rmem = of_reserved_mem_lookup(rmem_np);
+		of_node_put(rmem_np);
 		if (!rmem) {
-			of_node_put(rmem_np);
 			ret = -EINVAL;
 			goto unmap_rmem;
 		}
-		of_node_put(rmem_np);
 
 		kproc->rmem[i].bus_addr = rmem->base;
 		/*

--
2.46.1

Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Markus Elfring

From: Markus Elfring <[email protected]>
Date: Tue, 24 Sep 2024 14:28:35 +0200

An of_node_put(rmem_np) call was immediately used after a pointer check
for a of_reserved_mem_lookup() call in three function implementations.
Thus call such a function only once instead directly before the checks.

Quoted 3 lines

This issue was transformed by using the Coccinelle software.

Quoted 69 lines

---
 drivers/remoteproc/ti_k3_dsp_remoteproc.c | 6 ++---- drivers/remoteproc/ti_k3_m4_remoteproc.c  | 6 ++---- drivers/remoteproc/ti_k3_r5_remoteproc.c  | 3 +--

 3 files changed, 5 insertions(+), 10 deletions(-)
drivers/remoteproc/ti_k3_dsp_remoteproc.c +2 -4
index 8be3f631c192..d08a3a98ada1 100644
@@ -576,11 +576,9 @@ static int k3_dsp_reserved_mem_init(struct
 k3_dsp_rproc *kproc)
  			return -EINVAL;
 
  		rmem = of_reserved_mem_lookup(rmem_np);
-		if (!rmem) {
-			of_node_put(rmem_np);
-			return -EINVAL;
-		}
  		of_node_put(rmem_np);
+		if (!rmem)
+			return -EINVAL;
 
  		kproc->rmem[i].bus_addr = rmem->base;

  /* 64-bit address regions currently not supported */

drivers/remoteproc/ti_k3_m4_remoteproc.c +2 -4
index 09f0484a90e1..a16fb165fced 100644
@@ -433,11 +433,9 @@ static int k3_m4_reserved_mem_init(struct
 k3_m4_rproc *kproc)
  			return -EINVAL;
 
  		rmem = of_reserved_mem_lookup(rmem_np);
-		if (!rmem) {
-			of_node_put(rmem_np);
-			return -EINVAL;
-		}
  		of_node_put(rmem_np);
+		if (!rmem)
+			return -EINVAL;
 
  		kproc->rmem[i].bus_addr = rmem->base;

  /* 64-bit address regions currently not supported */

drivers/remoteproc/ti_k3_r5_remoteproc.c +1 -2
index 747ee467da88..d0ebdd5cfa70 100644
@@ -1001,12 +1001,11 @@ static int k3_r5_reserved_mem_init(struct
 k3_r5_rproc *kproc)
  		}
 
  		rmem = of_reserved_mem_lookup(rmem_np);
+		of_node_put(rmem_np);
  		if (!rmem) {
-			of_node_put(rmem_np);
  			ret = -EINVAL;
  			goto unmap_rmem;
  		}
-		of_node_put(rmem_np);
 
  		kproc->rmem[i].bus_addr = rmem->base;

  /*
--
2.46.1

#2 lore raw
In reply to Markus Elfring
Quoted 9 lines · Markus Elfring

From: Markus Elfring <[email protected]>
Date: Tue, 24 Sep 2024 14:28:35 +0200

An of_node_put(rmem_np) call was immediately used after a pointer check for a of_reserved_mem_lookup() call in three function implementations. Thus call such a function only once instead directly before the checks.

This issue was transformed by using the Coccinelle software.

Quick check of all the users of of_reserved_mem_lookup(), they almost all do the same thing, get the phandle, mem_lookup, then node_put.

Maybe a helper function like this:

struct reserved_mem *of_reserved_mem_region_lookup(const struct device_node *node, int index)

{
	struct device_node *np;
	struct reserved_mem *rmem;

	np = of_parse_phandle(node, "memory-region", index);
	if (!np)
		return ERR_PTR(-ENODEV);

	rmem = of_reserved_mem_lookup(np);
	of_node_put(np);
	if (!rmem)
		return ERR_PTR(-EINVAL);

	return rmem;
}

Added to of_reserved_mem.c would allow us to clean up these cases in this patch, and then several more spots (and also help force standard property name usage).

Andrew

Quoted 64 lines
---
  drivers/remoteproc/ti_k3_dsp_remoteproc.c | 6 ++----
  drivers/remoteproc/ti_k3_m4_remoteproc.c  | 6 ++----
  drivers/remoteproc/ti_k3_r5_remoteproc.c  | 3 +--
  3 files changed, 5 insertions(+), 10 deletions(-)
drivers/remoteproc/ti_k3_dsp_remoteproc.c +2 -4
index 8be3f631c192..d08a3a98ada1 100644
@@ -576,11 +576,9 @@ static int k3_dsp_reserved_mem_init(struct k3_dsp_rproc *kproc)
  			return -EINVAL;
 
  		rmem = of_reserved_mem_lookup(rmem_np);
-		if (!rmem) {
-			of_node_put(rmem_np);
-			return -EINVAL;
-		}
  		of_node_put(rmem_np);
+		if (!rmem)
+			return -EINVAL;
 
  		kproc->rmem[i].bus_addr = rmem->base;
  		/* 64-bit address regions currently not supported */
drivers/remoteproc/ti_k3_m4_remoteproc.c +2 -4
index 09f0484a90e1..a16fb165fced 100644
@@ -433,11 +433,9 @@ static int k3_m4_reserved_mem_init(struct k3_m4_rproc *kproc)
  			return -EINVAL;
 
  		rmem = of_reserved_mem_lookup(rmem_np);
-		if (!rmem) {
-			of_node_put(rmem_np);
-			return -EINVAL;
-		}
  		of_node_put(rmem_np);
+		if (!rmem)
+			return -EINVAL;
 
  		kproc->rmem[i].bus_addr = rmem->base;
  		/* 64-bit address regions currently not supported */
drivers/remoteproc/ti_k3_r5_remoteproc.c +1 -3
index 747ee467da88..d0ebdd5cfa70 100644
@@ -1001,12 +1001,11 @@ static int k3_r5_reserved_mem_init(struct k3_r5_rproc *kproc)
  		}
 
  		rmem = of_reserved_mem_lookup(rmem_np);
+		of_node_put(rmem_np);
  		if (!rmem) {
-			of_node_put(rmem_np);
  			ret = -EINVAL;
  			goto unmap_rmem;
  		}
-		of_node_put(rmem_np);
 
  		kproc->rmem[i].bus_addr = rmem->base;
  		/*
--

2.46.1

maintainer Applied
#3 lore raw
In reply to Markus Elfring
Quoted 7 lines · Markus Elfring

From: Markus Elfring <[email protected]>
Date: Tue, 24 Sep 2024 14:28:35 +0200

An of_node_put(rmem_np) call was immediately used after a pointer check for a of_reserved_mem_lookup() call in three function implementations. Thus call such a function only once instead directly before the checks.

Quoted 9 lines

This issue was transformed by using the Coccinelle software.

---
 drivers/remoteproc/ti_k3_dsp_remoteproc.c | 6 ++----
 drivers/remoteproc/ti_k3_m4_remoteproc.c  | 6 ++----
 drivers/remoteproc/ti_k3_r5_remoteproc.c  | 3 +--
 3 files changed, 5 insertions(+), 10 deletions(-)

Applied.

Thanks,
Mathieu

Quoted 57 lines
drivers/remoteproc/ti_k3_dsp_remoteproc.c +2 -4
index 8be3f631c192..d08a3a98ada1 100644
@@ -576,11 +576,9 @@ static int k3_dsp_reserved_mem_init(struct k3_dsp_rproc *kproc)
 			return -EINVAL;
 
 		rmem = of_reserved_mem_lookup(rmem_np);
-		if (!rmem) {
-			of_node_put(rmem_np);
-			return -EINVAL;
-		}
 		of_node_put(rmem_np);
+		if (!rmem)
+			return -EINVAL;
 
 		kproc->rmem[i].bus_addr = rmem->base;
 		/* 64-bit address regions currently not supported */
drivers/remoteproc/ti_k3_m4_remoteproc.c +2 -4
index 09f0484a90e1..a16fb165fced 100644
@@ -433,11 +433,9 @@ static int k3_m4_reserved_mem_init(struct k3_m4_rproc *kproc)
 			return -EINVAL;
 
 		rmem = of_reserved_mem_lookup(rmem_np);
-		if (!rmem) {
-			of_node_put(rmem_np);
-			return -EINVAL;
-		}
 		of_node_put(rmem_np);
+		if (!rmem)
+			return -EINVAL;
 
 		kproc->rmem[i].bus_addr = rmem->base;
 		/* 64-bit address regions currently not supported */
drivers/remoteproc/ti_k3_r5_remoteproc.c +1 -3
index 747ee467da88..d0ebdd5cfa70 100644
@@ -1001,12 +1001,11 @@ static int k3_r5_reserved_mem_init(struct k3_r5_rproc *kproc)
 		}
 
 		rmem = of_reserved_mem_lookup(rmem_np);
+		of_node_put(rmem_np);
 		if (!rmem) {
-			of_node_put(rmem_np);
 			ret = -EINVAL;
 			goto unmap_rmem;
 		}
-		of_node_put(rmem_np);
 
 		kproc->rmem[i].bus_addr = rmem->base;
 		/*
--

2.46.1