Re: ld.lld: error: undefined symbol: iosf_mbi_available

[Pierre-Louis Bossart]

On 7/18/24 09:26, Takashi Iwai wrote:
> On Wed, 17 Jul 2024 22:28:06 +0200,
> Nathan Chancellor wrote:
>>
>> On Wed, Jul 17, 2024 at 01:43:35PM +0200, Pierre-Louis Bossart wrote:
>>>
>>>
>>> On 7/16/24 01:07, kernel test robot wrote:
>>>> tree:   https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master
>>>> head:   3e7819886281e077e82006fe4804b0d6b0f5643b
>>>> commit: 8d4ba1be3d2257606e04aff412829d8972670750 ASoC: SOF: pci: split PCI into different drivers
>>>> date:   3 years, 4 months ago
>>>
>>> This doesn't seem to be a problem on the latest code? was it intentional
>>> to report a problem on such an old commit?
>>
>> It's still reproducible at commit 8b0f0bb27c32 ("Merge tag
>> 'fs_for_v6.11-rc1' of
>> git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs") for me,
>> using either LLVM or GCC with the configuration linked below:

I can't compile this branch - errors in unrelated parts of the code, but
indeed there's a problem when IOSF_MBI=y and Baytrail is not selected.

>>   ld.lld: error: undefined symbol: iosf_mbi_available
>>   >>> referenced by atom.c
>>   >>>               sound/soc/sof/intel/atom.o:(atom_machine_select) in archive vmlinux.a
>>
>>   ld.lld: error: undefined symbol: iosf_mbi_read
>>   >>> referenced by atom.c
>>   >>>               sound/soc/sof/intel/atom.o:(atom_machine_select) in archive vmlinux.a
>>
>>   .../gcc/14.1.0/bin/i386-linux-ld: sound/soc/sof/intel/atom.o: in function `atom_machine_select':
>>   atom.c:(.text+0x1b9): undefined reference to `iosf_mbi_available'
>>   .../gcc/14.1.0/bin/i386-linux-ld: atom.c:(.text+0x1e3): undefined reference to `iosf_mbi_read'
> 
> Yours looks different from the original report, and indeed this must
> be a missing fix.
> 
> Does the following change cover it?
> 
> 
> thanks,
> 
> Takashi
> 
> --- a/sound/soc/sof/intel/Kconfig
> +++ b/sound/soc/sof/intel/Kconfig
> @@ -19,6 +19,7 @@ config SND_SOC_SOF_INTEL_ATOM_HIFI_EP
>  	tristate
>  	select SND_SOC_SOF_INTEL_COMMON
>  	select SND_SOC_SOF_INTEL_HIFI_EP_IPC
> +	select IOSF_MBI if X86 && PCI
>  	help
>  	  This option is not user-selectable but automagically handled by
>  	  'select' statements at a higher level.
> @@ -44,7 +45,6 @@ config SND_SOC_SOF_BAYTRAIL
>  	select SND_SOC_SOF_INTEL_COMMON
>  	select SND_SOC_SOF_INTEL_ATOM_HIFI_EP
>  	select SND_SOC_SOF_ACPI_DEV
> -	select IOSF_MBI if X86 && PCI
>  	help
>  	  This adds support for Sound Open Firmware for Intel(R) platforms
>  	  using the Baytrail, Braswell or Cherrytrail processors.

I don't think it's the 'right' fix Takashi.

The problem is that we end-up using the iosf_mbi_read() routine by
including the soc-intel-quirks.h header file blindly for all X66
platforms - even when Baytrail is not used.

Adding IOSF support for Tangiger doesn't seem right to me, it's not a
real dependency.

We can be more restrictive and only use the helper for Baytrail, and use
a fallback if Baytrail is not used.

diff --git a/sound/soc/intel/common/soc-intel-quirks.h
b/sound/soc/intel/common/soc-intel-quirks.h
index de4e550c5b34..ae67853f7e2e 100644
--- a/sound/soc/intel/common/soc-intel-quirks.h
+++ b/sound/soc/intel/common/soc-intel-quirks.h
@@ -11,7 +11,9 @@

 #include <linux/platform_data/x86/soc.h>

-#if IS_ENABLED(CONFIG_X86)
+#if IS_ENABLED(CONFIG_X86) && \
+       (IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL) || \
+        IS_ENABLED(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI))

 #include <linux/dmi.h>
 #include <asm/iosf_mbi.h>

also at https://github.com/thesofproject/linux/pull/5114