Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751089AbeAPRlR (ORCPT + 1 other); Tue, 16 Jan 2018 12:41:17 -0500 Received: from foss.arm.com ([217.140.101.70]:59078 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750869AbeAPRlP (ORCPT ); Tue, 16 Jan 2018 12:41:15 -0500 Date: Tue, 16 Jan 2018 17:41:05 +0000 From: Sudeep Holla To: Bjorn Andersson Cc: Loys Ollivier , linux-arm-msm@vger.kernel.org, Stephen Boyd , linux-kernel@vger.kernel.org, David Brown , Andy Gross , linux-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jerome Brunet , Sudeep Holla Subject: Re: [PATCH v3] firmware: qcom: scm: Fix incorrect of_node_put calls in scm_init Message-ID: <20180116174105.GA14781@e107155-lin> References: <1513345214-22835-1-git-send-email-lollivier@baylibre.com> <20180116164549.GE478@tuxbook> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180116164549.GE478@tuxbook> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: Hi Loys, 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 > > Signed-off-by: Loys Ollivier > > Hi Loys, > > Your patch is correct! We are however removing all this logic from > qcom_scm_init() in v4.16. > Unfortunately I seem to have carried the same issue to the new place. I am fine if Loys wants to post the patch for the same. Let me know if you want me to post, I have one handy(attached for the reference) Regards, Sudeep -->8 >From 7a563a6f793796339ba1b7a167a77f7353bdd58d Mon Sep 17 00:00:00 2001 From: Sudeep Holla Date: Tue, 16 Jan 2018 17:17:28 +0000 Subject: [PATCH] of: platform: fix OF node refcount leak We need to call of_node_put() for device nodes obtained with of_find_node_by_path(). Reported-by: Loys Ollivier Cc: Rob Herring Cc: Frank Rowand Signed-off-by: Sudeep Holla --- drivers/of/platform.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 6a01dab597c7..c00d81dfac0b 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -514,8 +514,10 @@ static int __init of_platform_default_populate_init(void) of_platform_device_create(node, NULL, NULL); node = of_find_node_by_path("/firmware"); - if (node) + if (node) { of_platform_populate(node, NULL, NULL, NULL); + of_node_put(node); + } /* Populate everything else. */ of_platform_default_populate(NULL, NULL, NULL); -- 2.7.4