Skip to contentSkip to conversation

ASoC: Intel: Fix Kconfig for ACPI=n

PATCH In review Peter Ujfalusi 3 participants 6 messages Nov 7, 2024 – Nov 9, 2024

Subsystems (3)
lore
Share & tools
lore

Peter Ujfalusi

author maintainer
#0 lore raw

cover ASoC: Intel: Fix Kconfig for ACPI=n

Hi,

A recent attempt to fix a missing symbol when CONFIG_SND_SOC_SDCA=m and CONFIG_SND_SOC_ACPI_INTEL_SDCA_QUIRKS=y caused unmet direct dependency warning with randconig.

The reason is that SND_SOC_ACPI_INTEL_MATCH is needed to be compilable even if ACPI is not selected, modules have dependency on exported symbols from it.

The only solution for these kconfig dependencies seams to be to only select SND_SOC_SDCA if ACPI is enabled from SND_SOC_ACPI_INTEL_SDCA_QUIRKS.

Regards,
Peter
---
Peter Ujfalusi (2):
ASoC: Intel: Kconfig: Only select SND_SOC_SDCA if ACPI is enabled
ASoC: Intel: Kconfig: Revert make SND_SOC_ACPI_INTEL_MATCH depend on
ACPI

 sound/soc/intel/Kconfig | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
Signature · 1 line
2.47.0
author maintainer
#1 lore raw

PATCH 1/2 ASoC: Intel: Kconfig: Only select SND_SOC_SDCA if ACPI is enabled

The SDCA module have hard dependency to compile on ACPI, it can only be selected if ACPI is also enabled.
The SDCA header provides inline prototypes for other modules to compile in case SND_SOC_SDCA is not enabled.

Fixes 845cb1ddf1fc ("ASoC: Intel: Kconfig: select SND_SOC_SDCA by SND_SOC_ACPI_INTEL_SDCA_QUIRKS")
---
 sound/soc/intel/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/intel/Kconfig +1 -1
index 46b45f390ae9..502129772856 100644
@@ -78,7 +78,7 @@ config SND_SOC_ACPI_INTEL_MATCH
 
 config SND_SOC_ACPI_INTEL_SDCA_QUIRKS
 	tristate
-	select SND_SOC_SDCA
+	select SND_SOC_SDCA if ACPI
 
 endif ## SND_SOC_INTEL_SST_TOPLEVEL || SND_SOC_SOF_INTEL_TOPLEVEL
 
Signature · 1 line
2.47.0
maintainer Reviewed-by on v1 1/2
#2 lore raw

Re: [PATCH 1/2] ASoC: Intel: Kconfig: Only select SND_SOC_SDCA if ACPI is enabled

Quoted 9 lines · Peter Ujfalusi

The SDCA module have hard dependency to compile on ACPI, it can only be selected if ACPI is also enabled.
The SDCA header provides inline prototypes for other modules to compile in case SND_SOC_SDCA is not enabled.

Fixes 845cb1ddf1fc ("ASoC: Intel: Kconfig: select SND_SOC_SDCA by SND_SOC_ACPI_INTEL_SDCA_QUIRKS")
author maintainer
#3 lore raw

PATCH 2/2 ASoC: Intel: Kconfig: Revert make SND_SOC_ACPI_INTEL_MATCH depend on ACPI

In reply to Peter Ujfalusi

The acpi-intel-match should be compiled even if ACPI is not selected. The ACPI is not compile time requirement, but the exported symbols are needed for other modules.

Fixes b6bd3f3b6357 ("ASoC: Intel: Kconfig: make SND_SOC_ACPI_INTEL_MATCH depend on ACPI")
---
 sound/soc/intel/Kconfig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
sound/soc/intel/Kconfig +1 -2
index 502129772856..2db494b0e3cf 100644
@@ -70,8 +70,7 @@ if SND_SOC_INTEL_SST_TOPLEVEL || SND_SOC_SOF_INTEL_TOPLEVEL
 
 config SND_SOC_ACPI_INTEL_MATCH
 	tristate
-	depends on ACPI
-	select SND_SOC_ACPI
+	select SND_SOC_ACPI if ACPI
 	select SND_SOC_ACPI_INTEL_SDCA_QUIRKS
 	# this option controls the compilation of ACPI matching tables and
 	# helpers and is not meant to be selected by the user.
Signature · 1 line
2.47.0
maintainer Reviewed-by on v1 2/2
#4 lore raw

Re: [PATCH 2/2] ASoC: Intel: Kconfig: Revert make SND_SOC_ACPI_INTEL_MATCH depend on ACPI

Quoted 8 lines · Peter Ujfalusi

The acpi-intel-match should be compiled even if ACPI is not selected. The ACPI is not compile time requirement, but the exported symbols are needed for other modules.

Fixes b6bd3f3b6357 ("ASoC: Intel: Kconfig: make SND_SOC_ACPI_INTEL_MATCH depend on ACPI")
maintainer
#5 lore raw
In reply to Peter Ujfalusi
Quoted 9 lines · Peter Ujfalusi

A recent attempt to fix a missing symbol when CONFIG_SND_SOC_SDCA=m and CONFIG_SND_SOC_ACPI_INTEL_SDCA_QUIRKS=y caused unmet direct dependency warning with randconig.

The reason is that SND_SOC_ACPI_INTEL_MATCH is needed to be compilable even if ACPI is not selected, modules have dependency on exported symbols from it.

[...]

Applied to

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

Thanks!

[1/2] ASoC: Intel: Kconfig: Only select SND_SOC_SDCA if ACPI is enabled

      commit: c5bbc47f8e094f4489934a244ee1c14947a5075e
[2/2] ASoC: Intel: Kconfig: Revert make SND_SOC_ACPI_INTEL_MATCH depend on ACPI
      commit: 4f1636e7b0384c43856e1442755f48d7c690c2a9

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