| Message ID | 1513345214-22835-1-git-send-email-lollivier@baylibre.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hello guys, Any news on this fix ? Anything else you need on my side ? Thanks On 15/12/2017 14:40, 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. > > These calls to of_node_put from the qcom_scm init are unnecessary as > of_find_matching_node and of_platform_populate are calling it > automatically. > > Remove the calls to of_node_put() on fw_np. > > Fixes: d0f6fa7ba2d6 ("firmware: qcom: scm: Convert SCM to platform driver") > Suggested-by: Stephen Boyd <sboyd@codeaurora.org> > Signed-off-by: Loys Ollivier <lollivier@baylibre.com> > --- > drivers/firmware/qcom_scm.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c > index af4c75217ea6..f6d7b7cffe0c 100644 > --- a/drivers/firmware/qcom_scm.c > +++ b/drivers/firmware/qcom_scm.c > @@ -632,17 +632,13 @@ static int __init qcom_scm_init(void) > > np = of_find_matching_node(fw_np, qcom_scm_dt_match); > > - if (!np) { > - of_node_put(fw_np); > + if (!np) > return -ENODEV; > - } > > of_node_put(np); > > ret = of_platform_populate(fw_np, qcom_scm_dt_match, NULL, NULL); > > - of_node_put(fw_np); > - > if (ret) > return ret; > >
On Fri 15 Dec 05:40 PST 2017, 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. > > These calls to of_node_put from the qcom_scm init are unnecessary as > of_find_matching_node and of_platform_populate are calling it > automatically. > > Remove the calls to of_node_put() on fw_np. > > Fixes: d0f6fa7ba2d6 ("firmware: qcom: scm: Convert SCM to platform driver") > Suggested-by: Stephen Boyd <sboyd@codeaurora.org> > Signed-off-by: Loys Ollivier <lollivier@baylibre.com> Hi Loys, Your patch is correct! We are however removing all this logic from qcom_scm_init() in v4.16. See: https://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git/commit/?h=for-next&id=3aa0582fdb824139630298880fbf78d4ac774d3c https://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git/commit/?h=for-next&id=3aa0582fdb824139630298880fbf78d4ac774d3c Regards, Bjorn
On Tue, Jan 16, 2018 at 08:45:49AM -0800, Bjorn Andersson wrote: > On Fri 15 Dec 05:40 PST 2017, 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. > > > > These calls to of_node_put from the qcom_scm init are unnecessary as > > of_find_matching_node and of_platform_populate are calling it > > automatically. > > > > Remove the calls to of_node_put() on fw_np. > > > > Fixes: d0f6fa7ba2d6 ("firmware: qcom: scm: Convert SCM to platform driver") > > Suggested-by: Stephen Boyd <sboyd@codeaurora.org> > > Signed-off-by: Loys Ollivier <lollivier@baylibre.com> > > Hi Loys, > > Your patch is correct! We are however removing all this logic from > qcom_scm_init() in v4.16. > > See: > https://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git/commit/?h=for-next&id=3aa0582fdb824139630298880fbf78d4ac774d3c > https://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git/commit/?h=for-next&id=3aa0582fdb824139630298880fbf78d4ac774d3c Yeah sorry for the delay in response. I pulled in the second part of a separate fix that removes all that code from the qcom_scm. It made more sense to do it automatically from the base code. Andy
diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c index af4c75217ea6..f6d7b7cffe0c 100644 --- a/drivers/firmware/qcom_scm.c +++ b/drivers/firmware/qcom_scm.c @@ -632,17 +632,13 @@ static int __init qcom_scm_init(void) np = of_find_matching_node(fw_np, qcom_scm_dt_match); - if (!np) { - of_node_put(fw_np); + if (!np) return -ENODEV; - } of_node_put(np); ret = of_platform_populate(fw_np, qcom_scm_dt_match, NULL, NULL); - of_node_put(fw_np); - if (ret) return ret;
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. These calls to of_node_put from the qcom_scm init are unnecessary as of_find_matching_node and of_platform_populate are calling it automatically. Remove the calls to of_node_put() on fw_np. Fixes: d0f6fa7ba2d6 ("firmware: qcom: scm: Convert SCM to platform driver") Suggested-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Loys Ollivier <lollivier@baylibre.com> --- drivers/firmware/qcom_scm.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)