Skip to content

Commit a3d543b

Browse files
arndbbroonie
authored andcommitted
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: d948218 ("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>
1 parent bbf3e61 commit a3d543b

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

sound/soc/sof/amd/Kconfig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
config SND_SOC_SOF_AMD_TOPLEVEL
88
tristate "SOF support for AMD audio DSPs"
9+
depends on SOUNDWIRE_AMD || !SOUNDWIRE_AMD
910
depends on X86 || COMPILE_TEST
1011
help
1112
This adds support for Sound Open Firmware for AMD platforms.
@@ -62,15 +63,14 @@ config SND_SOC_SOF_ACP_PROBES
6263

6364
config SND_SOC_SOF_AMD_SOUNDWIRE_LINK_BASELINE
6465
tristate
65-
select SOUNDWIRE_AMD if SND_SOC_SOF_AMD_SOUNDWIRE != n
6666
select SND_AMD_SOUNDWIRE_ACPI if ACPI
6767

6868
config SND_SOC_SOF_AMD_SOUNDWIRE
6969
tristate "SOF support for SoundWire based AMD platforms"
7070
default SND_SOC_SOF_AMD_SOUNDWIRE_LINK_BASELINE
7171
depends on SND_SOC_SOF_AMD_SOUNDWIRE_LINK_BASELINE
72-
depends on ACPI && SOUNDWIRE
73-
depends on !(SOUNDWIRE=m && SND_SOC_SOF_AMD_SOUNDWIRE_LINK_BASELINE=y)
72+
depends on ACPI
73+
depends on SOUNDWIRE_AMD
7474
help
7575
This adds support for SoundWire with Sound Open Firmware
7676
for AMD platforms.

0 commit comments

Comments
 (0)