Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752433AbdLLPfJ (ORCPT ); Tue, 12 Dec 2017 10:35:09 -0500 Received: from mail-wr0-f173.google.com ([209.85.128.173]:39339 "EHLO mail-wr0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752066AbdLLPfG (ORCPT ); Tue, 12 Dec 2017 10:35:06 -0500 X-Google-Smtp-Source: ACJfBousjLmFumaf5HslLPNz2JsUIsOwDYHNx2F4fNfIvWkDDPKBFwrRwxL+AdShrRrkvkU6XVavNA== Subject: Re: [PATCH v2] firmware: qcom: scm: Fix incorrect of_node_put call in scm_init To: Stephen Boyd Cc: Jerome Forissier , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, David Brown , Andy Gross , linux-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jerome Brunet , Jens Wiklander References: <1512555692-14439-1-git-send-email-lollivier@baylibre.com> <20171206200601.GH4283@codeaurora.org> <40113581-4b8c-defe-ba90-0aabc30a1b6d@linaro.org> <20171208170449.GD4283@codeaurora.org> From: Loys Ollivier Message-ID: Date: Tue, 12 Dec 2017 16:35:03 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <20171208170449.GD4283@codeaurora.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1955 Lines: 49 On 08/12/2017 18:04, Stephen Boyd wrote: > On 12/07, Loys Ollivier wrote: >> >> >> On 07/12/2017 09:42, Jerome Forissier wrote: >>> >>> >>> On 12/06/2017 09:06 PM, Stephen Boyd wrote: >>>> 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 >>>>> --- >>>> >>>> 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. >>> >>> https://lkml.org/lkml/2017/11/29/230 >>> >> Well, the patch I sent is a fix for a specific bug I am encountering. >> I tested the patch and it solves my problem. Stephen, your changes looks >> good but it's a change in the driver's behavior. Maybe it could be >> another patch ? > > Sure. But there's another of_node_put(fw_np) in this function, so > why isn't that also removed? Assuming of_find_matching_node() is > calling of_node_put() on what's passed in, then the node is going > to get put twice in the "working" case. > > Andy? > Agreed, I had a look and this second call to of_node_put(fw_np) seem to be unnecessary as well. Unfortunately I can't test your suggestion as I am using another platform arch. I am just testing that this driver does not break my arch. I can submit a v3 removing this of_node_put as well if you want.