Skip to contentSkip to conversation

soundwire: intel_ace2x: fix SND_SOC_SOF_HDA_MLINK dependency

PATCH Applied Arnd Bergmann 2 participants 2 messages Jun 16, 2023 – Jun 21, 2023 SoundWire

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 soundwire: intel_ace2x: fix SND_SOC_SOF_HDA_MLINK dependency

From: Arnd Bergmann <[email protected]>

The ace2x driver can be build with or without mlink support, but when SND_SOC_SOF_HDA_MLINK is set to =m and soundwire is built-in, it fails with a link error:

ld.lld: error: undefined symbol: hdac_bus_eml_sdw_wait_syncpu_unlocked

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

referenced by intel_ace2x.c
drivers/soundwire/intel_ace2x.o:(intel_link_power_up) in archive vmlinux.a

ld.lld: error: undefined symbol: hdac_bus_eml_sdw_sync_arm_unlocked

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

referenced by intel_ace2x.c
drivers/soundwire/intel_ace2x.o:(intel_sync_arm) in archive vmlinux.a

Add a Kconfig dependency that prevents that broken configuration but still allows soundwire to be a loadable module instead.

Fixes 4d1e2464a1104 ("soundwire: intel_ace2x: add sync_arm/sync_go helpers")
---
 drivers/soundwire/Kconfig | 1 +
 1 file changed, 1 insertion(+)
drivers/soundwire/Kconfig +1 -0
index fa71c9a36df7a..4d8f3b7024ae5 100644
@@ -37,6 +37,7 @@ config SOUNDWIRE_INTEL
 	select SOUNDWIRE_GENERIC_ALLOCATION
 	select AUXILIARY_BUS
 	depends on ACPI && SND_SOC
+	depends on SND_SOC_SOF_HDA_MLINK || !SND_SOC_SOF_HDA_MLINK
 	help
 	  SoundWire Intel Master driver.
 	  If you have an Intel platform which has a SoundWire Master then
Signature · 1 line
2.39.2
maintainer Applied
#1 lore raw
Quoted 10 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

The ace2x driver can be build with or without mlink support, but when SND_SOC_SOF_HDA_MLINK is set to =m and soundwire is built-in, it fails with a link error:

ld.lld: error: undefined symbol: hdac_bus_eml_sdw_wait_syncpu_unlocked

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

referenced by intel_ace2x.c
drivers/soundwire/intel_ace2x.o:(intel_link_power_up) in archive vmlinux.a

Quoted 6 lines

ld.lld: error: undefined symbol: hdac_bus_eml_sdw_sync_arm_unlocked

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

referenced by intel_ace2x.c
drivers/soundwire/intel_ace2x.o:(intel_sync_arm) in archive vmlinux.a

Add a Kconfig dependency that prevents that broken configuration but still allows soundwire to be a loadable module instead.

Applied, thanks

Signature · 1 line
~Vinod