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=-13.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 0D210C433E0 for ; Fri, 22 Jan 2021 08:59:06 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 6988A236F9 for ; Fri, 22 Jan 2021 08:59:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6988A236F9 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 0D3051AC4; Fri, 22 Jan 2021 09:58:12 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0D3051AC4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1611305942; bh=l2wYXHITulu3IXwjN0rjMf5+CAdn1VPJFh2giGl2R7Q=; h=Date:From:To:Subject:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=XWsB5u5PpwjuGlKup1sw5iHSpoQRAROELe3uUdEd7tMVd/RrqomBrO0SC2lRLSSVy PD9mXi25WZNtTy1aLQyqfsdayMl0Nb3aGfbIhda1Ud0EvuU+TBZ4gSI8ua+scwmz0Y zRKole7BHswBj/Ff5Kp632X4aoJnsEvjgEZFcgk8= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 7E292F80164; Fri, 22 Jan 2021 09:58:11 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 29B44F8016E; Fri, 22 Jan 2021 09:58:09 +0100 (CET) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id C068EF8015B for ; Fri, 22 Jan 2021 09:58:02 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C068EF8015B X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 9B61CAB9F; Fri, 22 Jan 2021 08:58:01 +0000 (UTC) Date: Fri, 22 Jan 2021 09:58:01 +0100 Message-ID: From: Takashi Iwai To: Pierre-Louis Bossart Subject: Re: [PATCH 2/2] ASoC: SOF: SND_INTEL_DSP_CONFIG dependency In-Reply-To: <20210122005725.94163-3-pierre-louis.bossart@linux.intel.com> References: <20210122005725.94163-1-pierre-louis.bossart@linux.intel.com> <20210122005725.94163-3-pierre-louis.bossart@linux.intel.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Cc: Arnd Bergmann , alsa-devel@alsa-project.org, broonie@kernel.org, vkoul@kernel.org, Arnd Bergmann X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" On Fri, 22 Jan 2021 01:57:25 +0100, Pierre-Louis Bossart wrote: > > The sof-pci-dev driver fails to link when built into the kernel > and CONFIG_SND_INTEL_DSP_CONFIG is set to =m: > > arm-linux-gnueabi-ld: sound/soc/sof/sof-pci-dev.o: in function `sof_pci_probe': > sof-pci-dev.c:(.text+0x1c): undefined reference to `snd_intel_dsp_driver_probe' > > As a temporary fix, use IS_REACHABLE to prevent the problem from > happening. A more complete solution is to move this code to > Intel-specific parts, restructure the drivers and Kconfig as discussed > with Arnd Bergmann and Takashi Iwai. > > Fixes: 82d9d54a6c0e ("ALSA: hda: add Intel DSP configuration / probe code") > Reported-by: Arnd Bergmann > Signed-off-by: Pierre-Louis Bossart This might not be good enough. The code may still refer to the snd_intel_dsp_probe() symbol even if IS_REACHABLE() is false (although, practically seen, gcc should optimize it out). You need #if IS_REACHABLE() instead of the plain if. Then you don't need to change the indentation, and the patch will be eventually smaller, too :) thanks, Takashi > --- > sound/soc/sof/sof-acpi-dev.c | 11 ++++++----- > sound/soc/sof/sof-pci-dev.c | 10 ++++++---- > 2 files changed, 12 insertions(+), 9 deletions(-) > > diff --git a/sound/soc/sof/sof-acpi-dev.c b/sound/soc/sof/sof-acpi-dev.c > index 2a369c2c6551..cc2e257087e4 100644 > --- a/sound/soc/sof/sof-acpi-dev.c > +++ b/sound/soc/sof/sof-acpi-dev.c > @@ -131,12 +131,13 @@ static int sof_acpi_probe(struct platform_device *pdev) > if (!id) > return -ENODEV; > > - ret = snd_intel_acpi_dsp_driver_probe(dev, id->id); > - if (ret != SND_INTEL_DSP_DRIVER_ANY && ret != SND_INTEL_DSP_DRIVER_SOF) { > - dev_dbg(dev, "SOF ACPI driver not selected, aborting probe\n"); > - return -ENODEV; > + if (IS_REACHABLE(CONFIG_SND_INTEL_DSP_CONFIG)) { > + ret = snd_intel_acpi_dsp_driver_probe(dev, id->id); > + if (ret != SND_INTEL_DSP_DRIVER_ANY && ret != SND_INTEL_DSP_DRIVER_SOF) { > + dev_dbg(dev, "SOF ACPI driver not selected, aborting probe\n"); > + return -ENODEV; > + } > } > - > dev_dbg(dev, "ACPI DSP detected"); > > sof_pdata = devm_kzalloc(dev, sizeof(*sof_pdata), GFP_KERNEL); > diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c > index 7757463bd81a..388772f9c4d2 100644 > --- a/sound/soc/sof/sof-pci-dev.c > +++ b/sound/soc/sof/sof-pci-dev.c > @@ -346,10 +346,12 @@ static int sof_pci_probe(struct pci_dev *pci, > const struct snd_sof_dsp_ops *ops; > int ret; > > - ret = snd_intel_dsp_driver_probe(pci); > - if (ret != SND_INTEL_DSP_DRIVER_ANY && ret != SND_INTEL_DSP_DRIVER_SOF) { > - dev_dbg(&pci->dev, "SOF PCI driver not selected, aborting probe\n"); > - return -ENODEV; > + if (IS_REACHABLE(CONFIG_SND_INTEL_DSP_CONFIG)) { > + ret = snd_intel_dsp_driver_probe(pci); > + if (ret != SND_INTEL_DSP_DRIVER_ANY && ret != SND_INTEL_DSP_DRIVER_SOF) { > + dev_dbg(&pci->dev, "SOF PCI driver not selected, aborting probe\n"); > + return -ENODEV; > + } > } > dev_dbg(&pci->dev, "PCI DSP detected"); > > -- > 2.25.1 >