From: Leo Yan <leo.yan@linaro.org> To: Jonathan Corbet <corbet@lwn.net>, Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Wei Xu <xuwei5@hisilicon.com>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, Andy Gross <andy.gross@linaro.org>, David Brown <david.brown@linaro.org>, Mathieu Poirier <mathieu.poirier@linaro.org>, Suzuki K Poulose <suzuki.poulose@arm.com>, Stephen Boyd <sboyd@codeaurora.org>, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, Mike Leach <mike.leach@linaro.org>, Sudeep Holla <sudeep.holla@arm.com> Cc: Leo Yan <leo.yan@linaro.org> Subject: [PATCH v6 3/8] coresight: of_get_coresight_platform_data: Add missing of_node_put Date: Thu, 6 Apr 2017 21:30:56 +0800 [thread overview] Message-ID: <1491485461-22800-4-git-send-email-leo.yan@linaro.org> (raw) In-Reply-To: <1491485461-22800-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> 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 629e031..1a77280 100644 --- a/drivers/hwtracing/coresight/of_coresight.c +++ b/drivers/hwtracing/coresight/of_coresight.c @@ -108,7 +108,8 @@ struct coresight_platform_data *of_get_coresight_platform_data( 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; @@ -175,17 +176,19 @@ struct coresight_platform_data *of_get_coresight_platform_data( } 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
WARNING: multiple messages have this Message-ID (diff)
From: leo.yan@linaro.org (Leo Yan) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v6 3/8] coresight: of_get_coresight_platform_data: Add missing of_node_put Date: Thu, 6 Apr 2017 21:30:56 +0800 [thread overview] Message-ID: <1491485461-22800-4-git-send-email-leo.yan@linaro.org> (raw) In-Reply-To: <1491485461-22800-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> 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 629e031..1a77280 100644 --- a/drivers/hwtracing/coresight/of_coresight.c +++ b/drivers/hwtracing/coresight/of_coresight.c @@ -108,7 +108,8 @@ struct coresight_platform_data *of_get_coresight_platform_data( 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; @@ -175,17 +176,19 @@ struct coresight_platform_data *of_get_coresight_platform_data( } 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-04-06 13:32 UTC|newest] Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-04-06 13:30 [PATCH v6 0/8] coresight: enable debug module Leo Yan 2017-04-06 13:30 ` Leo Yan 2017-04-06 13:30 ` Leo Yan 2017-04-06 13:30 ` [PATCH v6 1/8] coresight: bindings for CPU " Leo Yan 2017-04-06 13:30 ` Leo Yan 2017-04-06 13:30 ` [PATCH v6 2/8] doc: Add documentation for Coresight CPU debug Leo Yan 2017-04-06 13:30 ` Leo Yan [not found] ` <1491485461-22800-3-git-send-email-leo.yan-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2017-04-19 17:25 ` Mathieu Poirier 2017-04-19 17:25 ` Mathieu Poirier 2017-04-19 17:25 ` Mathieu Poirier 2017-04-06 13:30 ` Leo Yan [this message] 2017-04-06 13:30 ` [PATCH v6 3/8] coresight: of_get_coresight_platform_data: Add missing of_node_put Leo Yan 2017-04-18 15:09 ` Mathieu Poirier 2017-04-18 15:09 ` Mathieu Poirier 2017-04-06 13:30 ` [PATCH v6 4/8] coresight: refactor with function of_coresight_get_cpu Leo Yan 2017-04-06 13:30 ` Leo Yan 2017-04-06 13:30 ` [PATCH v6 5/8] coresight: use const for device_node structures Leo Yan 2017-04-06 13:30 ` Leo Yan [not found] ` <1491485461-22800-6-git-send-email-leo.yan-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2017-04-18 15:24 ` Mathieu Poirier 2017-04-18 15:24 ` Mathieu Poirier 2017-04-18 15:24 ` Mathieu Poirier [not found] ` <20170418152447.GB22806-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2017-04-18 23:13 ` Leo Yan 2017-04-18 23:13 ` Leo Yan 2017-04-18 23:13 ` Leo Yan [not found] ` <1491485461-22800-1-git-send-email-leo.yan-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2017-04-06 13:30 ` [PATCH v6 6/8] coresight: add support for CPU debug module Leo Yan 2017-04-06 13:30 ` Leo Yan 2017-04-06 13:30 ` Leo Yan [not found] ` <1491485461-22800-7-git-send-email-leo.yan-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2017-04-18 17:40 ` Mathieu Poirier 2017-04-18 17:40 ` Mathieu Poirier 2017-04-18 17:40 ` Mathieu Poirier 2017-04-19 0:18 ` Leo Yan 2017-04-19 0:18 ` Leo Yan 2017-04-19 14:52 ` Mathieu Poirier 2017-04-19 14:52 ` Mathieu Poirier 2017-04-19 14:52 ` Mathieu Poirier 2017-04-19 15:30 ` Leo Yan 2017-04-19 15:30 ` Leo Yan 2017-04-19 15:30 ` Leo Yan 2017-04-19 16:50 ` Mathieu Poirier 2017-04-19 16:50 ` Mathieu Poirier 2017-04-19 16:50 ` Mathieu Poirier 2017-04-19 13:23 ` Suzuki K Poulose 2017-04-19 13:23 ` Suzuki K Poulose 2017-04-19 14:28 ` Leo Yan 2017-04-19 14:28 ` Leo Yan 2017-04-19 14:32 ` Suzuki K Poulose 2017-04-19 14:32 ` Suzuki K Poulose 2017-04-19 14:32 ` Suzuki K Poulose 2017-04-19 15:07 ` Leo Yan 2017-04-19 15:07 ` Leo Yan 2017-04-19 17:49 ` Mathieu Poirier 2017-04-19 17:49 ` Mathieu Poirier 2017-04-19 17:49 ` Mathieu Poirier 2017-04-06 13:31 ` [PATCH v6 7/8] arm64: dts: hi6220: register " Leo Yan 2017-04-06 13:31 ` Leo Yan 2017-04-06 13:31 ` [PATCH v6 8/8] arm64: dts: qcom: msm8916: Add debug unit Leo Yan 2017-04-06 13:31 ` Leo Yan
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=1491485461-22800-4-git-send-email-leo.yan@linaro.org \ --to=leo.yan@linaro.org \ --cc=andy.gross@linaro.org \ --cc=catalin.marinas@arm.com \ --cc=corbet@lwn.net \ --cc=david.brown@linaro.org \ --cc=devicetree@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-doc@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-soc@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=mathieu.poirier@linaro.org \ --cc=mike.leach@linaro.org \ --cc=robh+dt@kernel.org \ --cc=sboyd@codeaurora.org \ --cc=sudeep.holla@arm.com \ --cc=suzuki.poulose@arm.com \ --cc=will.deacon@arm.com \ --cc=xuwei5@hisilicon.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.