From: Stephen Boyd <sboyd@codeaurora.org>
To: Loys Ollivier <lollivier@baylibre.com>
Cc: Andy Gross <andy.gross@linaro.org>,
David Brown <david.brown@linaro.org>,
linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Jerome Brunet <jbrunet@baylibre.com>
Subject: Re: [PATCH v2] firmware: qcom: scm: Fix incorrect of_node_put call in scm_init
Date: Wed, 6 Dec 2017 12:06:01 -0800 [thread overview]
Message-ID: <20171206200601.GH4283@codeaurora.org> (raw)
In-Reply-To: <1512555692-14439-1-git-send-email-lollivier@baylibre.com>
On 12/06, Loys Ollivier wrote:
> When using other platform architectures, in the init of the qcom_scm
> driver, of_node_put is called on /firmware if no qcom dt is found.
> This results in a kernel error: Bad of_node_put() on /firmware.
>
> The call to of_node_put from the qcom_scm init is unnecessary as
> of_find_matching_node is calling it automatically.
>
> Remove this of_node_put().
>
> Fixes: d0f6fa7ba2d6 ("firmware: qcom: scm: Convert SCM to platform driver")
> Signed-off-by: Loys Ollivier <lollivier@baylibre.com>
> ---
This still looks wrong. Especially if of_find_matching_node() is
going to look for siblings of the /firmware node for the
compatible string for scm device. Why do we check at all? Can't
we just delete this and let of_platform_populate() take care of
it? BTW, OP-TEE driver seems to have a similar problem.
---8<----
diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
index af4c75217ea6..440d8f796faa 100644
--- a/drivers/firmware/qcom_scm.c
+++ b/drivers/firmware/qcom_scm.c
@@ -626,23 +626,11 @@ static int __init qcom_scm_init(void)
int ret;
fw_np = of_find_node_by_name(NULL, "firmware");
-
if (!fw_np)
- return -ENODEV;
-
- np = of_find_matching_node(fw_np, qcom_scm_dt_match);
-
- if (!np) {
- of_node_put(fw_np);
- return -ENODEV;
- }
-
- of_node_put(np);
+ return 0;
ret = of_platform_populate(fw_np, qcom_scm_dt_match, NULL, NULL);
-
of_node_put(fw_np);
-
if (ret)
return ret;
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
WARNING: multiple messages have this Message-ID (diff)
From: sboyd@codeaurora.org (Stephen Boyd)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2] firmware: qcom: scm: Fix incorrect of_node_put call in scm_init
Date: Wed, 6 Dec 2017 12:06:01 -0800 [thread overview]
Message-ID: <20171206200601.GH4283@codeaurora.org> (raw)
In-Reply-To: <1512555692-14439-1-git-send-email-lollivier@baylibre.com>
On 12/06, Loys Ollivier wrote:
> When using other platform architectures, in the init of the qcom_scm
> driver, of_node_put is called on /firmware if no qcom dt is found.
> This results in a kernel error: Bad of_node_put() on /firmware.
>
> The call to of_node_put from the qcom_scm init is unnecessary as
> of_find_matching_node is calling it automatically.
>
> Remove this of_node_put().
>
> Fixes: d0f6fa7ba2d6 ("firmware: qcom: scm: Convert SCM to platform driver")
> Signed-off-by: Loys Ollivier <lollivier@baylibre.com>
> ---
This still looks wrong. Especially if of_find_matching_node() is
going to look for siblings of the /firmware node for the
compatible string for scm device. Why do we check at all? Can't
we just delete this and let of_platform_populate() take care of
it? BTW, OP-TEE driver seems to have a similar problem.
---8<----
diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
index af4c75217ea6..440d8f796faa 100644
--- a/drivers/firmware/qcom_scm.c
+++ b/drivers/firmware/qcom_scm.c
@@ -626,23 +626,11 @@ static int __init qcom_scm_init(void)
int ret;
fw_np = of_find_node_by_name(NULL, "firmware");
-
if (!fw_np)
- return -ENODEV;
-
- np = of_find_matching_node(fw_np, qcom_scm_dt_match);
-
- if (!np) {
- of_node_put(fw_np);
- return -ENODEV;
- }
-
- of_node_put(np);
+ return 0;
ret = of_platform_populate(fw_np, qcom_scm_dt_match, NULL, NULL);
-
of_node_put(fw_np);
-
if (ret)
return ret;
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
next prev parent reply other threads:[~2017-12-06 20:06 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-06 10:21 [PATCH v2] firmware: qcom: scm: Fix incorrect of_node_put call in scm_init Loys Ollivier
2017-12-06 10:21 ` Loys Ollivier
2017-12-06 20:06 ` Stephen Boyd [this message]
2017-12-06 20:06 ` Stephen Boyd
2017-12-07 8:42 ` Jerome Forissier
2017-12-07 8:42 ` Jerome Forissier
2017-12-07 9:34 ` Loys Ollivier
2017-12-07 9:34 ` Loys Ollivier
2017-12-08 17:04 ` Stephen Boyd
2017-12-08 17:04 ` Stephen Boyd
2017-12-12 15:35 ` Loys Ollivier
2017-12-12 15:35 ` Loys Ollivier
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=20171206200601.GH4283@codeaurora.org \
--to=sboyd@codeaurora.org \
--cc=andy.gross@linaro.org \
--cc=david.brown@linaro.org \
--cc=jbrunet@baylibre.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-soc@vger.kernel.org \
--cc=lollivier@baylibre.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: link
Be 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.