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 X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 42178C388F9 for ; Thu, 5 Nov 2020 13:25:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D68162151B for ; Thu, 5 Nov 2020 13:25:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730721AbgKENZU (ORCPT ); Thu, 5 Nov 2020 08:25:20 -0500 Received: from lb1-smtp-cloud8.xs4all.net ([194.109.24.21]:53713 "EHLO lb1-smtp-cloud8.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730200AbgKENXl (ORCPT ); Thu, 5 Nov 2020 08:23:41 -0500 Received: from cust-43cce789 ([IPv6:fc0c:c1a4:736c:9c1a:15d2:fd0f:664c:4844]) by smtp-cloud8.xs4all.net with ESMTPSA id afElkDBJjNanzafEokoTFN; Thu, 05 Nov 2020 14:23:38 +0100 Message-ID: <64a618a3cc00de4a1c3887b57447906351db77b9.camel@tiscali.nl> Subject: Re: [PATCH 5.9 080/391] ASoC: SOF: fix a runtime pm issue in SOF when HDMI codec doesnt work From: Paul Bolle To: Greg Kroah-Hartman , linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org, Rander Wang , Pierre-Louis Bossart , Bard Liao , Guennadi Liakhovetski , Ranjani Sridharan , Mark Brown , Sasha Levin Date: Thu, 05 Nov 2020 14:23:35 +0100 In-Reply-To: <20201103203352.505472614@linuxfoundation.org> References: <20201103203348.153465465@linuxfoundation.org> <20201103203352.505472614@linuxfoundation.org> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.36.5 (3.36.5-1.fc32) MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-CMAE-Envelope: MS4xfCGEJ0SEHC8hxLtU1zJbR5j6wVkwuwuqrCZxBwaDPHIl5/5hiM0Hs1zJkEgRYeuuQUvtonj0v+55Rg3ZrkVMxczgzKLJ6eqF98LZzAqIsaxd6cwCple1 n0YtDe2EndKhclFww/5bBSaoMKNycEaRWNC/Fq+kvxDyGPmwvN7nRWXm7TeejQC/VsPWDQX9bTy4O9Q68c1JunilrubABMTvxRjWZDyE9DSLdTdcKHeF+z2b VpCD4PlSHISgPlvxzqeK3xD7e/zFHfxeZTne0F3pocj84q8jX63IMDdV3wLm3fBED5oBnDM68XI1cdoUls5o1wZMIYwOJNCWIl/WTyss5mo0gL6moVFToYzK rlH84gpdzXkLNbjJW/77LMq8asD/PGywIN89l5Sr69kMZNzmTQWNEADFwpbV8RlJ0J7WrIEu0M7YtzTcGf6xpTe+lBRP2AHYLudo6u1mfuSDNHGLBpRuwcDM wy4Br9MG4Sfw51lRu0SoHwwMmOUIp0aRJ8RRltP3VXJgoJubD9+UnZPfEiH2n7dACkafR3lyX5ufN7Sjq0Rt9kUQRzXRqs6xvwovhg== Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Greg Kroah-Hartman schreef op di 03-11-2020 om 21:32 [+0100]: > From: Rander Wang > > [ Upstream commit 6c63c954e1c52f1262f986f36d95f557c6f8fa94 ] > > When hda_codec_probe() doesn't initialize audio component, we disable > the codec and keep going. However,the resources are not released. The > child_count of SOF device is increased in snd_hdac_ext_bus_device_init > but is not decrease in error case, so SOF can't get suspended. > > snd_hdac_ext_bus_device_exit will be invoked in HDA framework if it > gets a error. Now copy this behavior to release resources and decrease > SOF device child_count to release SOF device. > > Signed-off-by: Rander Wang > Reviewed-by: Pierre-Louis Bossart > Reviewed-by: Bard Liao > Reviewed-by: Guennadi Liakhovetski > Signed-off-by: Ranjani Sridharan > Link: https://lore.kernel.org/r/20200825235040.1586478-3-ranjani.sridharan@linux.intel.com > Signed-off-by: Mark Brown > Signed-off-by: Sasha Levin > --- > sound/soc/sof/intel/hda-codec.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/sound/soc/sof/intel/hda-codec.c b/sound/soc/sof/intel/hda-codec.c > index 2c5c451fa19d7..c475955c6eeba 100644 > --- a/sound/soc/sof/intel/hda-codec.c > +++ b/sound/soc/sof/intel/hda-codec.c > @@ -151,7 +151,7 @@ static int hda_codec_probe(struct snd_sof_dev *sdev, int address, > if (!hdev->bus->audio_component) { > dev_dbg(sdev->dev, > "iDisp hw present but no driver\n"); > - return -ENOENT; > + goto error; > } > hda_priv->need_display_power = true; > } > @@ -174,7 +174,7 @@ static int hda_codec_probe(struct snd_sof_dev *sdev, int address, > * other return codes without modification > */ > if (ret == 0) > - ret = -ENOENT; > + goto error; > } > > return ret; My local build of v5.9.5 broke on this patch. sound/soc/sof/intel/hda-codec.c: In function 'hda_codec_probe': sound/soc/sof/intel/hda-codec.c:177:4: error: label 'error' used but not defined 177 | goto error; | ^~~~ make[4]: *** [scripts/Makefile.build:283: sound/soc/sof/intel/hda-codec.o] Error 1 make[3]: *** [scripts/Makefile.build:500: sound/soc/sof/intel] Error 2 make[2]: *** [scripts/Makefile.build:500: sound/soc/sof] Error 2 make[1]: *** [scripts/Makefile.build:500: sound/soc] Error 2 make: *** [Makefile:1778: sound] Error 2 There's indeed no error label in v5.9.5. (There is one in v5.10-rc2, I just checked.) Is no-one else running into this? Thanks, Paul Bolle