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=-16.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 101D5C4742C for ; Thu, 5 Nov 2020 14:22:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B7E7B2071A for ; Thu, 5 Nov 2020 14:22:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731008AbgKEOV7 (ORCPT ); Thu, 5 Nov 2020 09:21:59 -0500 Received: from wp530.webpack.hosteurope.de ([80.237.130.52]:56322 "EHLO wp530.webpack.hosteurope.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728371AbgKEOV6 (ORCPT ); Thu, 5 Nov 2020 09:21:58 -0500 X-Greylist: delayed 1989 seconds by postgrey-1.27 at vger.kernel.org; Thu, 05 Nov 2020 09:21:57 EST Received: from ip4d145e30.dynamic.kabel-deutschland.de ([77.20.94.48] helo=[192.168.66.101]); authenticated by wp530.webpack.hosteurope.de running ExIM with esmtpsa (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) id 1kafcw-0004jl-Bi; Thu, 05 Nov 2020 14:48:34 +0100 To: Sasha Levin , linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Rander Wang , Pierre-Louis Bossart , Bard Liao , Guennadi Liakhovetski , Ranjani Sridharan , Mark Brown , sound-open-firmware@alsa-project.org, alsa-devel@alsa-project.org References: <20201026234905.1022767-1-sashal@kernel.org> <20201026234905.1022767-39-sashal@kernel.org> From: Thorsten Leemhuis Subject: Build error with 5.9.5 in sound/soc/sof/intel/hda-codec.c (was: [PATCH AUTOSEL 5.9 039/147] ASoC: SOF: fix a runtime pm issue in SOF when HDMI codec doesn't work) Message-ID: Date: Thu, 5 Nov 2020 14:48:33 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: <20201026234905.1022767-39-sashal@kernel.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-bounce-key: webpack.hosteurope.de;linux@leemhuis.info;1604586117;170aacbe; X-HE-SMSGID: 1kafcw-0004jl-Bi Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Lo! I just tried to compile 5.9.5 and ran into a build error with below patch. I only did a quick look (I have to leave the keyboard soon), but seems the patch quoted below that was added to 5.9.5 depends on 11ec0edc6408 (git.kernel.org/linus/11ec0edc6408) which wasn't backported. The build error can be found here: https://kojipkgs.fedoraproject.org//work/tasks/8246/54978246/build.log Relevant part: + make -s 'HOSTCFLAGS=-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -fcommon -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection' 'HOSTLDFLAGS=-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld ' ARCH=x86_64 'KCFLAGS= ' WITH_GCOV=0 -j48 modules 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[3]: *** Waiting for unfinished jobs.... make[2]: *** [scripts/Makefile.build:500: sound/soc/sof] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [scripts/Makefile.build:500: sound/soc] Error 2 make: *** [Makefile:1784: sound] Error 2 make: *** Waiting for unfinished jobs.... + exit 1 Looks like the compiler is right from a quick look at https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/sound/soc/sof/intel/hda-codec.c?h=linux-5.9.y&id=43836fdc9e318a11233cf19c5ee7ffb04e8e5d8f But as I said, I lack the time for a closer look. Ciao, Thorsten Am 27.10.20 um 00:47 schrieb Sasha Levin: > 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; >