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=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 A7D4BC04AB6 for ; Fri, 31 May 2019 18:44:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 88C5B26E11 for ; Fri, 31 May 2019 18:44:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727179AbfEaSol (ORCPT ); Fri, 31 May 2019 14:44:41 -0400 Received: from mga04.intel.com ([192.55.52.120]:36381 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726967AbfEaSol (ORCPT ); Fri, 31 May 2019 14:44:41 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 May 2019 11:44:40 -0700 X-ExtLoop1: 1 Received: from gpanchal-mobl.amr.corp.intel.com (HELO [10.254.189.1]) ([10.254.189.1]) by fmsmga008.fm.intel.com with ESMTP; 31 May 2019 11:44:40 -0700 Subject: Re: [alsa-devel] [PATCH] ASoC: SOF: Intel: hda: Fix COMPILE_TEST build error To: Takashi Iwai , YueHaibing Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, lgirdwood@gmail.com, broonie@kernel.org, yingjiang.zhu@linux.intel.com References: <20190531142526.12712-1-yuehaibing@huawei.com> From: Pierre-Louis Bossart Message-ID: Date: Fri, 31 May 2019 13:44:40 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 5/31/19 9:34 AM, Takashi Iwai wrote: > On Fri, 31 May 2019 16:25:26 +0200, > YueHaibing wrote: >> >> while building without PCI: >> >> sound/soc/sof/intel/hda.o: In function `hda_dsp_probe': >> hda.c:(.text+0x79c): undefined reference to `pci_ioremap_bar' >> hda.c:(.text+0x79c): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `pci_ioremap_bar' >> hda.c:(.text+0x7c4): undefined reference to `pci_ioremap_bar' >> hda.c:(.text+0x7c4): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `pci_ioremap_bar' >> >> Reported-by: Hulk Robot >> Fixes: e13ef82a9ab8 ("ASoC: SOF: add COMPILE_TEST for PCI options") >> Signed-off-by: YueHaibing >> --- >> sound/soc/sof/intel/hda.c | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c >> index 68db2ac..c1703c4 100644 >> --- a/sound/soc/sof/intel/hda.c >> +++ b/sound/soc/sof/intel/hda.c >> @@ -231,7 +231,9 @@ static int hda_init(struct snd_sof_dev *sdev) >> >> /* initialise hdac bus */ >> bus->addr = pci_resource_start(pci, 0); >> +#if IS_ENABLED(CONFIG_PCI) >> bus->remap_addr = pci_ioremap_bar(pci, 0); >> +#endif >> if (!bus->remap_addr) { >> dev_err(bus->dev, "error: ioremap error\n"); >> return -ENXIO; >> @@ -458,7 +460,9 @@ int hda_dsp_probe(struct snd_sof_dev *sdev) >> goto hdac_bus_unmap; >> >> /* DSP base */ >> +#if IS_ENABLED(CONFIG_PCI) >> sdev->bar[HDA_DSP_BAR] = pci_ioremap_bar(pci, HDA_DSP_BAR); >> +#endif >> if (!sdev->bar[HDA_DSP_BAR]) { >> dev_err(sdev->dev, "error: ioremap error\n"); >> ret = -ENXIO; > > IMO, this should be better addressed by fixing in linux/pci.h > instead, something like below (totally untested). Indeed. I wanted to first enable COMPILE_TEST for SOF and do a PCI cleanup in a second stage. It might take a while to synchronize those changes and check if there are additional functions needed by others. > > > thanks, > > Takashi > > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -2005,8 +2005,19 @@ static inline void pci_mmcfg_late_init(void) { } > > int pci_ext_cfg_avail(void); > > +#ifdef CONFIG_PCI > void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar); > void __iomem *pci_ioremap_wc_bar(struct pci_dev *pdev, int bar); > +#else > +static inline void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar) > +{ > + return NULL; > +} > +static inline void __iomem *pci_ioremap_wc_bar(struct pci_dev *pdev, int bar) > +{ > + return NULL; > +} > +#endif > > #ifdef CONFIG_PCI_IOV > int pci_iov_virtfn_bus(struct pci_dev *dev, int id); > _______________________________________________ > Alsa-devel mailing list > Alsa-devel@alsa-project.org > https://mailman.alsa-project.org/mailman/listinfo/alsa-devel >