| Message ID | 20230202102247.806749-1-arnd@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c5a61db9bf897494fb0657eeb24dfdcb1aab1fc4 |
| Headers | show |
| Series | ASoC: SOF: fix intel-soundwire link failure | expand |
On 2/2/23 04:22, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > My randconfig build setup ran into a rare build failure with > > CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE=y > CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m > CONFIG_SOUNDWIRE=y > CONFIG_SOUNDWIRE_INTEL=m > CONFIG_SND_SOC_SOF_HDA=y > CONFIG_SND_SOC_SOF_INTEL_TGL=y > > x86_64-linux-ld: sound/soc/sof/intel/hda.o: in function `hda_init_caps': > hda.c:(.text+0x691): undefined reference to `sdw_intel_cnl_hw_ops' > x86_64-linux-ld: hda.c:(.text+0x6f2): undefined reference to `sdw_intel_probe' > x86_64-linux-ld: sound/soc/sof/intel/hda.o: in function `hda_sdw_startup': > hda.c:(.text+0x1c40): undefined reference to `sdw_intel_startup' > x86_64-linux-ld: sound/soc/sof/intel/hda.o: in function `hda_sdw_process_wakeen': > hda.c:(.text+0x1cb6): undefined reference to `sdw_intel_process_wakeen_event' > x86_64-linux-ld: sound/soc/sof/intel/hda.o: in function `hda_dsp_interrupt_thread': > hda.c:(.text+0x1d67): undefined reference to `sdw_intel_thread' > x86_64-linux-ld: sound/soc/sof/intel/hda.o: in function `hda_dsp_remove': > hda.c:(.text+0x2655): undefined reference to `sdw_intel_exit' > > My best understanding is that the definition of > SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE was intended to avoid this > problem, but got it wrong for the SND_SOC_SOF_INTEL_SOUNDWIRE=m case, > where the 'select' is meant to set SOUNDWIRE_INTEL to the value of > SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE rather than the intersection of > SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE and SND_SOC_SOF_INTEL_SOUNDWIRE. > > Change the condition to check for SND_SOC_SOF_INTEL_SOUNDWIRE to be a > boolean rather than a tristate expression in order to propagate this > as intended. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > I could not figure out if this is a recent regression or if the > problem has existed for a long time and is just really hard to > trigger. I first saw it on linux-next-20230201. > --- > sound/soc/sof/intel/Kconfig | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig > index 36a0e2bf30ff..715ba8a7f2f8 100644 > --- a/sound/soc/sof/intel/Kconfig > +++ b/sound/soc/sof/intel/Kconfig > @@ -322,8 +322,8 @@ config SND_SOC_SOF_HDA_PROBES > > config SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE > tristate > - select SOUNDWIRE_INTEL if SND_SOC_SOF_INTEL_SOUNDWIRE > - select SND_INTEL_SOUNDWIRE_ACPI if SND_SOC_SOF_INTEL_SOUNDWIRE > + select SOUNDWIRE_INTEL if SND_SOC_SOF_INTEL_SOUNDWIRE != n > + select SND_INTEL_SOUNDWIRE_ACPI if SND_SOC_SOF_INTEL_SOUNDWIRE != n I think the problem has been around for a very long time. I can't figure out what we tried to fix and why the Kconfig is written this way. We already have this: config SND_SOC_SOF_INTEL_SOUNDWIRE tristate "SOF support for SoundWire" default SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE depends on SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE depends on ACPI && SOUNDWIRE depends on !(SOUNDWIRE=m && SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE=y) We're doing something wrong here if both of the Kconfigs make references to the value of the other. The only requirement here is that we want to be able to build if SoundWire is not enabled. We have a similar requirement for HDaudio, but for some reason it's only a boolean for HDaudio and a tristate for SoundWire. I have no idea if it was intentional or not, it's been too much time already since we looked at this....
On Thu, 02 Feb 2023 11:22:30 +0100, Arnd Bergmann wrote: > My randconfig build setup ran into a rare build failure with > > CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE=y > CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m > CONFIG_SOUNDWIRE=y > CONFIG_SOUNDWIRE_INTEL=m > CONFIG_SND_SOC_SOF_HDA=y > CONFIG_SND_SOC_SOF_INTEL_TGL=y > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: SOF: fix intel-soundwire link failure commit: c5a61db9bf897494fb0657eeb24dfdcb1aab1fc4 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig index 36a0e2bf30ff..715ba8a7f2f8 100644 --- a/sound/soc/sof/intel/Kconfig +++ b/sound/soc/sof/intel/Kconfig @@ -322,8 +322,8 @@ config SND_SOC_SOF_HDA_PROBES config SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE tristate - select SOUNDWIRE_INTEL if SND_SOC_SOF_INTEL_SOUNDWIRE - select SND_INTEL_SOUNDWIRE_ACPI if SND_SOC_SOF_INTEL_SOUNDWIRE + select SOUNDWIRE_INTEL if SND_SOC_SOF_INTEL_SOUNDWIRE != n + select SND_INTEL_SOUNDWIRE_ACPI if SND_SOC_SOF_INTEL_SOUNDWIRE != n config SND_SOC_SOF_INTEL_SOUNDWIRE tristate "SOF support for SoundWire"