Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1649010

[PATCH v12 5/9] coresight: of_get_coresight_platform_data: Add missing of_node_put

Show all headers | View raw

From: Suzuki K Poulose <suzuki.poulose@arm.com>

The of_get_coresight_platform_data iterates over the possible CPU nodes
to find a given cpu phandle. However it does not drop the reference
to the node pointer returned by the of_get_coresight_platform_data.

This patch also introduces another minor fix is to use
of_cpu_device_node_get() to replace of_get_cpu_node().

Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
[Leo: minor tweaks for of_get_coresight_platform_data]
Signed-off-by: Leo Yan <leo.yan@linaro.org>
---
 drivers/hwtracing/coresight/of_coresight.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/drivers/hwtracing/coresight/of_coresight.c b/drivers/hwtracing/coresight/of_coresight.c
index 2749853..225b2dd 100644
--- a/drivers/hwtracing/coresight/of_coresight.c
+++ b/drivers/hwtracing/coresight/of_coresight.c
@@ -109,7 +109,8 @@ of_get_coresight_platform_data(struct device *dev,
 	struct coresight_platform_data *pdata;
 	struct of_endpoint endpoint, rendpoint;
 	struct device *rdev;
-	struct device_node *dn;
+	bool found;
+	struct device_node *dn, *np;
 	struct device_node *ep = NULL;
 	struct device_node *rparent = NULL;
 	struct device_node *rport = NULL;
@@ -176,17 +177,19 @@ of_get_coresight_platform_data(struct device *dev,
 		} while (ep);
 	}
 
-	/* Affinity defaults to CPU0 */
-	pdata->cpu = 0;
 	dn = of_parse_phandle(node, "cpu", 0);
-	for (cpu = 0; dn && cpu < nr_cpu_ids; cpu++) {
-		if (dn == of_get_cpu_node(cpu, NULL)) {
-			pdata->cpu = cpu;
+	for_each_possible_cpu(cpu) {
+		np = of_cpu_device_node_get(cpu);
+		found = (dn == np);
+		of_node_put(np);
+		if (found)
 			break;
-		}
 	}
 	of_node_put(dn);
 
+	/* Affinity to CPU0 if no cpu nodes are found */
+	pdata->cpu = found ? cpu : 0;
+
 	return pdata;
 }
 EXPORT_SYMBOL_GPL(of_get_coresight_platform_data);
-- 
2.7.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v12 0/9] coresight: enable debug module Leo Yan <leo.yan@linaro.org> - 2017-05-24 02:10 +0200
  [PATCH v12 6/9] coresight: refactor with function of_coresight_get_cpu Leo Yan <leo.yan@linaro.org> - 2017-05-24 02:10 +0200
  [PATCH v12 5/9] coresight: of_get_coresight_platform_data: Add missing of_node_put Leo Yan <leo.yan@linaro.org> - 2017-05-24 02:10 +0200
  [PATCH v12 2/9] doc: Add documentation for Coresight CPU debug Leo Yan <leo.yan@linaro.org> - 2017-05-24 02:10 +0200
  [PATCH v12 9/9] arm64: dts: qcom: msm8916: Add debug unit Leo Yan <leo.yan@linaro.org> - 2017-05-24 02:10 +0200
  [PATCH v12 3/9] doc: Add coresight_cpu_debug.enable to kernel-parameters.txt Leo Yan <leo.yan@linaro.org> - 2017-05-24 02:10 +0200
  [PATCH v12 4/9] MAINTAINERS: update file entries for Coresight subsystem Leo Yan <leo.yan@linaro.org> - 2017-05-24 02:10 +0200
  [PATCH v12 7/9] coresight: add support for CPU debug module Leo Yan <leo.yan@linaro.org> - 2017-05-24 02:10 +0200
  [PATCH v12 1/9] coresight: bindings for CPU debug module Leo Yan <leo.yan@linaro.org> - 2017-05-24 02:10 +0200
  [PATCH v12 8/9] arm64: dts: hi6220: register debug module Leo Yan <leo.yan@linaro.org> - 2017-05-24 02:10 +0200

csiph-web