Skip to contentSkip to conversation

ASoC: SOF: Intel: select SND_SOC_SDW_UTILS=y from SND_SOC_SOF_HDA_GENERIC=y

PATCH In review Arnd Bergmann 4 participants 9 messages Jun 11 – Jun 12

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ASoC: SOF: Intel: select SND_SOC_SDW_UTILS=y from SND_SOC_SOF_HDA_GENERIC=y

From: Arnd Bergmann <[email protected]>

When SND_SOC_SOF_HDA_GENERIC=y but SND_SOC_SOF_INTEL_SOUNDWIRE=m, the SND_SOC_SDW_UTILS is also set to =m even though there is a direct link dependency from the hda.c:

aarch64-linux-ld: sound/soc/sof/intel/hda.o: in function `hda_machine_select':
hda.c:(.text+0x21ac): undefined reference to codec_info_list' hda.c:(.text+0x241c): undefined reference to asoc_sdw_get_dai_type' hda.c:(.text+0x25b4): undefined reference to asoc_sdw_get_codec_info_list_count' hda.c:(.text+0x25d8): undefined reference to asoc_sdw_get_codec_info_list_count'

Change this the same way as the other related 'select' statements to allow linking against it.

Fixes 2b4d53eb5cf3 ("ASoC: SOF: Intel: select SND_SOC_SDW_UTILS in SND_SOC_SOF_HDA_GENERIC")
---
 sound/soc/sof/intel/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/sof/intel/Kconfig +1 -1
index 0e52225bddae..e499bdd43f45 100644
@@ -335,7 +335,7 @@ config SND_SOC_SOF_HDA_GENERIC
 	select SND_INTEL_DSP_CONFIG
 	select SND_SOC_SOF_HDA_LINK_BASELINE
 	select SND_SOC_SOF_HDA_PROBES
-	select SND_SOC_SDW_UTILS if SND_SOC_SOF_INTEL_SOUNDWIRE
+	select SND_SOC_SDW_UTILS if SND_SOC_SOF_INTEL_SOUNDWIRE !=n
 	select SND_SOC_SOF_HDA_MLINK if SND_SOC_SOF_HDA_LINK
 	help
 	  This option is not user-selectable but automagically handled by
Signature · 1 line
2.39.5
#1 lore raw

PATCH 2/2 ASoC: SOF: Intel: hda-sdw-bpt: select SND_SOF_SOF_HDA_SDW_BPT properly

From: Arnd Bergmann <[email protected]>

When SND_SOC_SOF_INTEL_LNL is set, SND_SOF_SOF_HDA_SDW_BPT must also be enabled, in order to let the soundwire support call into it.

However, there are configurations with SND_SOF_SOF_HDA_SDW_BPT=m and SND_SOF_SOF_HDA_SDW_BPT=m but SOUNDWIRE_INTEL=y, which still lead to a link failure:

aarch64-linux-ld: drivers/soundwire/intel_ace2x.o: in function `intel_ace2x_bpt_wait':
intel_ace2x.c:(.text+0xfc8): undefined reference to `hda_sdw_bpt_wait'
aarch64-linux-ld: drivers/soundwire/intel_ace2x.o: in function `intel_ace2x_bpt_send_async':
intel_ace2x.c:(.text+0x1ff8): undefined reference to `hda_sdw_bpt_get_buf_size_alignment'

Address this by moving the 'select SND_SOF_SOF_HDA_SDW_BPT' into SND_SOC_SOF_HDA_GENERIC.

Fixes 614d416dd8ae ("ASoC: SOF: Intel: hda-sdw-bpt: fix SND_SOF_SOF_HDA_SDW_BPT dependencies")
---
 sound/soc/sof/intel/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/sof/intel/Kconfig +2 -2
index e499bdd43f45..f78c3e9e3965 100644
@@ -272,10 +272,8 @@ config SND_SOC_SOF_METEORLAKE
 
 config SND_SOC_SOF_INTEL_LNL
 	tristate
-	select SOUNDWIRE_INTEL if SND_SOC_SOF_INTEL_SOUNDWIRE != n
 	select SND_SOC_SOF_HDA_GENERIC
 	select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE
-	select SND_SOF_SOF_HDA_SDW_BPT if SND_SOC_SOF_INTEL_SOUNDWIRE != n
 	select SND_SOC_SOF_IPC4
 	select SND_SOC_SOF_INTEL_MTL
 
@@ -337,6 +335,8 @@ config SND_SOC_SOF_HDA_GENERIC
 	select SND_SOC_SOF_HDA_PROBES
 	select SND_SOC_SDW_UTILS if SND_SOC_SOF_INTEL_SOUNDWIRE !=n
 	select SND_SOC_SOF_HDA_MLINK if SND_SOC_SOF_HDA_LINK
+	select SND_SOF_SOF_HDA_SDW_BPT if SND_SOC_SOF_INTEL_LNL != n && \
+					  SND_SOC_SOF_INTEL_SOUNDWIRE !=n
 	help
 	  This option is not user-selectable but automagically handled by
 	  'select' statements at a higher level.
Signature · 1 line
2.39.5
maintainer
#2 lore raw
In reply to Arnd Bergmann

sound/soc/sof/intel/Kconfig config SND_SOC_SOF_HDA_GENERIC · line 338

Quoted 7 lines · Arnd Bergmann

+++ b/sound/soc/sof/intel/Kconfig

sound/soc/sof/intel/Kconfig +1 -1
@@ -335,7 +335,7 @@ config SND_SOC_SOF_HDA_GENERIC
 	select SND_INTEL_DSP_CONFIG
 	select SND_SOC_SOF_HDA_LINK_BASELINE
 	select SND_SOC_SOF_HDA_PROBES
-	select SND_SOC_SDW_UTILS if SND_SOC_SOF_INTEL_SOUNDWIRE
+	select SND_SOC_SDW_UTILS if SND_SOC_SOF_INTEL_SOUNDWIRE !=n

Can we end up with SND_SOC_SDW_UTILS=y but SOUNDWIRE=m? Though I think that's a potential issue anyway...

#3 lore raw
Quoted 11 lines · Mark Brown

sound/soc/sof/intel/Kconfig config SND_SOC_SOF_HDA_GENERIC · line 338

Quoted 7 lines · Arnd Bergmann

+++ b/sound/soc/sof/intel/Kconfig

sound/soc/sof/intel/Kconfig +1 -1
@@ -335,7 +335,7 @@ config SND_SOC_SOF_HDA_GENERIC
 	select SND_INTEL_DSP_CONFIG
 	select SND_SOC_SOF_HDA_LINK_BASELINE
 	select SND_SOC_SOF_HDA_PROBES
-	select SND_SOC_SDW_UTILS if SND_SOC_SOF_INTEL_SOUNDWIRE
+	select SND_SOC_SDW_UTILS if SND_SOC_SOF_INTEL_SOUNDWIRE !=n

Can we end up with SND_SOC_SDW_UTILS=y but SOUNDWIRE=m? Though I think that's a potential issue anyway...

I don't see that combination in any randconfig builds and haven't managed to produce it in menuconfig, but I can't swear that it's impossible either.

I do feel that the entire set of dependencies around SOUNDWIRE, HDA and the Intel/AMD drivers is too fragile, so it would be good if someone could manage to simplify this in some form, but the best I can do at the moment it to address regressions when they happen.

With the patches that I have sent, plus the "ASoC: amd: acp: Fix linker error with SDCA quirks" one from Syed Saba Kareem that I'm testing at the moment, I get no link failures in randconfig kernels.

Arnd

maintainer
#4 lore raw
Quoted 8 lines · Arnd Bergmann
Quoted 2 lines · Mark Brown

Can we end up with SND_SOC_SDW_UTILS=y but SOUNDWIRE=m? Though I think that's a potential issue anyway...

I don't see that combination in any randconfig builds and haven't managed to produce it in menuconfig, but I can't swear that it's impossible either.

I think

SND_SOC_SOF_SKYLAKE=y
SND_SOC_SOF_LUNARLAKE=m
SOUNDWIRE=m

Skylake doesn't have Soundwire but does select the Intel stuff. I didn't test though.

Quoted 5 lines

I do feel that the entire set of dependencies around SOUNDWIRE, HDA and the Intel/AMD drivers is too fragile, so it would be good if someone could manage to simplify this in some form, but the best I can do at the moment it to address regressions when they happen.

Yes, this stuff is all miserable and I'm not convinced the granularity is useful. Kconfig is pretty unhelpful for this sort of library code.

Quoted 4 lines

With the patches that I have sent, plus the "ASoC: amd: acp: Fix linker error with SDCA quirks" one from Syed Saba Kareem that I'm testing at the moment, I get no link failures in randconfig kernels.

It does fix some stuff.

#5 lore raw
Quoted 10 lines · Mark Brown
Quoted 8 lines · Arnd Bergmann
Quoted 2 lines · Mark Brown

Can we end up with SND_SOC_SDW_UTILS=y but SOUNDWIRE=m? Though I think that's a potential issue anyway...

I don't see that combination in any randconfig builds and haven't managed to produce it in menuconfig, but I can't swear that it's impossible either.

Quoted 8 lines

I think

SND_SOC_SOF_SKYLAKE=y
SND_SOC_SOF_LUNARLAKE=m
SOUNDWIRE=m

Skylake doesn't have Soundwire but does select the Intel stuff. I didn't test though.

I can't get that to enable SND_SOC_SDW_UTILS, that would require SND_SOC_SOF_INTEL_SOUNDWIRE to be enabled, but that in turn has

      depends on !(SOUNDWIRE=m && SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE=y)

which seems sufficient to prevent the link failure.

Arnd

maintainer
#6 lore raw
Quoted 11 lines · Arnd Bergmann
Quoted 8 lines · Mark Brown

I think

SND_SOC_SOF_SKYLAKE=y
SND_SOC_SOF_LUNARLAKE=m
SOUNDWIRE=m

Skylake doesn't have Soundwire but does select the Intel stuff. I didn't test though.

Quoted 7 lines

I can't get that to enable SND_SOC_SDW_UTILS, that would require SND_SOC_SOF_INTEL_SOUNDWIRE to be enabled, but that in turn has

      depends on !(SOUNDWIRE=m && SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE=y)

which seems sufficient to prevent the link failure.

Oh, good. In any case I already queued the patches for CI, I guess if other stuff comes up before there's a bigger change we can fix that incrementally.

Tested-by on v1 1/2
#7 lore raw
In reply to Arnd Bergmann

sound/soc/sof/intel/Kconfig config SND_SOC_SOF_HDA_GENERIC · line 338

Quoted 5 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

sound/soc/sof/intel/Kconfig +1 -1
-	select SND_SOC_SDW_UTILS if SND_SOC_SOF_INTEL_SOUNDWIRE
+	select SND_SOC_SDW_UTILS if SND_SOC_SOF_INTEL_SOUNDWIRE !=n

Well, I learned something new about kconfig semantics today. I thought they would both set SND_SOC_SDW_UTILS to 'y'.

maintainer
#8 lore raw
In reply to Arnd Bergmann
Quoted 1 line · Arnd Bergmann

ASoC: SOF: Intel: select SND_SOC_SDW_UTILS=y from SND_SOC_SOF_HDA_GENERIC=y

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-7.2

Thanks!

[1/2] ASoC: SOF: Intel: select SND_SOC_SDW_UTILS=y from SND_SOC_SOF_HDA_GENERIC=y

      https://git.kernel.org/broonie/sound/c/67805f57e5b1
[2/2] ASoC: SOF: Intel: hda-sdw-bpt: select SND_SOF_SOF_HDA_SDW_BPT properly
      https://git.kernel.org/broonie/sound/c/999ec4c29d73

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