Unverified Commit 70ae4eb5 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: SOF: Kconfig: add EXPERT dependency for developer options, clarify help 

Some distros select all possible options, despite existing warnings to
be careful. This leads to e.g. user reports that the HDaudio codec and
DMIC are not handled by SOF.

Add an explicit menu item to unlock developer options, and make them
dependent on CONFIG_EXPERT. Hopefully with this double-lock these
options will only be selected by developers.

GitHub issue: https://github.com/thesofproject/sof/issues/1885


Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191101173045.27099-5-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 280393b7

sound/soc/sof/Kconfig

+16 −9
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ config SND_SOC_SOF_PCI 
	depends on PCI

	select SND_SOC_SOF

	select SND_SOC_ACPI if ACPI

	select SND_SOC_SOF_OPTIONS

	select SND_SOC_SOF_INTEL_PCI if SND_SOC_SOF_INTEL_TOPLEVEL

	help

	  This adds support for PCI enumeration. This option is
@@ -27,7 +26,6 @@ config SND_SOC_SOF_ACPI 
	depends on ACPI || COMPILE_TEST

	select SND_SOC_SOF

	select SND_SOC_ACPI if ACPI

	select SND_SOC_SOF_OPTIONS

	select SND_SOC_SOF_INTEL_ACPI if SND_SOC_SOF_INTEL_TOPLEVEL

	select IOSF_MBI if X86 && PCI

	help
@@ -40,19 +38,23 @@ config SND_SOC_SOF_OF 
	tristate "SOF OF enumeration support"

	depends on OF || COMPILE_TEST

	select SND_SOC_SOF

	select SND_SOC_SOF_OPTIONS

	help

	  This adds support for Device Tree enumeration. This option is

	  required to enable i.MX8 devices.

	  Say Y if you need this option. If unsure select "N".



config SND_SOC_SOF_OPTIONS

	tristate

config SND_SOC_SOF_DEVELOPER_SUPPORT

	bool "SOF developer options support"

	depends on EXPERT

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level

	  This option unlock SOF developer options for debug/performance/

	  code hardening.

	  Distributions should not select this option, only SOF development

	  teams should select it.

	  Say Y if you are involved in SOF development and need this option

	  If not, select N



if SND_SOC_SOF_OPTIONS

if SND_SOC_SOF_DEVELOPER_SUPPORT



config SND_SOC_SOF_NOCODEC

	tristate
@@ -64,6 +66,11 @@ config SND_SOC_SOF_NOCODEC_SUPPORT 
	  option if no known codec is detected. This is typically only

	  enabled for developers or devices where the sound card is

	  controlled externally

	  This option is mutually exclusive with the Intel HDaudio support,

	  selecting it may have negative impacts and prevent e.g. microphone

	  functionality from being enabled on Intel CoffeeLake and later

	  platforms.

	  Distributions should not select this option!

	  Say Y if you need this nocodec fallback option

	  If unsure select "N".
@@ -168,7 +175,7 @@ config SND_SOC_SOF_DEBUG_RETAIN_DSP_CONTEXT 


endif ## SND_SOC_SOF_DEBUG



endif ## SND_SOC_SOF_OPTIONS

endif ## SND_SOC_SOF_DEVELOPER_SUPPORT



config SND_SOC_SOF

	tristate