Alsa-Devel Archive on lore.kernel.org
 help / color / Atom feed
* [alsa-devel] [PATCH 00/11] ASoC: SOF/Intel: Kconfig improvements/fixes
@ 2019-11-01 17:30 Pierre-Louis Bossart
  2019-11-01 17:30 ` [alsa-devel] [PATCH 01/11] ASoC: SOF: Intel: Baytrail: clarify mutual exclusion with Atom/SST driver Pierre-Louis Bossart
                   ` (10 more replies)
  0 siblings, 11 replies; 27+ messages in thread
From: Pierre-Louis Bossart @ 2019-11-01 17:30 UTC (permalink / raw)
  To: alsa-devel
  Cc: tiwai, broonie, Randy Dunlap, Arnd Bergmann, Pierre-Louis Bossart

We have a number of distros who unfortunately selected the wrong
options for SOF. The first patches in this series enforce mutual
exclusions, add explicit developer options and add help text to make
sure SOF or SOF debug options are not selected by mistake.

Patch 5..6 are a follow-up on a report from Arnd Bergman.

Patches 7..11 fix mistakes with dependencies in the board
Kconfig. This should not have any impact for distros but help
developers trying to build a minimal config.

Pierre-Louis Bossart (11):
  ASoC: SOF: Intel: Baytrail: clarify mutual exclusion with Atom/SST
    driver
  ASoC: SOF: Intel: Broadwell: clarify mutual exclusion with legacy
    driver
  ASoC: Intel: add mutual exclusion between SOF and legacy Baytrail
    driver
  ASoC: SOF: Kconfig: add EXPERT dependency for developer options,
    clarify help
  ASoC: SOF: imx: fix reverse CONFIG_SND_SOC_SOF_OF dependency
  ASoC: SOF: Intel: use def_tristate, avoid using select
  ASoC: Intel: Skylake: mark HDAudio codec support as deprecated.
  ASoC: Intel: boards: remove select SND_HDA_DSP_LOADER
  ASoC: Intel: boards: fix configs for bxt-da7219-max98057a
  ASoC: Intel: boards: Geminilake is only supported by SOF
  ASoC: Intel: boards: sof_rt5682: use dependency on SOF_HDA_LINK

 sound/soc/intel/Kconfig         | 17 +++++++++++----
 sound/soc/intel/boards/Kconfig  | 37 ++++++++++++++++++++++++---------
 sound/soc/intel/boards/Makefile |  2 +-
 sound/soc/sof/Kconfig           | 27 ++++++++++++++----------
 sound/soc/sof/imx/Kconfig       |  8 +++++--
 sound/soc/sof/intel/Kconfig     | 24 +++++++++++++++++----
 6 files changed, 83 insertions(+), 32 deletions(-)

-- 
2.20.1

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [alsa-devel] [PATCH 01/11] ASoC: SOF: Intel: Baytrail: clarify mutual exclusion with Atom/SST driver
  2019-11-01 17:30 [alsa-devel] [PATCH 00/11] ASoC: SOF/Intel: Kconfig improvements/fixes Pierre-Louis Bossart
@ 2019-11-01 17:30 ` Pierre-Louis Bossart
  2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: SOF: Intel: Baytrail: clarify mutual exclusion with Atom/SST driver" to the asoc tree Mark Brown
  2019-11-01 17:30 ` [alsa-devel] [PATCH 02/11] ASoC: SOF: Intel: Broadwell: clarify mutual exclusion with legacy driver Pierre-Louis Bossart
                   ` (9 subsequent siblings)
  10 siblings, 1 reply; 27+ messages in thread
From: Pierre-Louis Bossart @ 2019-11-01 17:30 UTC (permalink / raw)
  To: alsa-devel
  Cc: tiwai, broonie, Randy Dunlap, Arnd Bergmann, Pierre-Louis Bossart

Some distros select all options blindly, which leads to confusion and
bug reports. Since SOF does not support Baytrail-CR for now, and
UCM/topology files are still being propagated to downstream distros,
make SOF on Baytrail an opt-in option that first require distros to
opt-out of existing defaults.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 sound/soc/intel/Kconfig     |  3 +++
 sound/soc/sof/intel/Kconfig | 10 +++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 3f9e65c10d5b..9376d72663ea 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -101,6 +101,9 @@ config SND_SST_ATOM_HIFI2_PLATFORM_ACPI
 	  If you have a Intel Baytrail or Cherrytrail platform with an I2S
 	  codec, then enable this option by saying Y or m. This is a
 	  recommended option
+	  This option is mutually exclusive with the SOF support on
+	  Baytrail/Cherrytrail. If you want to enable SOF on
+	  Baytrail/Cherrytrail, you need to deselect this option first.
 
 config SND_SOC_INTEL_SKYLAKE
 	tristate "All Skylake/SST Platforms"
diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig
index 36180af5c0aa..8f44b1e9c6bd 100644
--- a/sound/soc/sof/intel/Kconfig
+++ b/sound/soc/sof/intel/Kconfig
@@ -62,10 +62,18 @@ if SND_SOC_SOF_INTEL_ACPI
 
 config SND_SOC_SOF_BAYTRAIL_SUPPORT
 	bool "SOF support for Baytrail, Braswell and Cherrytrail"
+	depends on SND_SST_ATOM_HIFI2_PLATFORM_ACPI=n
 	help
 	  This adds support for Sound Open Firmware for Intel(R) platforms
 	  using the Baytrail, Braswell or Cherrytrail processors.
-	  Say Y if you have such a device.
+	  This option is mutually exclusive with the Atom/SST and Baytrail
+	  legacy drivers. If you want to enable SOF on Baytrail/Cherrytrail,
+	  you need to deselect those options first.
+	  SOF does not support Baytrail-CR for now, so this option is not
+	  recommended for distros. At some point all legacy drivers will be
+	  deprecated but not before all userspace firmware/topology/UCM files
+	  are made available to downstream distros.
+	  Say Y if you want to enable SOF on Baytrail/Cherrytrail
 	  If unsure select "N".
 
 config SND_SOC_SOF_BAYTRAIL
-- 
2.20.1

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [alsa-devel] [PATCH 02/11] ASoC: SOF: Intel: Broadwell: clarify mutual exclusion with legacy driver
  2019-11-01 17:30 [alsa-devel] [PATCH 00/11] ASoC: SOF/Intel: Kconfig improvements/fixes Pierre-Louis Bossart
  2019-11-01 17:30 ` [alsa-devel] [PATCH 01/11] ASoC: SOF: Intel: Baytrail: clarify mutual exclusion with Atom/SST driver Pierre-Louis Bossart
@ 2019-11-01 17:30 ` Pierre-Louis Bossart
  2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: SOF: Intel: Broadwell: clarify mutual exclusion with legacy driver" to the asoc tree Mark Brown
  2019-11-01 17:30 ` [alsa-devel] [PATCH 03/11] ASoC: Intel: add mutual exclusion between SOF and legacy Baytrail driver Pierre-Louis Bossart
                   ` (8 subsequent siblings)
  10 siblings, 1 reply; 27+ messages in thread
From: Pierre-Louis Bossart @ 2019-11-01 17:30 UTC (permalink / raw)
  To: alsa-devel
  Cc: tiwai, broonie, Randy Dunlap, Arnd Bergmann, Pierre-Louis Bossart

Some distros select all options blindly, which leads to confusion and
bug reports. SOF does not fully support Broadwell due to firmware
dependencies, the machine drivers can only support one option, and
UCM/topology files are still being propagated to downstream distros,
so make SOF on Broadwell an opt-in option that first require distros
to opt-out of existing defaults.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=204237
Fixes: f35bf70f61d3 ('ASoC: Intel: Make sure BDW based machine drivers build for SOF')
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 sound/soc/intel/Kconfig     |  3 +++
 sound/soc/sof/intel/Kconfig | 10 +++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 9376d72663ea..7e9feca333b7 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -59,6 +59,9 @@ config SND_SOC_INTEL_HASWELL
 	  If you have a Intel Haswell or Broadwell platform connected to
 	  an I2S codec, then enable this option by saying Y or m. This is
 	  typically used for Chromebooks. This is a recommended option.
+	  This option is mutually exclusive with the SOF support on
+	  Broadwell. If you want to enable SOF on Broadwell, you need to
+	  deselect this option first.
 
 config SND_SOC_INTEL_BAYTRAIL
 	tristate "Baytrail (legacy) Platforms"
diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig
index 8f44b1e9c6bd..0cc82325d9fe 100644
--- a/sound/soc/sof/intel/Kconfig
+++ b/sound/soc/sof/intel/Kconfig
@@ -85,10 +85,18 @@ config SND_SOC_SOF_BAYTRAIL
 
 config SND_SOC_SOF_BROADWELL_SUPPORT
 	bool "SOF support for Broadwell"
+	depends on SND_SOC_INTEL_HASWELL=n
 	help
 	  This adds support for Sound Open Firmware for Intel(R) platforms
 	  using the Broadwell processors.
-	  Say Y if you have such a device.
+	  This option is mutually exclusive with the Haswell/Broadwell legacy
+	  driver. If you want to enable SOF on Broadwell you need to deselect
+	  the legacy driver first.
+	  SOF does fully support Broadwell yet, so this option is not
+	  recommended for distros. At some point all legacy drivers will be
+	  deprecated but not before all userspace firmware/topology/UCM files
+	  are made available to downstream distros.
+	  Say Y if you want to enable SOF on Broadwell
 	  If unsure select "N".
 
 config SND_SOC_SOF_BROADWELL
-- 
2.20.1

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [alsa-devel] [PATCH 03/11] ASoC: Intel: add mutual exclusion between SOF and legacy Baytrail driver
  2019-11-01 17:30 [alsa-devel] [PATCH 00/11] ASoC: SOF/Intel: Kconfig improvements/fixes Pierre-Louis Bossart
  2019-11-01 17:30 ` [alsa-devel] [PATCH 01/11] ASoC: SOF: Intel: Baytrail: clarify mutual exclusion with Atom/SST driver Pierre-Louis Bossart
  2019-11-01 17:30 ` [alsa-devel] [PATCH 02/11] ASoC: SOF: Intel: Broadwell: clarify mutual exclusion with legacy driver Pierre-Louis Bossart
@ 2019-11-01 17:30 ` Pierre-Louis Bossart
  2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: Intel: add mutual exclusion between SOF and legacy Baytrail driver" to the asoc tree Mark Brown
  2019-11-04 20:18   ` [alsa-devel] [PATCH 03/11] ASoC: Intel: add mutual exclusion between SOF and legacy Baytrail driver Cezary Rojewski
  2019-11-01 17:30 ` [alsa-devel] [PATCH 04/11] ASoC: SOF: Kconfig: add EXPERT dependency for developer options, clarify help Pierre-Louis Bossart
                   ` (7 subsequent siblings)
  10 siblings, 2 replies; 27+ messages in thread
From: Pierre-Louis Bossart @ 2019-11-01 17:30 UTC (permalink / raw)
  To: alsa-devel
  Cc: tiwai, broonie, Randy Dunlap, Arnd Bergmann, Pierre-Louis Bossart

This legacy driver is already deprecated, let's make sure there is no
conflict with SOF.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 sound/soc/intel/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 7e9feca333b7..d6c5c68b7499 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -65,7 +65,7 @@ config SND_SOC_INTEL_HASWELL
 
 config SND_SOC_INTEL_BAYTRAIL
 	tristate "Baytrail (legacy) Platforms"
-	depends on DMADEVICES && ACPI && SND_SST_ATOM_HIFI2_PLATFORM=n
+	depends on DMADEVICES && ACPI && SND_SST_ATOM_HIFI2_PLATFORM=n && SND_SOC_SOF_BAYTRAIL=n
 	select SND_SOC_INTEL_SST
 	select SND_SOC_INTEL_SST_ACPI
 	select SND_SOC_INTEL_SST_FIRMWARE
-- 
2.20.1

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [alsa-devel] [PATCH 04/11] ASoC: SOF: Kconfig: add EXPERT dependency for developer options, clarify help
  2019-11-01 17:30 [alsa-devel] [PATCH 00/11] ASoC: SOF/Intel: Kconfig improvements/fixes Pierre-Louis Bossart
                   ` (2 preceding siblings ...)
  2019-11-01 17:30 ` [alsa-devel] [PATCH 03/11] ASoC: Intel: add mutual exclusion between SOF and legacy Baytrail driver Pierre-Louis Bossart
@ 2019-11-01 17:30 ` Pierre-Louis Bossart
  2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: SOF: Kconfig: add EXPERT dependency for developer options, clarify help" to the asoc tree Mark Brown
  2019-11-01 17:30 ` [alsa-devel] [PATCH 05/11] ASoC: SOF: imx: fix reverse CONFIG_SND_SOC_SOF_OF dependency Pierre-Louis Bossart
                   ` (6 subsequent siblings)
  10 siblings, 1 reply; 27+ messages in thread
From: Pierre-Louis Bossart @ 2019-11-01 17:30 UTC (permalink / raw)
  To: alsa-devel
  Cc: tiwai, broonie, Randy Dunlap, Arnd Bergmann, Pierre-Louis Bossart

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: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 sound/soc/sof/Kconfig | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/sound/soc/sof/Kconfig b/sound/soc/sof/Kconfig
index 56a3ab66b46b..6435eb531668 100644
--- a/sound/soc/sof/Kconfig
+++ b/sound/soc/sof/Kconfig
@@ -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
-- 
2.20.1

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [alsa-devel] [PATCH 05/11] ASoC: SOF: imx: fix reverse CONFIG_SND_SOC_SOF_OF dependency
  2019-11-01 17:30 [alsa-devel] [PATCH 00/11] ASoC: SOF/Intel: Kconfig improvements/fixes Pierre-Louis Bossart
                   ` (3 preceding siblings ...)
  2019-11-01 17:30 ` [alsa-devel] [PATCH 04/11] ASoC: SOF: Kconfig: add EXPERT dependency for developer options, clarify help Pierre-Louis Bossart
@ 2019-11-01 17:30 ` Pierre-Louis Bossart
  2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: SOF: imx: fix reverse CONFIG_SND_SOC_SOF_OF dependency" to the asoc tree Mark Brown
  2019-11-01 17:30 ` [alsa-devel] [PATCH 06/11] ASoC: SOF: Intel: use def_tristate, avoid using select Pierre-Louis Bossart
                   ` (5 subsequent siblings)
  10 siblings, 1 reply; 27+ messages in thread
From: Pierre-Louis Bossart @ 2019-11-01 17:30 UTC (permalink / raw)
  To: alsa-devel
  Cc: tiwai, broonie, Randy Dunlap, Arnd Bergmann, Pierre-Louis Bossart

updated solution to the problem reported with randconfig:

CONFIG_SND_SOC_SOF_IMX depends on CONFIG_SND_SOC_SOF, but is in
turn referenced by the sof-of-dev driver. This creates a reverse
dependency that manifests in a link error when CONFIG_SND_SOC_SOF_OF
is built-in but CONFIG_SND_SOC_SOF_IMX=m:

sound/soc/sof/sof-of-dev.o:(.data+0x118): undefined reference to `sof_imx8_ops'

use def_trisate to propagate the right settings without select.

Fixes: f4df4e4042b0 ("ASoC: SOF: imx8: Fix COMPILE_TEST error")
Fixes: 202acc565a1f ("ASoC: SOF: imx: Add i.MX8 HW support")
Suggested-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 sound/soc/sof/imx/Kconfig | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/sound/soc/sof/imx/Kconfig b/sound/soc/sof/imx/Kconfig
index 6315fba8ce71..bae4f7bf5f75 100644
--- a/sound/soc/sof/imx/Kconfig
+++ b/sound/soc/sof/imx/Kconfig
@@ -11,8 +11,8 @@ config SND_SOC_SOF_IMX_TOPLEVEL
 
 if SND_SOC_SOF_IMX_TOPLEVEL
 
-config SND_SOC_SOF_IMX8
-	tristate "SOF support for i.MX8"
+config SND_SOC_SOF_IMX8_SUPPORT
+	bool "SOF support for i.MX8"
 	depends on IMX_SCU
 	depends on IMX_DSP
 	help
@@ -20,4 +20,8 @@ config SND_SOC_SOF_IMX8
 	  Say Y if you have such a device.
 	  If unsure select "N".
 
+config SND_SOC_SOF_IMX8
+	def_tristate SND_SOC_SOF_OF
+	depends on SND_SOC_SOF_IMX8_SUPPORT
+
 endif ## SND_SOC_SOF_IMX_IMX_TOPLEVEL
-- 
2.20.1

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [alsa-devel] [PATCH 06/11] ASoC: SOF: Intel: use def_tristate, avoid using select
  2019-11-01 17:30 [alsa-devel] [PATCH 00/11] ASoC: SOF/Intel: Kconfig improvements/fixes Pierre-Louis Bossart
                   ` (4 preceding siblings ...)
  2019-11-01 17:30 ` [alsa-devel] [PATCH 05/11] ASoC: SOF: imx: fix reverse CONFIG_SND_SOC_SOF_OF dependency Pierre-Louis Bossart
@ 2019-11-01 17:30 ` Pierre-Louis Bossart
  2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: SOF: Intel: use def_tristate, avoid using select" to the asoc tree Mark Brown
  2019-11-01 17:30 ` [alsa-devel] [PATCH 07/11] ASoC: Intel: Skylake: mark HDAudio codec support as deprecated Pierre-Louis Bossart
                   ` (4 subsequent siblings)
  10 siblings, 1 reply; 27+ messages in thread
From: Pierre-Louis Bossart @ 2019-11-01 17:30 UTC (permalink / raw)
  To: alsa-devel
  Cc: tiwai, broonie, Randy Dunlap, Arnd Bergmann, Pierre-Louis Bossart

So far we used select to use the relevant built-in/module options, but
this led to blurring layers between core and Intel Kconfigs.

Use def_tristate works just as well and removes Intel stuff from the code.

Suggested-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 sound/soc/sof/Kconfig       | 2 --
 sound/soc/sof/intel/Kconfig | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/sound/soc/sof/Kconfig b/sound/soc/sof/Kconfig
index 6435eb531668..71a0fc075a63 100644
--- a/sound/soc/sof/Kconfig
+++ b/sound/soc/sof/Kconfig
@@ -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_INTEL_PCI if SND_SOC_SOF_INTEL_TOPLEVEL
 	help
 	  This adds support for PCI enumeration. This option is
 	  required to enable Intel Skylake+ devices
@@ -26,7 +25,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_INTEL_ACPI if SND_SOC_SOF_INTEL_TOPLEVEL
 	select IOSF_MBI if X86 && PCI
 	help
 	  This adds support for ACPI enumeration. This option is required
diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig
index 0cc82325d9fe..b27fd3fdf335 100644
--- a/sound/soc/sof/intel/Kconfig
+++ b/sound/soc/sof/intel/Kconfig
@@ -10,7 +10,7 @@ config SND_SOC_SOF_INTEL_TOPLEVEL
 if SND_SOC_SOF_INTEL_TOPLEVEL
 
 config SND_SOC_SOF_INTEL_ACPI
-	tristate
+	def_tristate SND_SOC_SOF_ACPI
 	select SND_SOC_SOF_BAYTRAIL  if SND_SOC_SOF_BAYTRAIL_SUPPORT
 	select SND_SOC_SOF_BROADWELL if SND_SOC_SOF_BROADWELL_SUPPORT
 	help
@@ -18,7 +18,7 @@ config SND_SOC_SOF_INTEL_ACPI
 	  'select' statements at a higher level
 
 config SND_SOC_SOF_INTEL_PCI
-	tristate
+	def_tristate SND_SOC_SOF_PCI
 	select SND_SOC_SOF_MERRIFIELD  if SND_SOC_SOF_MERRIFIELD_SUPPORT
 	select SND_SOC_SOF_APOLLOLAKE  if SND_SOC_SOF_APOLLOLAKE_SUPPORT
 	select SND_SOC_SOF_GEMINILAKE  if SND_SOC_SOF_GEMINILAKE_SUPPORT
-- 
2.20.1

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [alsa-devel] [PATCH 07/11] ASoC: Intel: Skylake: mark HDAudio codec support as deprecated.
  2019-11-01 17:30 [alsa-devel] [PATCH 00/11] ASoC: SOF/Intel: Kconfig improvements/fixes Pierre-Louis Bossart
                   ` (5 preceding siblings ...)
  2019-11-01 17:30 ` [alsa-devel] [PATCH 06/11] ASoC: SOF: Intel: use def_tristate, avoid using select Pierre-Louis Bossart
@ 2019-11-01 17:30 ` Pierre-Louis Bossart
  2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: Intel: Skylake: mark HDAudio codec support as deprecated." to the asoc tree Mark Brown
  2019-11-01 17:30 ` [alsa-devel] [PATCH 08/11] ASoC: Intel: boards: remove select SND_HDA_DSP_LOADER Pierre-Louis Bossart
                   ` (3 subsequent siblings)
  10 siblings, 1 reply; 27+ messages in thread
From: Pierre-Louis Bossart @ 2019-11-01 17:30 UTC (permalink / raw)
  To: alsa-devel
  Cc: tiwai, broonie, Randy Dunlap, Arnd Bergmann, Pierre-Louis Bossart

This option famously broke audio on Linus' laptop and the problem have
not been fixed.

Mark as DEPRECATED to avoid any ambiguity with distros.

Use SOF if you need HDaudio support w/ the DSP enabled, e.g. for DMIC
capture.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 sound/soc/intel/Kconfig | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index d6c5c68b7499..c8de0bb5bed9 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -209,9 +209,12 @@ config SND_SOC_INTEL_SKYLAKE_SSP_CLK
 config SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC
 	bool "HDAudio codec support"
 	help
-	  If you have a Intel Skylake/Broxton/ApolloLake/KabyLake/
-	  GeminiLake or CannonLake platform with an HDaudio codec
-	  then enable this option by saying Y
+	  This option broke audio on Linus' Skylake laptop in December 2018
+	  and the race conditions during the probe were not fixed since.
+	  This option is DEPRECATED, all HDaudio codec support needs
+	  to be handled by the SOF driver.
+	  Distributions should not enable this option and there are no known
+	  users of this capability.
 
 config SND_SOC_INTEL_SKYLAKE_COMMON
 	tristate
-- 
2.20.1

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [alsa-devel] [PATCH 08/11] ASoC: Intel: boards: remove select SND_HDA_DSP_LOADER
  2019-11-01 17:30 [alsa-devel] [PATCH 00/11] ASoC: SOF/Intel: Kconfig improvements/fixes Pierre-Louis Bossart
                   ` (6 preceding siblings ...)
  2019-11-01 17:30 ` [alsa-devel] [PATCH 07/11] ASoC: Intel: Skylake: mark HDAudio codec support as deprecated Pierre-Louis Bossart
@ 2019-11-01 17:30 ` Pierre-Louis Bossart
  2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: Intel: boards: remove select SND_HDA_DSP_LOADER" to the asoc tree Mark Brown
  2019-11-01 17:30 ` [alsa-devel] [PATCH 09/11] ASoC: Intel: boards: fix configs for bxt-da7219-max98057a Pierre-Louis Bossart
                   ` (2 subsequent siblings)
  10 siblings, 1 reply; 27+ messages in thread
From: Pierre-Louis Bossart @ 2019-11-01 17:30 UTC (permalink / raw)
  To: alsa-devel
  Cc: tiwai, broonie, Randy Dunlap, Arnd Bergmann, Pierre-Louis Bossart

This option is only required with the Skylake platform driver, there
is no reason to have this option in machine drivers. This is
e.g. useless for SOF-based solutions.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 sound/soc/intel/boards/Kconfig | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
index ef40f83e0a3b..91952ffc0b67 100644
--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@ -270,7 +270,6 @@ config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
 	depends on I2C && ACPI
 	depends on MFD_INTEL_LPSS || COMPILE_TEST
 	select SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
-	select SND_HDA_DSP_LOADER
 	help
 	   This adds support for ASoC machine driver for Broxton-P platforms
 	   with DA7219 + MAX98357A I2S audio codec.
@@ -284,7 +283,6 @@ config SND_SOC_INTEL_BXT_RT298_MACH
 	select SND_SOC_RT298
 	select SND_SOC_DMIC
 	select SND_SOC_HDAC_HDMI
-	select SND_HDA_DSP_LOADER
 	help
 	   This adds support for ASoC machine driver for Broxton platforms
 	   with RT286 I2S audio codec.
@@ -375,7 +373,6 @@ config SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH
 	select SND_SOC_MAX98357A
 	select SND_SOC_DMIC
 	select SND_SOC_HDAC_HDMI
-	select SND_HDA_DSP_LOADER
 	help
 	   This adds support for ASoC machine driver for Geminilake platforms
 	   with RT5682 + MAX98357A I2S audio codec.
-- 
2.20.1

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [alsa-devel] [PATCH 09/11] ASoC: Intel: boards: fix configs for bxt-da7219-max98057a
  2019-11-01 17:30 [alsa-devel] [PATCH 00/11] ASoC: SOF/Intel: Kconfig improvements/fixes Pierre-Louis Bossart
                   ` (7 preceding siblings ...)
  2019-11-01 17:30 ` [alsa-devel] [PATCH 08/11] ASoC: Intel: boards: remove select SND_HDA_DSP_LOADER Pierre-Louis Bossart
@ 2019-11-01 17:30 ` Pierre-Louis Bossart
  2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: Intel: boards: fix configs for bxt-da7219-max98057a" to the asoc tree Mark Brown
  2019-11-01 17:30 ` [alsa-devel] [PATCH 10/11] ASoC: Intel: boards: Geminilake is only supported by SOF Pierre-Louis Bossart
  2019-11-01 17:30 ` [alsa-devel] [PATCH 11/11] ASoC: Intel: boards: sof_rt5682: use dependency on SOF_HDA_LINK Pierre-Louis Bossart
  10 siblings, 1 reply; 27+ messages in thread
From: Pierre-Louis Bossart @ 2019-11-01 17:30 UTC (permalink / raw)
  To: alsa-devel
  Cc: tiwai, broonie, Randy Dunlap, Arnd Bergmann, Pierre-Louis Bossart

The same driver is reused for 3 different configurations, but the
driver will only be build if ApolloLake is selected.

Fix and make sure each device can work without dependencies on others
(useful for minimal configurations).

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 sound/soc/intel/boards/Kconfig  | 24 ++++++++++++++++++++++--
 sound/soc/intel/boards/Makefile |  2 +-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
index 91952ffc0b67..826694ecfdbf 100644
--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@ -263,13 +263,17 @@ config SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
 	select SND_SOC_DMIC
 	select SND_SOC_HDAC_HDMI
 
+config SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON
+	tristate
+	select SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
+
 if SND_SOC_INTEL_APL
 
 config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
 	tristate "Broxton with DA7219 and MAX98357A in I2S Mode"
 	depends on I2C && ACPI
 	depends on MFD_INTEL_LPSS || COMPILE_TEST
-	select SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
+	select SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON
 	help
 	   This adds support for ASoC machine driver for Broxton-P platforms
 	   with DA7219 + MAX98357A I2S audio codec.
@@ -365,6 +369,17 @@ endif ## SND_SOC_INTEL_KBL
 
 if SND_SOC_INTEL_GLK || (SND_SOC_SOF_GEMINILAKE  && SND_SOC_SOF_HDA_LINK)
 
+config SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH
+	tristate "GLK with DA7219 and MAX98357A in I2S Mode"
+	depends on I2C && ACPI
+	depends on MFD_INTEL_LPSS || COMPILE_TEST
+	select SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON
+	help
+	   This adds support for ASoC machine driver for Geminilake platforms
+	   with DA7219 + MAX98357A I2S audio codec.
+	   Say Y or m if you have such a device. This is a recommended option.
+	   If unsure select "N".
+
 config SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH
 	tristate "GLK with RT5682 and MAX98357A in I2S Mode"
 	depends on I2C && ACPI
@@ -418,7 +433,12 @@ config SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH
 	tristate "CML_LP with DA7219 and MAX98357A in I2S Mode"
 	depends on I2C && ACPI
 	depends on MFD_INTEL_LPSS || COMPILE_TEST
-	select SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
+	select SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON
+	help
+	   This adds support for ASoC machine driver for Cometlake platforms
+	   with DA7219 + MAX98357A I2S audio codec.
+	   Say Y or m if you have such a device. This is a recommended option.
+	   If unsure select "N".
 
 config SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH
         tristate "CML with RT1011 and RT5682 in I2S Mode"
diff --git a/sound/soc/intel/boards/Makefile b/sound/soc/intel/boards/Makefile
index 9ae6544c6f3b..ba1aa89db09d 100644
--- a/sound/soc/intel/boards/Makefile
+++ b/sound/soc/intel/boards/Makefile
@@ -33,7 +33,7 @@ obj-$(CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH) += snd-soc-sof_rt5682.o
 obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-sst-haswell.o
 obj-$(CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH) += snd-soc-sst-byt-rt5640-mach.o
 obj-$(CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH) += snd-soc-sst-byt-max98090-mach.o
-obj-$(CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH) += snd-soc-sst-bxt-da7219_max98357a.o
+obj-$(CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON) += snd-soc-sst-bxt-da7219_max98357a.o
 obj-$(CONFIG_SND_SOC_INTEL_BXT_RT298_MACH) += snd-soc-sst-bxt-rt298.o
 obj-$(CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH) += snd-soc-sst-glk-rt5682_max98357a.o
 obj-$(CONFIG_SND_SOC_INTEL_BROADWELL_MACH) += snd-soc-sst-broadwell.o
-- 
2.20.1

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [alsa-devel] [PATCH 10/11] ASoC: Intel: boards: Geminilake is only supported by SOF
  2019-11-01 17:30 [alsa-devel] [PATCH 00/11] ASoC: SOF/Intel: Kconfig improvements/fixes Pierre-Louis Bossart
                   ` (8 preceding siblings ...)
  2019-11-01 17:30 ` [alsa-devel] [PATCH 09/11] ASoC: Intel: boards: fix configs for bxt-da7219-max98057a Pierre-Louis Bossart
@ 2019-11-01 17:30 ` Pierre-Louis Bossart
  2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: Intel: boards: Geminilake is only supported by SOF" to the asoc tree Mark Brown
  2019-11-01 17:30 ` [alsa-devel] [PATCH 11/11] ASoC: Intel: boards: sof_rt5682: use dependency on SOF_HDA_LINK Pierre-Louis Bossart
  10 siblings, 1 reply; 27+ messages in thread
From: Pierre-Louis Bossart @ 2019-11-01 17:30 UTC (permalink / raw)
  To: alsa-devel
  Cc: tiwai, broonie, Randy Dunlap, Arnd Bergmann, Pierre-Louis Bossart

Geminilake machine drivers are only tested and recommended with SOF.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 sound/soc/intel/boards/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
index 826694ecfdbf..76d1e6ab30b5 100644
--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@ -367,7 +367,7 @@ config SND_SOC_INTEL_KBL_RT5660_MACH
 
 endif ## SND_SOC_INTEL_KBL
 
-if SND_SOC_INTEL_GLK || (SND_SOC_SOF_GEMINILAKE  && SND_SOC_SOF_HDA_LINK)
+if SND_SOC_SOF_GEMINILAKE  && SND_SOC_SOF_HDA_LINK
 
 config SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH
 	tristate "GLK with DA7219 and MAX98357A in I2S Mode"
@@ -394,7 +394,7 @@ config SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH
 	   Say Y if you have such a device.
 	   If unsure select "N".
 
-endif ## SND_SOC_INTEL_GLK || (SND_SOC_SOF_GEMINILAKE  && SND_SOC_SOF_HDA_LINK)
+endif ## SND_SOC_SOF_GEMINILAKE  && SND_SOC_SOF_HDA_LINK
 
 if SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC || SND_SOC_SOF_HDA_AUDIO_CODEC
 
-- 
2.20.1

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [alsa-devel] [PATCH 11/11] ASoC: Intel: boards: sof_rt5682: use dependency on SOF_HDA_LINK
  2019-11-01 17:30 [alsa-devel] [PATCH 00/11] ASoC: SOF/Intel: Kconfig improvements/fixes Pierre-Louis Bossart
                   ` (9 preceding siblings ...)
  2019-11-01 17:30 ` [alsa-devel] [PATCH 10/11] ASoC: Intel: boards: Geminilake is only supported by SOF Pierre-Louis Bossart
@ 2019-11-01 17:30 ` Pierre-Louis Bossart
  2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: Intel: boards: sof_rt5682: use dependency on SOF_HDA_LINK" to the asoc tree Mark Brown
  10 siblings, 1 reply; 27+ messages in thread
From: Pierre-Louis Bossart @ 2019-11-01 17:30 UTC (permalink / raw)
  To: alsa-devel
  Cc: tiwai, broonie, Randy Dunlap, Arnd Bergmann, Pierre-Louis Bossart

The wrong dependency is used and the build can be broken

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 sound/soc/intel/boards/Kconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
index 76d1e6ab30b5..2702aefee775 100644
--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@ -411,11 +411,11 @@ config SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH
 
 endif ## SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC || SND_SOC_SOF_HDA_AUDIO_CODEC
 
-if SND_SOC_SOF_HDA_COMMON || SND_SOC_SOF_BAYTRAIL
+if SND_SOC_SOF_HDA_LINK || SND_SOC_SOF_BAYTRAIL
 config SND_SOC_INTEL_SOF_RT5682_MACH
 	tristate "SOF with rt5682 codec in I2S Mode"
 	depends on I2C && ACPI
-	depends on (SND_SOC_SOF_HDA_COMMON && (MFD_INTEL_LPSS || COMPILE_TEST)) ||\
+	depends on (SND_SOC_SOF_HDA_LINK && (MFD_INTEL_LPSS || COMPILE_TEST)) ||\
 		   (SND_SOC_SOF_BAYTRAIL && (X86_INTEL_LPSS || COMPILE_TEST))
 	select SND_SOC_RT5682
 	select SND_SOC_DMIC
@@ -425,7 +425,7 @@ config SND_SOC_INTEL_SOF_RT5682_MACH
 	   with rt5682 codec.
 	   Say Y if you have such a device.
 	   If unsure select "N".
-endif ## SND_SOC_SOF_HDA_COMMON || SND_SOC_SOF_BAYTRAIL
+endif ## SND_SOC_SOF_HDA_LINK || SND_SOC_SOF_BAYTRAIL
 
 if (SND_SOC_SOF_COMETLAKE_LP && SND_SOC_SOF_HDA_LINK)
 
-- 
2.20.1

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [alsa-devel] Applied "ASoC: Intel: boards: sof_rt5682: use dependency on SOF_HDA_LINK" to the asoc tree
  2019-11-01 17:30 ` [alsa-devel] [PATCH 11/11] ASoC: Intel: boards: sof_rt5682: use dependency on SOF_HDA_LINK Pierre-Louis Bossart
@ 2019-11-04 13:27   ` Mark Brown
  0 siblings, 0 replies; 27+ messages in thread
From: Mark Brown @ 2019-11-04 13:27 UTC (permalink / raw)
  To: Pierre-Louis Bossart
  Cc: tiwai, alsa-devel, Mark Brown, Randy Dunlap, Arnd Bergmann

The patch

   ASoC: Intel: boards: sof_rt5682: use dependency on SOF_HDA_LINK

has been applied to the asoc tree at

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

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

From 8039105987fcd8dda39074df013cfdf0025dd297 Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Fri, 1 Nov 2019 12:30:45 -0500
Subject: [PATCH] ASoC: Intel: boards: sof_rt5682: use dependency on
 SOF_HDA_LINK

The wrong dependency is used and the build can be broken

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191101173045.27099-12-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/intel/boards/Kconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
index 746e087ff6d7..dfa2c365379f 100644
--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@ -411,11 +411,11 @@ config SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH
 
 endif ## SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC || SND_SOC_SOF_HDA_AUDIO_CODEC
 
-if SND_SOC_SOF_HDA_COMMON || SND_SOC_SOF_BAYTRAIL
+if SND_SOC_SOF_HDA_LINK || SND_SOC_SOF_BAYTRAIL
 config SND_SOC_INTEL_SOF_RT5682_MACH
 	tristate "SOF with rt5682 codec in I2S Mode"
 	depends on I2C && ACPI
-	depends on (SND_SOC_SOF_HDA_COMMON && (MFD_INTEL_LPSS || COMPILE_TEST)) ||\
+	depends on (SND_SOC_SOF_HDA_LINK && (MFD_INTEL_LPSS || COMPILE_TEST)) ||\
 		   (SND_SOC_SOF_BAYTRAIL && (X86_INTEL_LPSS || COMPILE_TEST))
 	select SND_SOC_RT5682
 	select SND_SOC_DMIC
@@ -425,7 +425,7 @@ config SND_SOC_INTEL_SOF_RT5682_MACH
 	   with rt5682 codec.
 	   Say Y if you have such a device.
 	   If unsure select "N".
-endif ## SND_SOC_SOF_HDA_COMMON || SND_SOC_SOF_BAYTRAIL
+endif ## SND_SOC_SOF_HDA_LINK || SND_SOC_SOF_BAYTRAIL
 
 if (SND_SOC_SOF_COMETLAKE_LP && SND_SOC_SOF_HDA_LINK)
 
-- 
2.20.1

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [alsa-devel] Applied "ASoC: Intel: boards: fix configs for bxt-da7219-max98057a" to the asoc tree
  2019-11-01 17:30 ` [alsa-devel] [PATCH 09/11] ASoC: Intel: boards: fix configs for bxt-da7219-max98057a Pierre-Louis Bossart
@ 2019-11-04 13:27   ` Mark Brown
  0 siblings, 0 replies; 27+ messages in thread
From: Mark Brown @ 2019-11-04 13:27 UTC (permalink / raw)
  To: Pierre-Louis Bossart
  Cc: tiwai, alsa-devel, Mark Brown, Randy Dunlap, Arnd Bergmann

The patch

   ASoC: Intel: boards: fix configs for bxt-da7219-max98057a

has been applied to the asoc tree at

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

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

From c4a09f9a523e674ef9a046e05d99c90f2c9513b1 Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Fri, 1 Nov 2019 12:30:43 -0500
Subject: [PATCH] ASoC: Intel: boards: fix configs for bxt-da7219-max98057a

The same driver is reused for 3 different configurations, but the
driver will only be build if ApolloLake is selected.

Fix and make sure each device can work without dependencies on others
(useful for minimal configurations).

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191101173045.27099-10-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/intel/boards/Kconfig  | 24 ++++++++++++++++++++++--
 sound/soc/intel/boards/Makefile |  2 +-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
index c63070c3a250..0b3101dc8286 100644
--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@ -263,13 +263,17 @@ config SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
 	select SND_SOC_DMIC
 	select SND_SOC_HDAC_HDMI
 
+config SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON
+	tristate
+	select SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
+
 if SND_SOC_INTEL_APL
 
 config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
 	tristate "Broxton with DA7219 and MAX98357A in I2S Mode"
 	depends on I2C && ACPI
 	depends on MFD_INTEL_LPSS || COMPILE_TEST
-	select SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
+	select SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON
 	help
 	   This adds support for ASoC machine driver for Broxton-P platforms
 	   with DA7219 + MAX98357A I2S audio codec.
@@ -365,6 +369,17 @@ endif ## SND_SOC_INTEL_KBL
 
 if SND_SOC_INTEL_GLK || (SND_SOC_SOF_GEMINILAKE  && SND_SOC_SOF_HDA_LINK)
 
+config SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH
+	tristate "GLK with DA7219 and MAX98357A in I2S Mode"
+	depends on I2C && ACPI
+	depends on MFD_INTEL_LPSS || COMPILE_TEST
+	select SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON
+	help
+	   This adds support for ASoC machine driver for Geminilake platforms
+	   with DA7219 + MAX98357A I2S audio codec.
+	   Say Y or m if you have such a device. This is a recommended option.
+	   If unsure select "N".
+
 config SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH
 	tristate "GLK with RT5682 and MAX98357A in I2S Mode"
 	depends on I2C && ACPI
@@ -418,7 +433,12 @@ config SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH
 	tristate "CML_LP with DA7219 and MAX98357A in I2S Mode"
 	depends on I2C && ACPI
 	depends on MFD_INTEL_LPSS || COMPILE_TEST
-	select SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
+	select SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON
+	help
+	   This adds support for ASoC machine driver for Cometlake platforms
+	   with DA7219 + MAX98357A I2S audio codec.
+	   Say Y or m if you have such a device. This is a recommended option.
+	   If unsure select "N".
 
 config SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH
         tristate "CML with RT1011 and RT5682 in I2S Mode"
diff --git a/sound/soc/intel/boards/Makefile b/sound/soc/intel/boards/Makefile
index 9ae6544c6f3b..ba1aa89db09d 100644
--- a/sound/soc/intel/boards/Makefile
+++ b/sound/soc/intel/boards/Makefile
@@ -33,7 +33,7 @@ obj-$(CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH) += snd-soc-sof_rt5682.o
 obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-sst-haswell.o
 obj-$(CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH) += snd-soc-sst-byt-rt5640-mach.o
 obj-$(CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH) += snd-soc-sst-byt-max98090-mach.o
-obj-$(CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH) += snd-soc-sst-bxt-da7219_max98357a.o
+obj-$(CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON) += snd-soc-sst-bxt-da7219_max98357a.o
 obj-$(CONFIG_SND_SOC_INTEL_BXT_RT298_MACH) += snd-soc-sst-bxt-rt298.o
 obj-$(CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH) += snd-soc-sst-glk-rt5682_max98357a.o
 obj-$(CONFIG_SND_SOC_INTEL_BROADWELL_MACH) += snd-soc-sst-broadwell.o
-- 
2.20.1

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [alsa-devel] Applied "ASoC: Intel: boards: Geminilake is only supported by SOF" to the asoc tree
  2019-11-01 17:30 ` [alsa-devel] [PATCH 10/11] ASoC: Intel: boards: Geminilake is only supported by SOF Pierre-Louis Bossart
@ 2019-11-04 13:27   ` Mark Brown
  0 siblings, 0 replies; 27+ messages in thread
From: Mark Brown @ 2019-11-04 13:27 UTC (permalink / raw)
  To: Pierre-Louis Bossart
  Cc: tiwai, alsa-devel, Mark Brown, Randy Dunlap, Arnd Bergmann

The patch

   ASoC: Intel: boards: Geminilake is only supported by SOF

has been applied to the asoc tree at

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

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

From 3315e5b40f59d1aab6543773d99b1f19c3ea1848 Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Fri, 1 Nov 2019 12:30:44 -0500
Subject: [PATCH] ASoC: Intel: boards: Geminilake is only supported by SOF

Geminilake machine drivers are only tested and recommended with SOF.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191101173045.27099-11-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/intel/boards/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
index 0b3101dc8286..746e087ff6d7 100644
--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@ -367,7 +367,7 @@ config SND_SOC_INTEL_KBL_RT5660_MACH
 
 endif ## SND_SOC_INTEL_KBL
 
-if SND_SOC_INTEL_GLK || (SND_SOC_SOF_GEMINILAKE  && SND_SOC_SOF_HDA_LINK)
+if SND_SOC_SOF_GEMINILAKE  && SND_SOC_SOF_HDA_LINK
 
 config SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH
 	tristate "GLK with DA7219 and MAX98357A in I2S Mode"
@@ -394,7 +394,7 @@ config SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH
 	   Say Y if you have such a device.
 	   If unsure select "N".
 
-endif ## SND_SOC_INTEL_GLK || (SND_SOC_SOF_GEMINILAKE  && SND_SOC_SOF_HDA_LINK)
+endif ## SND_SOC_SOF_GEMINILAKE  && SND_SOC_SOF_HDA_LINK
 
 if SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC || SND_SOC_SOF_HDA_AUDIO_CODEC
 
-- 
2.20.1

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [alsa-devel] Applied "ASoC: Intel: boards: remove select SND_HDA_DSP_LOADER" to the asoc tree
  2019-11-01 17:30 ` [alsa-devel] [PATCH 08/11] ASoC: Intel: boards: remove select SND_HDA_DSP_LOADER Pierre-Louis Bossart
@ 2019-11-04 13:27   ` Mark Brown
  0 siblings, 0 replies; 27+ messages in thread
From: Mark Brown @ 2019-11-04 13:27 UTC (permalink / raw)
  To: Pierre-Louis Bossart
  Cc: tiwai, alsa-devel, Mark Brown, Randy Dunlap, Arnd Bergmann

The patch

   ASoC: Intel: boards: remove select SND_HDA_DSP_LOADER

has been applied to the asoc tree at

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

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

From 9e7301762f6df44bb4a452b6aecbe0f322b370ee Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Fri, 1 Nov 2019 12:30:42 -0500
Subject: [PATCH] ASoC: Intel: boards: remove select SND_HDA_DSP_LOADER

This option is only required with the Skylake platform driver, there
is no reason to have this option in machine drivers. This is
e.g. useless for SOF-based solutions.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191101173045.27099-9-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/intel/boards/Kconfig | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
index e591b058f46e..c63070c3a250 100644
--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@ -270,7 +270,6 @@ config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
 	depends on I2C && ACPI
 	depends on MFD_INTEL_LPSS || COMPILE_TEST
 	select SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
-	select SND_HDA_DSP_LOADER
 	help
 	   This adds support for ASoC machine driver for Broxton-P platforms
 	   with DA7219 + MAX98357A I2S audio codec.
@@ -284,7 +283,6 @@ config SND_SOC_INTEL_BXT_RT298_MACH
 	select SND_SOC_RT298
 	select SND_SOC_DMIC
 	select SND_SOC_HDAC_HDMI
-	select SND_HDA_DSP_LOADER
 	help
 	   This adds support for ASoC machine driver for Broxton platforms
 	   with RT286 I2S audio codec.
@@ -375,7 +373,6 @@ config SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH
 	select SND_SOC_MAX98357A
 	select SND_SOC_DMIC
 	select SND_SOC_HDAC_HDMI
-	select SND_HDA_DSP_LOADER
 	help
 	   This adds support for ASoC machine driver for Geminilake platforms
 	   with RT5682 + MAX98357A I2S audio codec.
-- 
2.20.1

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [alsa-devel] Applied "ASoC: Intel: Skylake: mark HDAudio codec support as deprecated." to the asoc tree
  2019-11-01 17:30 ` [alsa-devel] [PATCH 07/11] ASoC: Intel: Skylake: mark HDAudio codec support as deprecated Pierre-Louis Bossart
@ 2019-11-04 13:27   ` Mark Brown
  0 siblings, 0 replies; 27+ messages in thread
From: Mark Brown @ 2019-11-04 13:27 UTC (permalink / raw)
  To: Pierre-Louis Bossart
  Cc: tiwai, alsa-devel, Mark Brown, Randy Dunlap, Arnd Bergmann

The patch

   ASoC: Intel: Skylake: mark HDAudio codec support as deprecated.

has been applied to the asoc tree at

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

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

From 02701b909c2fab4b49f9c9545ab921c9b2c7a768 Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Fri, 1 Nov 2019 12:30:41 -0500
Subject: [PATCH] ASoC: Intel: Skylake: mark HDAudio codec support as
 deprecated.

This option famously broke audio on Linus' laptop and the problem have
not been fixed.

Mark as DEPRECATED to avoid any ambiguity with distros.

Use SOF if you need HDaudio support w/ the DSP enabled, e.g. for DMIC
capture.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191101173045.27099-8-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/intel/Kconfig | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 086fc60b2a14..79b227613108 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -209,9 +209,12 @@ config SND_SOC_INTEL_SKYLAKE_SSP_CLK
 config SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC
 	bool "HDAudio codec support"
 	help
-	  If you have a Intel Skylake/Broxton/ApolloLake/KabyLake/
-	  GeminiLake or CannonLake platform with an HDaudio codec
-	  then enable this option by saying Y
+	  This option broke audio on Linus' Skylake laptop in December 2018
+	  and the race conditions during the probe were not fixed since.
+	  This option is DEPRECATED, all HDaudio codec support needs
+	  to be handled by the SOF driver.
+	  Distributions should not enable this option and there are no known
+	  users of this capability.
 
 config SND_SOC_INTEL_SKYLAKE_COMMON
 	tristate
-- 
2.20.1

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [alsa-devel] Applied "ASoC: SOF: Kconfig: add EXPERT dependency for developer options, clarify help" to the asoc tree
  2019-11-01 17:30 ` [alsa-devel] [PATCH 04/11] ASoC: SOF: Kconfig: add EXPERT dependency for developer options, clarify help Pierre-Louis Bossart
@ 2019-11-04 13:27   ` Mark Brown
  0 siblings, 0 replies; 27+ messages in thread
From: Mark Brown @ 2019-11-04 13:27 UTC (permalink / raw)
  To: Pierre-Louis Bossart
  Cc: tiwai, alsa-devel, Mark Brown, Randy Dunlap, Arnd Bergmann

The patch

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

has been applied to the asoc tree at

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

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

From 70ae4eb540af32ee6a6260143ccae6054ebd433f Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Fri, 1 Nov 2019 12:30:38 -0500
Subject: [PATCH] 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: Pierre-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: Mark Brown <broonie@kernel.org>
---
 sound/soc/sof/Kconfig | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/sound/soc/sof/Kconfig b/sound/soc/sof/Kconfig
index 56a3ab66b46b..6435eb531668 100644
--- a/sound/soc/sof/Kconfig
+++ b/sound/soc/sof/Kconfig
@@ -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
-- 
2.20.1

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [alsa-devel] Applied "ASoC: SOF: Intel: use def_tristate, avoid using select" to the asoc tree
  2019-11-01 17:30 ` [alsa-devel] [PATCH 06/11] ASoC: SOF: Intel: use def_tristate, avoid using select Pierre-Louis Bossart
@ 2019-11-04 13:27   ` Mark Brown
  0 siblings, 0 replies; 27+ messages in thread
From: Mark Brown @ 2019-11-04 13:27 UTC (permalink / raw)
  To: Pierre-Louis Bossart
  Cc: tiwai, alsa-devel, Mark Brown, Randy Dunlap, Arnd Bergmann

The patch

   ASoC: SOF: Intel: use def_tristate, avoid using select

has been applied to the asoc tree at

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

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

From b000135e5f272118e576e9720590e5979f0abe49 Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Fri, 1 Nov 2019 12:30:40 -0500
Subject: [PATCH] ASoC: SOF: Intel: use def_tristate, avoid using select

So far we used select to use the relevant built-in/module options, but
this led to blurring layers between core and Intel Kconfigs.

Use def_tristate works just as well and removes Intel stuff from the code.

Suggested-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191101173045.27099-7-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/sof/Kconfig       | 2 --
 sound/soc/sof/intel/Kconfig | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/sound/soc/sof/Kconfig b/sound/soc/sof/Kconfig
index 6435eb531668..71a0fc075a63 100644
--- a/sound/soc/sof/Kconfig
+++ b/sound/soc/sof/Kconfig
@@ -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_INTEL_PCI if SND_SOC_SOF_INTEL_TOPLEVEL
 	help
 	  This adds support for PCI enumeration. This option is
 	  required to enable Intel Skylake+ devices
@@ -26,7 +25,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_INTEL_ACPI if SND_SOC_SOF_INTEL_TOPLEVEL
 	select IOSF_MBI if X86 && PCI
 	help
 	  This adds support for ACPI enumeration. This option is required
diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig
index cd9954bfec0b..04d4929cf91f 100644
--- a/sound/soc/sof/intel/Kconfig
+++ b/sound/soc/sof/intel/Kconfig
@@ -10,7 +10,7 @@ config SND_SOC_SOF_INTEL_TOPLEVEL
 if SND_SOC_SOF_INTEL_TOPLEVEL
 
 config SND_SOC_SOF_INTEL_ACPI
-	tristate
+	def_tristate SND_SOC_SOF_ACPI
 	select SND_SOC_SOF_BAYTRAIL  if SND_SOC_SOF_BAYTRAIL_SUPPORT
 	select SND_SOC_SOF_BROADWELL if SND_SOC_SOF_BROADWELL_SUPPORT
 	help
@@ -18,7 +18,7 @@ config SND_SOC_SOF_INTEL_ACPI
 	  'select' statements at a higher level
 
 config SND_SOC_SOF_INTEL_PCI
-	tristate
+	def_tristate SND_SOC_SOF_PCI
 	select SND_SOC_SOF_MERRIFIELD  if SND_SOC_SOF_MERRIFIELD_SUPPORT
 	select SND_SOC_SOF_APOLLOLAKE  if SND_SOC_SOF_APOLLOLAKE_SUPPORT
 	select SND_SOC_SOF_GEMINILAKE  if SND_SOC_SOF_GEMINILAKE_SUPPORT
-- 
2.20.1

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [alsa-devel] Applied "ASoC: SOF: imx: fix reverse CONFIG_SND_SOC_SOF_OF dependency" to the asoc tree
  2019-11-01 17:30 ` [alsa-devel] [PATCH 05/11] ASoC: SOF: imx: fix reverse CONFIG_SND_SOC_SOF_OF dependency Pierre-Louis Bossart
@ 2019-11-04 13:27   ` Mark Brown
  0 siblings, 0 replies; 27+ messages in thread
From: Mark Brown @ 2019-11-04 13:27 UTC (permalink / raw)
  To: Pierre-Louis Bossart
  Cc: tiwai, alsa-devel, Mark Brown, Randy Dunlap, Arnd Bergmann

The patch

   ASoC: SOF: imx: fix reverse CONFIG_SND_SOC_SOF_OF dependency

has been applied to the asoc tree at

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

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

From f9ad75468453b019b92c5296e6a04bf7c37f49e4 Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Fri, 1 Nov 2019 12:30:39 -0500
Subject: [PATCH] ASoC: SOF: imx: fix reverse CONFIG_SND_SOC_SOF_OF dependency

updated solution to the problem reported with randconfig:

CONFIG_SND_SOC_SOF_IMX depends on CONFIG_SND_SOC_SOF, but is in
turn referenced by the sof-of-dev driver. This creates a reverse
dependency that manifests in a link error when CONFIG_SND_SOC_SOF_OF
is built-in but CONFIG_SND_SOC_SOF_IMX=m:

sound/soc/sof/sof-of-dev.o:(.data+0x118): undefined reference to `sof_imx8_ops'

use def_trisate to propagate the right settings without select.

Fixes: f4df4e4042b0 ("ASoC: SOF: imx8: Fix COMPILE_TEST error")
Fixes: 202acc565a1f ("ASoC: SOF: imx: Add i.MX8 HW support")
Suggested-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191101173045.27099-6-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/sof/imx/Kconfig | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/sound/soc/sof/imx/Kconfig b/sound/soc/sof/imx/Kconfig
index 5acae75f5750..71f318bc2c74 100644
--- a/sound/soc/sof/imx/Kconfig
+++ b/sound/soc/sof/imx/Kconfig
@@ -11,8 +11,8 @@ config SND_SOC_SOF_IMX_TOPLEVEL
 
 if SND_SOC_SOF_IMX_TOPLEVEL
 
-config SND_SOC_SOF_IMX8
-	tristate "SOF support for i.MX8"
+config SND_SOC_SOF_IMX8_SUPPORT
+	bool "SOF support for i.MX8"
 	depends on IMX_SCU
 	depends on IMX_DSP
 	help
@@ -20,4 +20,8 @@ config SND_SOC_SOF_IMX8
           Say Y if you have such a device.
           If unsure select "N".
 
+config SND_SOC_SOF_IMX8
+	def_tristate SND_SOC_SOF_OF
+	depends on SND_SOC_SOF_IMX8_SUPPORT
+
 endif ## SND_SOC_SOF_IMX_IMX_TOPLEVEL
-- 
2.20.1

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [alsa-devel] Applied "ASoC: Intel: add mutual exclusion between SOF and legacy Baytrail driver" to the asoc tree
  2019-11-01 17:30 ` [alsa-devel] [PATCH 03/11] ASoC: Intel: add mutual exclusion between SOF and legacy Baytrail driver Pierre-Louis Bossart
@ 2019-11-04 13:27   ` Mark Brown
  2019-11-04 20:18   ` [alsa-devel] [PATCH 03/11] ASoC: Intel: add mutual exclusion between SOF and legacy Baytrail driver Cezary Rojewski
  1 sibling, 0 replies; 27+ messages in thread
From: Mark Brown @ 2019-11-04 13:27 UTC (permalink / raw)
  To: Pierre-Louis Bossart
  Cc: tiwai, alsa-devel, Mark Brown, Randy Dunlap, Arnd Bergmann

The patch

   ASoC: Intel: add mutual exclusion between SOF and legacy Baytrail driver

has been applied to the asoc tree at

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

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

From 280393b712b7e338addc2f7f60b4e4da787ba19b Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Fri, 1 Nov 2019 12:30:37 -0500
Subject: [PATCH] ASoC: Intel: add mutual exclusion between SOF and legacy
 Baytrail driver

This legacy driver is already deprecated, let's make sure there is no
conflict with SOF.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191101173045.27099-4-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/intel/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 93ebe1297e41..086fc60b2a14 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -65,7 +65,7 @@ config SND_SOC_INTEL_HASWELL
 
 config SND_SOC_INTEL_BAYTRAIL
 	tristate "Baytrail (legacy) Platforms"
-	depends on DMADEVICES && ACPI && SND_SST_ATOM_HIFI2_PLATFORM=n
+	depends on DMADEVICES && ACPI && SND_SST_ATOM_HIFI2_PLATFORM=n && SND_SOC_SOF_BAYTRAIL=n
 	select SND_SOC_INTEL_SST
 	select SND_SOC_INTEL_SST_ACPI
 	select SND_SOC_INTEL_SST_FIRMWARE
-- 
2.20.1

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [alsa-devel] Applied "ASoC: SOF: Intel: Baytrail: clarify mutual exclusion with Atom/SST driver" to the asoc tree
  2019-11-01 17:30 ` [alsa-devel] [PATCH 01/11] ASoC: SOF: Intel: Baytrail: clarify mutual exclusion with Atom/SST driver Pierre-Louis Bossart
@ 2019-11-04 13:27   ` Mark Brown
  0 siblings, 0 replies; 27+ messages in thread
From: Mark Brown @ 2019-11-04 13:27 UTC (permalink / raw)
  To: Pierre-Louis Bossart
  Cc: tiwai, alsa-devel, Mark Brown, Randy Dunlap, Arnd Bergmann

The patch

   ASoC: SOF: Intel: Baytrail: clarify mutual exclusion with Atom/SST driver

has been applied to the asoc tree at

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

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

From df7257e544faf838c3e7ad6b4e89ffe59e87f5e1 Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Fri, 1 Nov 2019 12:30:35 -0500
Subject: [PATCH] ASoC: SOF: Intel: Baytrail: clarify mutual exclusion with
 Atom/SST driver

Some distros select all options blindly, which leads to confusion and
bug reports. Since SOF does not support Baytrail-CR for now, and
UCM/topology files are still being propagated to downstream distros,
make SOF on Baytrail an opt-in option that first require distros to
opt-out of existing defaults.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191101173045.27099-2-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/intel/Kconfig     |  3 +++
 sound/soc/sof/intel/Kconfig | 10 +++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 01c99750212a..ba5b90e66e2f 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -101,6 +101,9 @@ config SND_SST_ATOM_HIFI2_PLATFORM_ACPI
 	  If you have a Intel Baytrail or Cherrytrail platform with an I2S
 	  codec, then enable this option by saying Y or m. This is a
 	  recommended option
+	  This option is mutually exclusive with the SOF support on
+	  Baytrail/Cherrytrail. If you want to enable SOF on
+	  Baytrail/Cherrytrail, you need to deselect this option first.
 
 config SND_SOC_INTEL_SKYLAKE
 	tristate "All Skylake/SST Platforms"
diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig
index d52298946c00..973c137a6c5a 100644
--- a/sound/soc/sof/intel/Kconfig
+++ b/sound/soc/sof/intel/Kconfig
@@ -62,10 +62,18 @@ if SND_SOC_SOF_INTEL_ACPI
 
 config SND_SOC_SOF_BAYTRAIL_SUPPORT
 	bool "SOF support for Baytrail, Braswell and Cherrytrail"
+	depends on SND_SST_ATOM_HIFI2_PLATFORM_ACPI=n
 	help
 	  This adds support for Sound Open Firmware for Intel(R) platforms
 	  using the Baytrail, Braswell or Cherrytrail processors.
-	  Say Y if you have such a device.
+	  This option is mutually exclusive with the Atom/SST and Baytrail
+	  legacy drivers. If you want to enable SOF on Baytrail/Cherrytrail,
+	  you need to deselect those options first.
+	  SOF does not support Baytrail-CR for now, so this option is not
+	  recommended for distros. At some point all legacy drivers will be
+	  deprecated but not before all userspace firmware/topology/UCM files
+	  are made available to downstream distros.
+	  Say Y if you want to enable SOF on Baytrail/Cherrytrail
 	  If unsure select "N".
 
 config SND_SOC_SOF_BAYTRAIL
-- 
2.20.1

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [alsa-devel] Applied "ASoC: SOF: Intel: Broadwell: clarify mutual exclusion with legacy driver" to the asoc tree
  2019-11-01 17:30 ` [alsa-devel] [PATCH 02/11] ASoC: SOF: Intel: Broadwell: clarify mutual exclusion with legacy driver Pierre-Louis Bossart
@ 2019-11-04 13:27   ` Mark Brown
  0 siblings, 0 replies; 27+ messages in thread
From: Mark Brown @ 2019-11-04 13:27 UTC (permalink / raw)
  To: Pierre-Louis Bossart
  Cc: tiwai, alsa-devel, Mark Brown, Randy Dunlap, Arnd Bergmann

The patch

   ASoC: SOF: Intel: Broadwell: clarify mutual exclusion with legacy driver

has been applied to the asoc tree at

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

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

From a6955fe0e2309feeab5ec71e4b0dcbe498f4f497 Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Fri, 1 Nov 2019 12:30:36 -0500
Subject: [PATCH] ASoC: SOF: Intel: Broadwell: clarify mutual exclusion with
 legacy driver

Some distros select all options blindly, which leads to confusion and
bug reports. SOF does not fully support Broadwell due to firmware
dependencies, the machine drivers can only support one option, and
UCM/topology files are still being propagated to downstream distros,
so make SOF on Broadwell an opt-in option that first require distros
to opt-out of existing defaults.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=204237
Fixes: f35bf70f61d3 ('ASoC: Intel: Make sure BDW based machine drivers build for SOF')
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191101173045.27099-3-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/intel/Kconfig     |  3 +++
 sound/soc/sof/intel/Kconfig | 10 +++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index ba5b90e66e2f..93ebe1297e41 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -59,6 +59,9 @@ config SND_SOC_INTEL_HASWELL
 	  If you have a Intel Haswell or Broadwell platform connected to
 	  an I2S codec, then enable this option by saying Y or m. This is
 	  typically used for Chromebooks. This is a recommended option.
+	  This option is mutually exclusive with the SOF support on
+	  Broadwell. If you want to enable SOF on Broadwell, you need to
+	  deselect this option first.
 
 config SND_SOC_INTEL_BAYTRAIL
 	tristate "Baytrail (legacy) Platforms"
diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig
index 973c137a6c5a..cd9954bfec0b 100644
--- a/sound/soc/sof/intel/Kconfig
+++ b/sound/soc/sof/intel/Kconfig
@@ -85,10 +85,18 @@ config SND_SOC_SOF_BAYTRAIL
 
 config SND_SOC_SOF_BROADWELL_SUPPORT
 	bool "SOF support for Broadwell"
+	depends on SND_SOC_INTEL_HASWELL=n
 	help
 	  This adds support for Sound Open Firmware for Intel(R) platforms
 	  using the Broadwell processors.
-	  Say Y if you have such a device.
+	  This option is mutually exclusive with the Haswell/Broadwell legacy
+	  driver. If you want to enable SOF on Broadwell you need to deselect
+	  the legacy driver first.
+	  SOF does fully support Broadwell yet, so this option is not
+	  recommended for distros. At some point all legacy drivers will be
+	  deprecated but not before all userspace firmware/topology/UCM files
+	  are made available to downstream distros.
+	  Say Y if you want to enable SOF on Broadwell
 	  If unsure select "N".
 
 config SND_SOC_SOF_BROADWELL
-- 
2.20.1

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [alsa-devel] [PATCH 03/11] ASoC: Intel: add mutual exclusion between SOF and legacy Baytrail driver
  2019-11-01 17:30 ` [alsa-devel] [PATCH 03/11] ASoC: Intel: add mutual exclusion between SOF and legacy Baytrail driver Pierre-Louis Bossart
  2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: Intel: add mutual exclusion between SOF and legacy Baytrail driver" to the asoc tree Mark Brown
@ 2019-11-04 20:18   ` Cezary Rojewski
  2019-11-04 21:52     ` Pierre-Louis Bossart
  1 sibling, 1 reply; 27+ messages in thread
From: Cezary Rojewski @ 2019-11-04 20:18 UTC (permalink / raw)
  To: Pierre-Louis Bossart
  Cc: tiwai, alsa-devel, broonie, Randy Dunlap, Arnd Bergmann

On 2019-11-01 18:30, Pierre-Louis Bossart wrote:
> This legacy driver is already deprecated, let's make sure there is no
> conflict with SOF.
> 
> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

Pierre, with SOF replacing /atom and /baytrail for BYT platforms, is 
/baytrail (legacy) used on any of the setups officially? While @ IGK I'm 
playing with anything from HSW up to TGL and above, /baytrail gets 
skipped entirely, even here.

Czarek
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [alsa-devel] [PATCH 03/11] ASoC: Intel: add mutual exclusion between SOF and legacy Baytrail driver
  2019-11-04 20:18   ` [alsa-devel] [PATCH 03/11] ASoC: Intel: add mutual exclusion between SOF and legacy Baytrail driver Cezary Rojewski
@ 2019-11-04 21:52     ` Pierre-Louis Bossart
  2019-11-08 17:44       ` Cezary Rojewski
  0 siblings, 1 reply; 27+ messages in thread
From: Pierre-Louis Bossart @ 2019-11-04 21:52 UTC (permalink / raw)
  To: Cezary Rojewski; +Cc: tiwai, alsa-devel, broonie, Randy Dunlap, Arnd Bergmann



On 11/4/19 2:18 PM, Cezary Rojewski wrote:
> On 2019-11-01 18:30, Pierre-Louis Bossart wrote:
>> This legacy driver is already deprecated, let's make sure there is no
>> conflict with SOF.
>>
>> Signed-off-by: Pierre-Louis Bossart 
>> <pierre-louis.bossart@linux.intel.com>
> 
> Pierre, with SOF replacing /atom and /baytrail for BYT platforms, is 
> /baytrail (legacy) used on any of the setups officially? While @ IGK I'm 
> playing with anything from HSW up to TGL and above, /baytrail gets 
> skipped entirely, even here.

The legacy Baytrail driver is still used by Baytrail Chromebooks, and 
that choice is not something we control. If Google transition to SOF for 
Baytrail, then we can remove this driver altogether.
The Atom Baytrail driver is enabled by default (default ACPI). Only when 
we have support for Baytrail-CR can we deprecate Baytrail/Atom.
Does this answer to your question?
-Pierre
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [alsa-devel] [PATCH 03/11] ASoC: Intel: add mutual exclusion between SOF and legacy Baytrail driver
  2019-11-04 21:52     ` Pierre-Louis Bossart
@ 2019-11-08 17:44       ` Cezary Rojewski
  2019-11-08 19:24         ` Curtis Malainey
  0 siblings, 1 reply; 27+ messages in thread
From: Cezary Rojewski @ 2019-11-08 17:44 UTC (permalink / raw)
  To: Pierre-Louis Bossart
  Cc: tiwai, alsa-devel, broonie, Randy Dunlap, Arnd Bergmann

On 2019-11-04 22:52, Pierre-Louis Bossart wrote:
> 
> 
> On 11/4/19 2:18 PM, Cezary Rojewski wrote:
>> On 2019-11-01 18:30, Pierre-Louis Bossart wrote:
>>> This legacy driver is already deprecated, let's make sure there is no
>>> conflict with SOF.
>>>
>>> Signed-off-by: Pierre-Louis Bossart 
>>> <pierre-louis.bossart@linux.intel.com>
>>
>> Pierre, with SOF replacing /atom and /baytrail for BYT platforms, is 
>> /baytrail (legacy) used on any of the setups officially? While @ IGK 
>> I'm playing with anything from HSW up to TGL and above, /baytrail gets 
>> skipped entirely, even here.
> 
> The legacy Baytrail driver is still used by Baytrail Chromebooks, and 
> that choice is not something we control. If Google transition to SOF for 
> Baytrail, then we can remove this driver altogether.
> The Atom Baytrail driver is enabled by default (default ACPI). Only when 
> we have support for Baytrail-CR can we deprecate Baytrail/Atom.
> Does this answer to your question?
> -Pierre

Thanks for explanation, Pierre. Indeed it does.
I hoped Baytrails are getting updated together with Cherrytrails, oh well.
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [alsa-devel] [PATCH 03/11] ASoC: Intel: add mutual exclusion between SOF and legacy Baytrail driver
  2019-11-08 17:44       ` Cezary Rojewski
@ 2019-11-08 19:24         ` Curtis Malainey
  0 siblings, 0 replies; 27+ messages in thread
From: Curtis Malainey @ 2019-11-08 19:24 UTC (permalink / raw)
  To: Cezary Rojewski
  Cc: ALSA development, Arnd Bergmann, Takashi Iwai, Randy Dunlap,
	Pierre-Louis Bossart, Mark Brown

On Fri, Nov 8, 2019 at 9:45 AM Cezary Rojewski
<cezary.rojewski@intel.com> wrote:
>
> On 2019-11-04 22:52, Pierre-Louis Bossart wrote:
> >
> >
> > On 11/4/19 2:18 PM, Cezary Rojewski wrote:
> >> On 2019-11-01 18:30, Pierre-Louis Bossart wrote:
> >>> This legacy driver is already deprecated, let's make sure there is no
> >>> conflict with SOF.
> >>>
> >>> Signed-off-by: Pierre-Louis Bossart
> >>> <pierre-louis.bossart@linux.intel.com>
> >>
> >> Pierre, with SOF replacing /atom and /baytrail for BYT platforms, is
> >> /baytrail (legacy) used on any of the setups officially? While @ IGK
> >> I'm playing with anything from HSW up to TGL and above, /baytrail gets
> >> skipped entirely, even here.
> >
> > The legacy Baytrail driver is still used by Baytrail Chromebooks, and
> > that choice is not something we control. If Google transition to SOF for
> > Baytrail, then we can remove this driver altogether.
> > The Atom Baytrail driver is enabled by default (default ACPI). Only when
> > we have support for Baytrail-CR can we deprecate Baytrail/Atom.
> > Does this answer to your question?
> > -Pierre
>
> Thanks for explanation, Pierre. Indeed it does.
> I hoped Baytrails are getting updated together with Cherrytrails, oh well.
Should I get the chance, I fully intended to promote baytrail to SOF,
unfortunately I also have a lot of other projects I am balancing.
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply	[flat|nested] 27+ messages in thread

end of thread, back to index

Thread overview: 27+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-01 17:30 [alsa-devel] [PATCH 00/11] ASoC: SOF/Intel: Kconfig improvements/fixes Pierre-Louis Bossart
2019-11-01 17:30 ` [alsa-devel] [PATCH 01/11] ASoC: SOF: Intel: Baytrail: clarify mutual exclusion with Atom/SST driver Pierre-Louis Bossart
2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: SOF: Intel: Baytrail: clarify mutual exclusion with Atom/SST driver" to the asoc tree Mark Brown
2019-11-01 17:30 ` [alsa-devel] [PATCH 02/11] ASoC: SOF: Intel: Broadwell: clarify mutual exclusion with legacy driver Pierre-Louis Bossart
2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: SOF: Intel: Broadwell: clarify mutual exclusion with legacy driver" to the asoc tree Mark Brown
2019-11-01 17:30 ` [alsa-devel] [PATCH 03/11] ASoC: Intel: add mutual exclusion between SOF and legacy Baytrail driver Pierre-Louis Bossart
2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: Intel: add mutual exclusion between SOF and legacy Baytrail driver" to the asoc tree Mark Brown
2019-11-04 20:18   ` [alsa-devel] [PATCH 03/11] ASoC: Intel: add mutual exclusion between SOF and legacy Baytrail driver Cezary Rojewski
2019-11-04 21:52     ` Pierre-Louis Bossart
2019-11-08 17:44       ` Cezary Rojewski
2019-11-08 19:24         ` Curtis Malainey
2019-11-01 17:30 ` [alsa-devel] [PATCH 04/11] ASoC: SOF: Kconfig: add EXPERT dependency for developer options, clarify help Pierre-Louis Bossart
2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: SOF: Kconfig: add EXPERT dependency for developer options, clarify help" to the asoc tree Mark Brown
2019-11-01 17:30 ` [alsa-devel] [PATCH 05/11] ASoC: SOF: imx: fix reverse CONFIG_SND_SOC_SOF_OF dependency Pierre-Louis Bossart
2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: SOF: imx: fix reverse CONFIG_SND_SOC_SOF_OF dependency" to the asoc tree Mark Brown
2019-11-01 17:30 ` [alsa-devel] [PATCH 06/11] ASoC: SOF: Intel: use def_tristate, avoid using select Pierre-Louis Bossart
2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: SOF: Intel: use def_tristate, avoid using select" to the asoc tree Mark Brown
2019-11-01 17:30 ` [alsa-devel] [PATCH 07/11] ASoC: Intel: Skylake: mark HDAudio codec support as deprecated Pierre-Louis Bossart
2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: Intel: Skylake: mark HDAudio codec support as deprecated." to the asoc tree Mark Brown
2019-11-01 17:30 ` [alsa-devel] [PATCH 08/11] ASoC: Intel: boards: remove select SND_HDA_DSP_LOADER Pierre-Louis Bossart
2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: Intel: boards: remove select SND_HDA_DSP_LOADER" to the asoc tree Mark Brown
2019-11-01 17:30 ` [alsa-devel] [PATCH 09/11] ASoC: Intel: boards: fix configs for bxt-da7219-max98057a Pierre-Louis Bossart
2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: Intel: boards: fix configs for bxt-da7219-max98057a" to the asoc tree Mark Brown
2019-11-01 17:30 ` [alsa-devel] [PATCH 10/11] ASoC: Intel: boards: Geminilake is only supported by SOF Pierre-Louis Bossart
2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: Intel: boards: Geminilake is only supported by SOF" to the asoc tree Mark Brown
2019-11-01 17:30 ` [alsa-devel] [PATCH 11/11] ASoC: Intel: boards: sof_rt5682: use dependency on SOF_HDA_LINK Pierre-Louis Bossart
2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: Intel: boards: sof_rt5682: use dependency on SOF_HDA_LINK" to the asoc tree Mark Brown

Alsa-Devel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/alsa-devel/0 alsa-devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 alsa-devel alsa-devel/ https://lore.kernel.org/alsa-devel \
		alsa-devel@alsa-project.org
	public-inbox-index alsa-devel

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.alsa-project.alsa-devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git