From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A0FA1C001DC for ; Thu, 27 Jul 2023 10:19:52 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id CC116852; Thu, 27 Jul 2023 12:19:00 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz CC116852 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1690453190; bh=Uc0Q/odHwvdufVEV8LDpUE4QUvJDILczgRcJhpTSLpo=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=eHpcQQvx7+/Scf6OHXSpcarfUXdQeTe+1+fgQeDZ+PlEfzr57Y7FG/EZFftV63EWR lABdRvDYwpUxoyopIxRuBLwbB2BttlP4sBblHRpkHgbWEKqGTntzlGNwhz43xVE5BA ePQ0gqIHJEHYVIvEWm2+X+zrGx0l/5iRsHmadp5A= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 4D65FF80520; Thu, 27 Jul 2023 12:18:50 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id E7457F80535; Thu, 27 Jul 2023 12:18:49 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 9D005F80548; Thu, 27 Jul 2023 12:18:46 +0200 (CEST) Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 43A22F80535 for ; Thu, 27 Jul 2023 12:18:40 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 43A22F80535 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=bootlin.com header.i=@bootlin.com header.a=rsa-sha256 header.s=gm1 header.b=LGBKo4DD Received: by mail.gandi.net (Postfix) with ESMTPSA id CC9DF240009; Thu, 27 Jul 2023 10:18:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1690453120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LVq3Vc2yDzDKpJTcAR2jA40+zkxL5sFVNMLQL+uihyc=; b=LGBKo4DDE6TlLK+r5fTDq47Or6GsDCPWtkuzd8m01djTnntuS1whrhZ2QA3u0laO3aepgx rqvLj+Dz26tpJXrON2TF+vdJS7VEZAS6u+braSD1zItS8ACXGXCV/HJOaMNzrJensddzRn vLkeJfbV+0di+euOuaVZ9CDsqgncSuKL4pqV/LzInvwOK9eMrHE2IPGs6TpoFGMtc3Dz9B NAq27nwXNI7xm0DLU67stWHWnZaGSrDO6Ja3XiR87FCrQfmbtK1KH4XzlWa31FCWcSeyP1 ZOqjOi2BM6kZns8uVQmjpT0xj014mQnM1O+zGWPTUXUApK/CTHrOu0cc7swVyA== Date: Thu, 27 Jul 2023 12:18:34 +0200 From: Herve Codina To: Lee Jones Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrew Lunn , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Linus Walleij , Qiang Zhao , Li Yang , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Shengjiu Wang , Xiubo Li , Fabio Estevam , Nicolin Chen , Christophe Leroy , Randy Dunlap , netdev@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, alsa-devel@alsa-project.org, Thomas Petazzoni Subject: Re: [PATCH v2 22/28] mfd: core: Ensure disabled devices are skiped without aborting Message-ID: <20230727121834.475541d0@bootlin.com> In-Reply-To: <20230727092209.GA8175@google.com> References: <20230726150225.483464-1-herve.codina@bootlin.com> <20230726150225.483464-23-herve.codina@bootlin.com> <20230727092209.GA8175@google.com> Organization: Bootlin X-Mailer: Claws Mail 4.1.1 (GTK 3.24.38; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-GND-Sasl: herve.codina@bootlin.com Message-ID-Hash: EOJAOCRHRRCUUJ4KO5ZX7YQZQK3FU3OF X-Message-ID-Hash: EOJAOCRHRRCUUJ4KO5ZX7YQZQK3FU3OF X-MailFrom: herve.codina@bootlin.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Hi Lee, On Thu, 27 Jul 2023 10:22:09 +0100 Lee Jones wrote: > On Wed, 26 Jul 2023, Herve Codina wrote: > > > The loop searching for a matching device based on its compatible > > string is aborted when a matching disabled device is found. > > This abort avoid to add devices as soon as one disabled device > > is found. > > > > Continue searching for an other device instead of aborting on the > > first disabled one fixes the issue. > > > > Fixes: 22380b65dc70 ("mfd: mfd-core: Ensure disabled devices are ignored without error") > > Signed-off-by: Herve Codina > > --- > > drivers/mfd/mfd-core.c | 18 +++++++++++++----- > > 1 file changed, 13 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c > > index 0ed7c0d7784e..bcc26e64639a 100644 > > --- a/drivers/mfd/mfd-core.c > > +++ b/drivers/mfd/mfd-core.c > > @@ -146,6 +146,7 @@ static int mfd_add_device(struct device *parent, int id, > > struct platform_device *pdev; > > struct device_node *np = NULL; > > struct mfd_of_node_entry *of_entry, *tmp; > > + bool disabled; > > int ret = -ENOMEM; > > int platform_id; > > int r; > > @@ -181,13 +182,13 @@ static int mfd_add_device(struct device *parent, int id, > > goto fail_res; > > > > if (IS_ENABLED(CONFIG_OF) && parent->of_node && cell->of_compatible) { > > + disabled = false; > > This does not appear to reside in a loop. > > Why not set it to false on declaration? Indeed, I will change in the next iteration and set the value to false at the declaration. > > > for_each_child_of_node(parent->of_node, np) { > > if (of_device_is_compatible(np, cell->of_compatible)) { > > - /* Ignore 'disabled' devices error free */ > > + /* Skip 'disabled' devices */ > > if (!of_device_is_available(np)) { > > - of_node_put(np); > > Doesn't this result in a resource leak? No because we change from 'goto fail_alias' to 'continue' and so we don't exit from the for_each_child_of_node(). The for_each_child_of_node() calls of_get_next_child() and, in turn, calls of_node_put(). Regards, Hervé > > > - ret = 0; > > - goto fail_alias; > > + disabled = true; > > + continue; > > } > > > > ret = mfd_match_of_node_to_dev(pdev, np, cell); > > @@ -197,10 +198,17 @@ static int mfd_add_device(struct device *parent, int id, > > if (ret) > > goto fail_alias; > > > > - break; > > + goto match; > > } > > } > > > > + if (disabled) { > > + /* Ignore 'disabled' devices error free */ > > + ret = 0; > > + goto fail_alias; > > + } > > + > > +match: > > if (!pdev->dev.of_node) > > pr_warn("%s: Failed to locate of_node [id: %d]\n", > > cell->name, platform_id); > > -- > > 2.41.0 > > >