Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752366AbdLFUGF (ORCPT ); Wed, 6 Dec 2017 15:06:05 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:33136 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752127AbdLFUGD (ORCPT ); Wed, 6 Dec 2017 15:06:03 -0500 DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 7B8EE60218 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=sboyd@codeaurora.org Date: Wed, 6 Dec 2017 12:06:01 -0800 From: Stephen Boyd To: Loys Ollivier Cc: Andy Gross , David Brown , linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jerome Brunet Subject: Re: [PATCH v2] firmware: qcom: scm: Fix incorrect of_node_put call in scm_init Message-ID: <20171206200601.GH4283@codeaurora.org> References: <1512555692-14439-1-git-send-email-lollivier@baylibre.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1512555692-14439-1-git-send-email-lollivier@baylibre.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1581 Lines: 55 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. ---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