From patchwork Wed Dec 6 20:06:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 10097071 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 82F3460210 for ; Wed, 6 Dec 2017 20:06:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 72D2729F23 for ; Wed, 6 Dec 2017 20:06:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 677D029FE8; Wed, 6 Dec 2017 20:06:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EBEE029F23 for ; Wed, 6 Dec 2017 20:06:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=7dWz4NUCmtva4SCDPyojsGeed1E8Aqq8SRenRROPRuw=; b=G8UwXFRgfF0yY6 wbz0fevLFx2FXlLxx1Fl/OyIgA0XUzglOG8a1acMiedDbjBxB88ZfNaSbLQ7zHvc1y1/bZn/OPscM RaVPVBPvJDKv8jbKiqO9qyRke4grNgQkGhDSJA5QY4P7rBPVzg8gDopO38XgYW3xqC1q2z6PKCk5E 2LZJtQ9SuwzbzgfInNICrEIJOeaLI0Hs+oYvrV436O4lKdosz91JP5TEzIolxLgnEOndNZ6ZtOZn6 3sIJ6rTxHma88kiMs8iJSG0PHrhhDeQKPQGxNPCQpvZm9EU69J1ZDKuZkWtYuOfzYpAsZHWxBUSqz 3TUpn2XN+H4/6jPn1qXw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eMfxX-0000AC-GH; Wed, 06 Dec 2017 20:06:23 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eMfxT-0008QY-AZ for linux-arm-kernel@lists.infradead.org; Wed, 06 Dec 2017 20:06:21 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 250796022C; Wed, 6 Dec 2017 20:06:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1512590763; bh=6IomGf82nFsuSfFyoEijZgEG5LChvLC6azewNxCrcX0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=IaGFy/1ijiUIz6l0adgbQoCILzkZyIFUBNPk7qyZCuNbD3EqaihbDVH9GiwuAMx// LkdZ96GmGCSBs9lcvcjujlTwfjZRtfOEAjC9edl3pggN2/OcC32l2k1wUDLOGrSvqx 2Kr+ridvfmHqKnnAwndV8hUXz/bbeaCZfRY/HMCY= Received: from localhost (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: sboyd@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 7B8EE60218; Wed, 6 Dec 2017 20:06:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1512590762; bh=6IomGf82nFsuSfFyoEijZgEG5LChvLC6azewNxCrcX0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=USD8bHAA24dY9FARbOKt7Wv3EQzb/V6vgQC30yFdeuit8O9TnudGZtiS2FN5b89ka 37FuFyz0U1aknJMub4W8bjChBpAT4zSIc+WrJfXHu8AsXiubvcgN+74wdXWYD9Sq1N 4G1h+Jxbxr2fLEZiv8yhhXEjlhHzJS/FiTVf/yl0= 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 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-Disposition: inline In-Reply-To: <1512555692-14439-1-git-send-email-lollivier@baylibre.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171206_120619_424387_57A5FD3E X-CRM114-Status: GOOD ( 16.67 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 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 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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;