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=-10.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 EE9C5C4741F for ; Thu, 5 Nov 2020 15:44:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A3E0420867 for ; Thu, 5 Nov 2020 15:44:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604591070; bh=jbZ5JSIyez+0E8oWD8sWvQCNVHpuJ9HD98Y+T9Fg2Aw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=Jt0wbJ3Y2DS0VTmokdjBM7m2spF/YvaexoYv2VtHYC/vitWNsgryUL6jGpxLqEjXx iI7zDcgKFuMR5y3gklXfpsGn9Af4a2rY79QfaT+N9rqvLzvxWq6jh5xpUeWNKq9JmF Geu2OTfYYNP5EfuKyEObJJzes0m56C6KhVOmwLUA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731299AbgKEPo3 (ORCPT ); Thu, 5 Nov 2020 10:44:29 -0500 Received: from mail.kernel.org ([198.145.29.99]:34366 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731259AbgKEPo3 (ORCPT ); Thu, 5 Nov 2020 10:44:29 -0500 Received: from localhost (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 47D7320782; Thu, 5 Nov 2020 15:44:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604591067; bh=jbZ5JSIyez+0E8oWD8sWvQCNVHpuJ9HD98Y+T9Fg2Aw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=c0dMUvvJgpdw+58yt+JO81K55V16ExHke69QwxXwByN4ckApzKAG2jXIjXi4aSIyt ruG5DeJ8Fcef/ZoZ19HRM76A9DhOftxDU32BNYCBvip4Z4ObF4f2p7Isq/HDinsl2C z5JMvCuqcu4LXkaaYz/FjKvLNfss+XT6JNM8SHts= Date: Thu, 5 Nov 2020 10:44:26 -0500 From: Sasha Levin To: Pierre-Louis Bossart Cc: Paul Bolle , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, stable@vger.kernel.org, Rander Wang , Bard Liao , Guennadi Liakhovetski , Ranjani Sridharan , Mark Brown Subject: Re: [PATCH 5.9 080/391] ASoC: SOF: fix a runtime pm issue in SOF when HDMI codec doesnt work Message-ID: <20201105154426.GI2092@sasha-vm> References: <20201103203348.153465465@linuxfoundation.org> <20201103203352.505472614@linuxfoundation.org> <64a618a3cc00de4a1c3887b57447906351db77b9.camel@tiscali.nl> <20201105143551.GH2092@sasha-vm> <1f0c6a62-5208-801d-d7c2-725ee8da19b2@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1f0c6a62-5208-801d-d7c2-725ee8da19b2@linux.intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Nov 05, 2020 at 08:47:57AM -0600, Pierre-Louis Bossart wrote: > > >On 11/5/20 8:35 AM, Sasha Levin wrote: >>On Thu, Nov 05, 2020 at 02:23:35PM +0100, Paul Bolle wrote: >>>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? >> >>It seems that setting CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y is very >>"difficult", it's not being set by allmodconfig nor is it easy to >>manually set it up. >> >>I'll revert the patch, but it would be nice to make sure it's easier to >>test this out too. > >this issue comes from out-of-order patches, give me a couple of hours >to look into this before reverting. thanks! Sure! Thanks for looking into this. -- Thanks, Sasha