ASoC: SOF: Intel: hda: Fix COMPILE_TEST build error
diff mbox series

Message ID 20190531142526.12712-1-yuehaibing@huawei.com
State Accepted
Commit ad169f9f0dbb531cd68db921b351ccafcf684ae4
Headers show
Series
  • ASoC: SOF: Intel: hda: Fix COMPILE_TEST build error
Related show

Commit Message

YueHaibing May 31, 2019, 2:25 p.m. UTC
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 <hulkci@huawei.com>
Fixes: e13ef82a9ab8 ("ASoC: SOF: add COMPILE_TEST for PCI options")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
 sound/soc/sof/intel/hda.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Takashi Iwai May 31, 2019, 2:34 p.m. UTC | #1
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 <hulkci@huawei.com>
> Fixes: e13ef82a9ab8 ("ASoC: SOF: add COMPILE_TEST for PCI options")
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> ---
>  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).


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);
Pierre-Louis Bossart May 31, 2019, 5:24 p.m. UTC | #2
On 5/31/19 9:25 AM, 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 <hulkci@huawei.com>
> Fixes: e13ef82a9ab8 ("ASoC: SOF: add COMPILE_TEST for PCI options")
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>

Gah, my bad. My cross-compilation script assumed sound was enabled with 
defconfig but it's not in all cases, thanks for the fix.

Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>


> ---
>   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;
>
Pierre-Louis Bossart May 31, 2019, 6:44 p.m. UTC | #3
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 <hulkci@huawei.com>
>> Fixes: e13ef82a9ab8 ("ASoC: SOF: add COMPILE_TEST for PCI options")
>> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
>> ---
>>   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
>

Patch
diff mbox series

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;