From: leo.yan@linaro.org (Leo Yan)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v11 5/9] coresight: of_get_coresight_platform_data: Add missing of_node_put
Date: Tue, 23 May 2017 22:16:16 +0800 [thread overview]
Message-ID: <1495548980-30432-6-git-send-email-leo.yan@linaro.org> (raw)
In-Reply-To: <1495548980-30432-1-git-send-email-leo.yan@linaro.org>
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
next prev parent reply other threads:[~2017-05-23 14:16 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-23 14:16 [PATCH v11 0/9] coresight: enable debug module Leo Yan
2017-05-23 14:16 ` [PATCH v11 1/9] coresight: bindings for CPU " Leo Yan
2017-05-23 14:16 ` [PATCH v11 2/9] doc: Add documentation for Coresight CPU debug Leo Yan
2017-05-23 14:16 ` [PATCH v11 3/9] doc: Add coresight_cpu_debug.enable to kernel-parameters.txt Leo Yan
2017-05-23 14:16 ` [PATCH v11 4/9] MAINTAINERS: update file entries for Coresight subsystem Leo Yan
2017-05-23 14:16 ` Leo Yan [this message]
2017-05-23 14:16 ` [PATCH v11 6/9] coresight: refactor with function of_coresight_get_cpu Leo Yan
2017-05-23 14:16 ` [PATCH v11 7/9] coresight: add support for CPU debug module Leo Yan
2017-05-23 17:39 ` Mathieu Poirier
2017-05-24 0:14 ` Leo Yan
2017-05-24 13:55 ` kbuild test robot
2017-05-23 14:16 ` [PATCH v11 8/9] arm64: dts: hi6220: register " Leo Yan
2017-05-23 16:29 ` Mathieu Poirier
2017-05-23 14:16 ` [PATCH v11 9/9] arm64: dts: qcom: msm8916: Add debug unit Leo Yan
2017-05-23 16:31 ` Mathieu Poirier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1495548980-30432-6-git-send-email-leo.yan@linaro.org \
--to=leo.yan@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).