Skip to contentSkip to conversation

ASoC: SOF: Kconfig: Fix the dependency for client modules

PATCH In review Peter Ujfalusi 2 participants 4 messages Aug 23, 2022

Subsystems (3)
lore
Share & tools
lore

Peter Ujfalusi

author maintainer
#0 lore raw

cover ASoC: SOF: Kconfig: Fix the dependency for client modules

Hi,

There is still a chance to end up with a client driver selected as built in while the core SOF is as module.

Fix this by making the client drivers depend on SND_SOC_SOF.

Regards,
Peter
---
Peter Ujfalusi (2):
ASoC: SOF: Kconfig: Make IPC_FLOOD_TEST depend on SND_SOC_SOF
ASoC: SOF: Kconfig: Make IPC_MESSAGE_INJECTOR depend on SND_SOC_SOF

 sound/soc/sof/Kconfig | 2 ++
 1 file changed, 2 insertions(+)
Signature · 1 line
2.37.2
author maintainer
#1 lore raw

PATCH 1/2 ASoC: SOF: Kconfig: Make IPC_FLOOD_TEST depend on SND_SOC_SOF

Make sure that the IPC_FLOOD client can not be built in when SND_SOC_SOF is built as module.

Fixes 6e9548cdb30e5 ("ASoC: SOF: Convert the generic IPC flood test into SOF client")
---
 sound/soc/sof/Kconfig | 1 +
 1 file changed, 1 insertion(+)
sound/soc/sof/Kconfig +1 -0
index e90f173d067c..cfb244e4e142 100644
@@ -196,6 +196,7 @@ config SND_SOC_SOF_DEBUG_ENABLE_FIRMWARE_TRACE
 
 config SND_SOC_SOF_DEBUG_IPC_FLOOD_TEST
 	tristate "SOF enable IPC flood test"
+	depends on SND_SOC_SOF
 	select SND_SOC_SOF_CLIENT
 	help
 	  This option enables a separate client device for IPC flood test
Signature · 1 line
2.37.2
author maintainer
#2 lore raw

PATCH 2/2 ASoC: SOF: Kconfig: Make IPC_MESSAGE_INJECTOR depend on SND_SOC_SOF

In reply to Peter Ujfalusi

Make sure that the IPC_MESSAGE_INJECTOR client can not be built in when SND_SOC_SOF is built as module.

Fixes cac0b0887e530 ("ASoC: SOF: Convert the generic IPC message injector into SOF client")
---
 sound/soc/sof/Kconfig | 1 +
 1 file changed, 1 insertion(+)
sound/soc/sof/Kconfig +1 -0
index cfb244e4e142..37f7df5fde17 100644
@@ -215,6 +215,7 @@ config SND_SOC_SOF_DEBUG_IPC_FLOOD_TEST_NUM
 
 config SND_SOC_SOF_DEBUG_IPC_MSG_INJECTOR
 	tristate "SOF enable IPC message injector"
+	depends on SND_SOC_SOF
 	select SND_SOC_SOF_CLIENT
 	help
 	  This option enables the IPC message injector which can be used to send
Signature · 1 line
2.37.2
maintainer
#3 lore raw
In reply to Peter Ujfalusi
Quoted 9 lines · Peter Ujfalusi

There is still a chance to end up with a client driver selected as built in while the core SOF is as module.

Fix this by making the client drivers depend on SND_SOC_SOF.

Regards,
Peter

[...]

Applied to

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

Thanks!

[1/2] ASoC: SOF: Kconfig: Make IPC_FLOOD_TEST depend on SND_SOC_SOF

      commit: 3942499fba11de048c3ac1390b808e9e6ae88de5
[2/2] ASoC: SOF: Kconfig: Make IPC_MESSAGE_INJECTOR depend on SND_SOC_SOF
      commit: 2cf520ffbcbd55c0f2b4276065444d7526d9d197

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