Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

ASoC: SOF: amd: fix soundwire dependencies

The soundwire-amd driver has a bit of a layering violation requiring
the SOF driver to directly call into its exported symbols rather than
through an abstraction.

The SND_SOC_SOF_AMD_SOUNDWIRE Kconfig symbol tries to deal with the
dependency by selecting SOUNDWIRE_AMD in a complicated set of conditions,
but gets it wrong for a configuration involving SND_SOC_SOF_AMD_COMMON=y,
SND_SOC_SOF_AMD_ACP63=m, and SND_SOC_SOF_AMD_SOUNDWIRE_LINK_BASELINE=m
SOUNDWIRE_AMD=m, which results in a link failure:

ld.lld: error: undefined symbol: sdw_amd_get_slave_info
>>> referenced by acp-common.c
ld.lld: error: undefined symbol: amd_sdw_scan_controller
ld.lld: error: undefined symbol: sdw_amd_probe
ld.lld: error: undefined symbol: sdw_amd_exit
>>> referenced by acp.c
>>> sound/soc/sof/amd/acp.o:(amd_sof_acp_remove) in archive vmlinux.a

In essence, the SND_SOC_SOF_AMD_COMMON option cannot be built-in when
trying to link against a modular SOUNDWIRE_AMD driver.

Since CONFIG_SOUNDWIRE_AMD is a user-visible option, it really should
never be selected by another driver in the first place, so replace the
extra complexity with a normal Kconfig dependency in SND_SOC_SOF_AMD_SOUNDWIRE,
plus a top-level check that forbids any of the AMD SOF drivers from being
built-in with CONFIG_SOUNDWIRE_AMD=m.

In normal configs, they should all either be built-in or all loadable
modules anyway, so this simplification does not limit any real usecases.

Fixes: d948218424bf ("ASoC: SOF: amd: add code for invoking soundwire manager helper functions")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://msgid.link/r/20240219093900.644574-1-arnd@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Arnd Bergmann and committed by
Mark Brown
a3d543b9 bbf3e614

+3 -3
+3 -3
sound/soc/sof/amd/Kconfig
··· 6 6 7 7 config SND_SOC_SOF_AMD_TOPLEVEL 8 8 tristate "SOF support for AMD audio DSPs" 9 + depends on SOUNDWIRE_AMD || !SOUNDWIRE_AMD 9 10 depends on X86 || COMPILE_TEST 10 11 help 11 12 This adds support for Sound Open Firmware for AMD platforms. ··· 63 62 64 63 config SND_SOC_SOF_AMD_SOUNDWIRE_LINK_BASELINE 65 64 tristate 66 - select SOUNDWIRE_AMD if SND_SOC_SOF_AMD_SOUNDWIRE != n 67 65 select SND_AMD_SOUNDWIRE_ACPI if ACPI 68 66 69 67 config SND_SOC_SOF_AMD_SOUNDWIRE 70 68 tristate "SOF support for SoundWire based AMD platforms" 71 69 default SND_SOC_SOF_AMD_SOUNDWIRE_LINK_BASELINE 72 70 depends on SND_SOC_SOF_AMD_SOUNDWIRE_LINK_BASELINE 73 - depends on ACPI && SOUNDWIRE 74 - depends on !(SOUNDWIRE=m && SND_SOC_SOF_AMD_SOUNDWIRE_LINK_BASELINE=y) 71 + depends on ACPI 72 + depends on SOUNDWIRE_AMD 75 73 help 76 74 This adds support for SoundWire with Sound Open Firmware 77 75 for AMD platforms.