diff mbox series

[21/21] ASoC: SOF: Add Build support for SOF core and Intel drivers

Message ID 20181211213029.28801-22-pierre-louis.bossart@linux.intel.com (mailing list archive)
State New, archived
Headers show
Series Sound Open Firmware (SOF) - Intel support | expand

Commit Message

Pierre-Louis Bossart Dec. 11, 2018, 9:30 p.m. UTC 
From: Liam Girdwood <liam.r.girdwood@linux.intel.com>

Build SOF core and Intel-specific drivers.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 sound/soc/Kconfig            |   1 +
 sound/soc/Makefile           |   1 +
 sound/soc/sof/Kconfig        |  82 +++++++++++++++++++++
 sound/soc/sof/Makefile       |  17 +++++
 sound/soc/sof/intel/Kconfig  | 136 +++++++++++++++++++++++++++++++++++
 sound/soc/sof/intel/Makefile |  17 +++++
 6 files changed, 254 insertions(+)
 create mode 100644 sound/soc/sof/Kconfig
 create mode 100644 sound/soc/sof/Makefile
 create mode 100644 sound/soc/sof/intel/Kconfig
 create mode 100644 sound/soc/sof/intel/Makefile

Comments

Takashi Iwai Dec. 12, 2018, 11:50 a.m. UTC | #1 
On Tue, 11 Dec 2018 22:30:29 +0100,
Pierre-Louis Bossart wrote:
> 
> --- /dev/null
> +++ b/sound/soc/sof/Kconfig
> @@ -0,0 +1,82 @@
> +config SND_SOC_SOF_PCI
> +	tristate
> +
> +config SND_SOC_SOF_ACPI
> +	tristate
> +
> +config SND_SOC_SOF
> +	tristate "Sound Open Firmware Support"
> +	select SND_SOC_TOPOLOGY
> +	help
> +          This adds support for Sound Open Firmware (SOF). SOF is a free and
> +	  generic open source audio DSP firmware for multiple devices.
> +          Say Y if you have such a device that is supported by SOF.
> +          If unsure select "N".

You can put
  if SND_SOC_SOF
at this point.  This will reduce lots of "depends on SND_SOC_SOF"
lines.

> +config SND_SOC_SOF_NOCODEC
> +	tristate "SOF nocodec mode Support"
> +	depends on SND_SOC_SOF
....
> +source "sound/soc/sof/intel/Kconfig"
> +source "sound/soc/sof/xtensa/Kconfig"

... the endif for SND_SOC_SOF can be put here, then both Kconfigs are
covered by SND_SOC_SOF condition.


OTOH, the usage of if-block below is an overkill.

> --- /dev/null
> +++ b/sound/soc/sof/intel/Kconfig
....
> +if SND_SOC_SOF_HDA_COMMON
> +
> +config SND_SOC_SOF_HDA_LINK
> +	bool "SOF support for HDA Links(HDA/HDMI)"
> +	help
> +          This adds support for HDA links(HDA/HDMI) with Sound Open Firmware
> +		  for Intel(R) platforms.
> +          Say Y if you want to enble HDA links with SOF.
> +          If unsure select "N".
> +
> +if SND_SOC_SOF_HDA_LINK
> +config SND_SOC_SOF_HDA_AUDIO_CODEC
> +	bool "SOF support for HDAudio codecs"
> +	help
> +          This adds support for HDAudio codecs with Sound Open Firmware
> +		  for Intel(R) platforms.
> +          Say Y if you want to enble HDAudio codecs with SOF.
> +          If unsure select "N".
> +endif ## SND_SOC_SOF_HDA_LINK
> +
> +endif ## SND_SOC_SOF_HDA_COMMON

For single items, just use depends on.  It's easier to read.


thanks,

Takashi
Pierre-Louis Bossart Dec. 12, 2018, 2:51 p.m. UTC | #2 
On 12/12/18 5:50 AM, Takashi Iwai wrote:
> On Tue, 11 Dec 2018 22:30:29 +0100,
> Pierre-Louis Bossart wrote:
>> --- /dev/null
>> +++ b/sound/soc/sof/Kconfig
>> @@ -0,0 +1,82 @@
>> +config SND_SOC_SOF_PCI
>> +	tristate
>> +
>> +config SND_SOC_SOF_ACPI
>> +	tristate
>> +
>> +config SND_SOC_SOF
>> +	tristate "Sound Open Firmware Support"
>> +	select SND_SOC_TOPOLOGY
>> +	help
>> +          This adds support for Sound Open Firmware (SOF). SOF is a free and
>> +	  generic open source audio DSP firmware for multiple devices.
>> +          Say Y if you have such a device that is supported by SOF.
>> +          If unsure select "N".
> You can put
>    if SND_SOC_SOF
> at this point.  This will reduce lots of "depends on SND_SOC_SOF"
> lines.
Yes. I tend to use 'ifs' and others 'depends on', will align.
>
>> +config SND_SOC_SOF_NOCODEC
>> +	tristate "SOF nocodec mode Support"
>> +	depends on SND_SOC_SOF
> ....
>> +source "sound/soc/sof/intel/Kconfig"
>> +source "sound/soc/sof/xtensa/Kconfig"
> ... the endif for SND_SOC_SOF can be put here, then both Kconfigs are
> covered by SND_SOC_SOF condition.
>
>
> OTOH, the usage of if-block below is an overkill.
>
>> --- /dev/null
>> +++ b/sound/soc/sof/intel/Kconfig
> ....
>> +if SND_SOC_SOF_HDA_COMMON
>> +
>> +config SND_SOC_SOF_HDA_LINK
>> +	bool "SOF support for HDA Links(HDA/HDMI)"
>> +	help
>> +          This adds support for HDA links(HDA/HDMI) with Sound Open Firmware
>> +		  for Intel(R) platforms.
>> +          Say Y if you want to enble HDA links with SOF.
>> +          If unsure select "N".
>> +
>> +if SND_SOC_SOF_HDA_LINK
>> +config SND_SOC_SOF_HDA_AUDIO_CODEC
>> +	bool "SOF support for HDAudio codecs"
>> +	help
>> +          This adds support for HDAudio codecs with Sound Open Firmware
>> +		  for Intel(R) platforms.
>> +          Say Y if you want to enble HDAudio codecs with SOF.
>> +          If unsure select "N".
>> +endif ## SND_SOC_SOF_HDA_LINK
>> +
>> +endif ## SND_SOC_SOF_HDA_COMMON
> For single items, just use depends on.  It's easier to read.
Agree, we could remove the nested one. I tend to use 'ifs' when there 
are two or more configs, here it's not really needed.
diff mbox series

Patch

diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
index 1cf11cf51e1d..32eab7d21aaa 100644
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@ -65,6 +65,7 @@  source "sound/soc/rockchip/Kconfig"
 source "sound/soc/samsung/Kconfig"
 source "sound/soc/sh/Kconfig"
 source "sound/soc/sirf/Kconfig"
+source "sound/soc/sof/Kconfig"
 source "sound/soc/spear/Kconfig"
 source "sound/soc/sti/Kconfig"
 source "sound/soc/stm/Kconfig"
diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index 62a5f87c3cfc..cb336e803d5a 100644
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -49,6 +49,7 @@  obj-$(CONFIG_SND_SOC)	+= rockchip/
 obj-$(CONFIG_SND_SOC)	+= samsung/
 obj-$(CONFIG_SND_SOC)	+= sh/
 obj-$(CONFIG_SND_SOC)	+= sirf/
+obj-$(CONFIG_SND_SOC)	+= sof/
 obj-$(CONFIG_SND_SOC)	+= spear/
 obj-$(CONFIG_SND_SOC)	+= sti/
 obj-$(CONFIG_SND_SOC)	+= stm/
diff --git a/sound/soc/sof/Kconfig b/sound/soc/sof/Kconfig
new file mode 100644
index 000000000000..1742df4e2536
--- /dev/null
+++ b/sound/soc/sof/Kconfig
@@ -0,0 +1,82 @@ 
+config SND_SOC_SOF_PCI
+	tristate
+
+config SND_SOC_SOF_ACPI
+	tristate
+
+config SND_SOC_SOF
+	tristate "Sound Open Firmware Support"
+	select SND_SOC_TOPOLOGY
+	help
+          This adds support for Sound Open Firmware (SOF). SOF is a free and
+	  generic open source audio DSP firmware for multiple devices.
+          Say Y if you have such a device that is supported by SOF.
+          If unsure select "N".
+
+config SND_SOC_SOF_NOCODEC
+	tristate "SOF nocodec mode Support"
+	depends on SND_SOC_SOF
+	help
+          This adds support for a dummy/nocodec machine driver fallback
+	  option if no known codec is detected. This is typically only
+	  enabled for developers or devices where the sound card is
+	  controlled externally
+          Say Y if you need this nocodec fallback option
+          If unsure select "N".
+
+config SND_SOC_SOF_DEBUG
+	bool "SOF debugging features"
+	depends on SND_SOC_SOF
+	help
+	  This option can be used to enable or disable individual SOF firmware
+	  and driver debugging options.
+	  Say Y if you are debugging SOF FW or drivers.
+          If unsure select "N".
+
+config SND_SOC_SOF_FORCE_NOCODEC_MODE
+	bool "SOF force nocodec Mode"
+	depends on SND_SOC_SOF_NOCODEC
+	depends on SND_SOC_SOF_DEBUG
+	help
+          This forces SOF to use dummy/nocodec as machine driver, even
+	  though there is a codec detected on the real platform. This is
+	  typically only enabled for developers for debug purposes, before
+	  codec/machine driver is ready, or to exclude the impact of those
+	  drivers
+          Say Y if you need this force nocodec mode option
+          If unsure select "N".
+
+config SND_SOC_SOF_DEBUG_XRUN_STOP
+	bool "SOF stop on XRUN"
+	depends on SND_SOC_SOF_DEBUG
+	help
+	  This option forces PCMs to stop on any XRUN event. This is useful to
+	  preserve any trace data ond pipeline status prior to the XRUN.
+	  Say Y if you are debugging SOF FW pipeline XRUNs.
+          If unsure select "N".
+
+config SND_SOC_SOF_DEBUG_VERBOSE_IPC
+	bool "SOF verbose IPC logs"
+	depends on SND_SOC_SOF_DEBUG
+	help
+	  This option enables more verbose IPC logs, with command types in
+	  human-readable form instead of just 32-bit hex dumps. This is useful
+	  if you are trying to debug IPC with the DSP firmware.
+          If unsure select "N".
+
+config SND_SOC_SOF_DEBUG_FORCE_IPC_POSITION
+	bool "SOF force to use IPC for position update on SKL+"
+	depends on SND_SOC_SOF_DEBUG
+	default n
+	help
+	  This option force to handle stream position update IPCs and run pcm
+	  elapse to inform ALSA about that, on platforms (e.g. Intel SKL+) that
+	  with other approach (e.g. HDAC DPIB/posbuf) to elapse PCM.
+	  On platforms (e.g. Intel SKL-) where position update IPC is the only
+	  one choice, this setting won't impact anything.
+	  if you are trying to debug pointer update with position IPCs or where
+	  DPIB/posbuf is not ready, select "Y".
+          If unsure select "N".
+
+source "sound/soc/sof/intel/Kconfig"
+source "sound/soc/sof/xtensa/Kconfig"
diff --git a/sound/soc/sof/Makefile b/sound/soc/sof/Makefile
new file mode 100644
index 000000000000..2831e6257cb8
--- /dev/null
+++ b/sound/soc/sof/Makefile
@@ -0,0 +1,17 @@ 
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
+
+snd-sof-objs := core.o ops.o loader.o ipc.o pcm.o pm.o debug.o topology.o\
+		control.o trace.o utils.o
+
+snd-sof-pci-objs := sof-pci-dev.o
+snd-sof-acpi-objs := sof-acpi-dev.o
+snd-sof-nocodec-objs := nocodec.o
+
+obj-$(CONFIG_SND_SOC_SOF) += snd-sof.o
+obj-$(CONFIG_SND_SOC_SOF_NOCODEC) += snd-sof-nocodec.o
+
+obj-$(CONFIG_SND_SOC_SOF_ACPI) += sof-acpi-dev.o
+obj-$(CONFIG_SND_SOC_SOF_PCI) += sof-pci-dev.o
+
+obj-$(CONFIG_SND_SOC_SOF_INTEL)	+= intel/
+obj-$(CONFIG_SND_SOC_SOF_XTENSA) += xtensa/
diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig
new file mode 100644
index 000000000000..23b7c5915aac
--- /dev/null
+++ b/sound/soc/sof/intel/Kconfig
@@ -0,0 +1,136 @@ 
+config SND_SOC_SOF_INTEL
+	tristate "SOF support for Intel audio DSPs"
+	depends on SND_SOC_SOF
+	depends on SND_DMA_SGBUF
+	select SND_SOC_INTEL_MACH
+	select SND_SOC_SOF_XTENSA
+	help
+          This adds support for Sound Open Firmware for Intel(R) platforms.
+          Say Y if you have such a device.
+          If unsure select "N".
+
+if SND_SOC_SOF_INTEL
+
+config SND_SOC_SOF_BAYTRAIL
+	tristate "SOF support for Baytrail, Braswell and Cherrytrail"
+	select SND_SOC_SOF_ACPI
+	select SND_SOC_ACPI_INTEL_MATCH
+	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.
+          If unsure select "N".
+
+config SND_SOC_SOF_HASWELL
+	tristate "SOF support for Haswell"
+	select SND_SOC_SOF_ACPI
+	select SND_SOC_ACPI_INTEL_MATCH
+	help
+          This adds support for Sound Open Firmware for Intel(R) platforms
+          using the Haswell processors.
+          Say Y if you have such a device.
+          If unsure select "N".
+
+config SND_SOC_SOF_BROADWELL
+	tristate "SOF support for Broadwell"
+	depends on SND_SOC_SOF_INTEL
+	select SND_SOC_SOF_ACPI
+	select SND_SOC_ACPI_INTEL_MATCH
+	help
+          This adds support for Sound Open Firmware for Intel(R) platforms
+          using the Broadwell processors.
+          Say Y if you have such a device.
+          If unsure select "N".
+
+config SND_SOC_SOF_APOLLOLAKE
+	tristate "SOF support for Apollolake"
+	select SND_SOC_SOF_HDA_COMMON
+	help
+          This adds support for Sound Open Firmware for Intel(R) platforms
+          using the Apollolake processors.
+          Say Y if you have such a device.
+          If unsure select "N".
+
+config SND_SOC_SOF_GEMINILAKE
+	tristate "SOF support for GeminiLake"
+	select SND_SOC_SOF_HDA_COMMON
+	help
+          This adds support for Sound Open Firmware for Intel(R) platforms
+          using the Geminilake processors.
+          Say Y if you have such a device.
+          If unsure select "N".
+
+config SND_SOC_SOF_CANNONLAKE
+	tristate "SOF support for Cannonlake"
+	select SND_SOC_SOF_HDA_COMMON
+	help
+          This adds support for Sound Open Firmware for Intel(R) platforms
+          using the Cannonlake processors.
+          Say Y if you have such a device.
+          If unsure select "N".
+
+config SND_SOC_SOF_KABYLAKE
+	tristate "SOF support for Kabylake"
+	select SND_SOC_SOF_HDA_COMMON
+	help
+          This adds support for Sound Open Firmware for Intel(R) platforms
+          using the Kabylake processors.
+          Say Y if you have such a device.
+          If unsure select "N".
+
+config SND_SOC_SOF_SKYLAKE
+	tristate "SOF support for Skylake"
+	select SND_SOC_SOF_HDA_COMMON
+	help
+          This adds support for Sound Open Firmware for Intel(R) platforms
+          using the Skylake processors.
+          Say Y if you have such a device.
+          If unsure select "N".
+
+config SND_SOC_SOF_ICELAKE
+	tristate "SOF support for Icelake"
+	select SND_SOC_SOF_HDA_COMMON
+	help
+          This adds support for Sound Open Firmware for Intel(R) platforms
+          using the Icelake processors.
+          Say Y if you have such a device.
+          If unsure select "N".
+
+config SND_SOC_SOF_HDA_COMMON
+	tristate
+	select SND_SOC_SOF_PCI
+	select SND_SOC_ACPI_INTEL_MATCH
+	select SND_SOC_SOF_HDA_LINK_BASELINE
+
+if SND_SOC_SOF_HDA_COMMON
+
+config SND_SOC_SOF_HDA_LINK
+	bool "SOF support for HDA Links(HDA/HDMI)"
+	help
+          This adds support for HDA links(HDA/HDMI) with Sound Open Firmware
+		  for Intel(R) platforms.
+          Say Y if you want to enble HDA links with SOF.
+          If unsure select "N".
+
+if SND_SOC_SOF_HDA_LINK
+config SND_SOC_SOF_HDA_AUDIO_CODEC
+	bool "SOF support for HDAudio codecs"
+	help
+          This adds support for HDAudio codecs with Sound Open Firmware
+		  for Intel(R) platforms.
+          Say Y if you want to enble HDAudio codecs with SOF.
+          If unsure select "N".
+endif ## SND_SOC_SOF_HDA_LINK
+
+endif ## SND_SOC_SOF_HDA_COMMON
+
+config SND_SOC_SOF_HDA_LINK_BASELINE
+	tristate
+	select SND_SOC_SOF_HDA if SND_SOC_SOF_HDA_LINK
+
+config SND_SOC_SOF_HDA
+	tristate
+	select SND_HDA_EXT_CORE if SND_SOC_SOF_HDA_LINK
+	select SND_SOC_HDAC_HDA if SND_SOC_SOF_HDA_AUDIO_CODEC
+
+endif ## SND_SOC_SOF_INTEL
diff --git a/sound/soc/sof/intel/Makefile b/sound/soc/sof/intel/Makefile
new file mode 100644
index 000000000000..78f5fb3d3571
--- /dev/null
+++ b/sound/soc/sof/intel/Makefile
@@ -0,0 +1,17 @@ 
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
+
+snd-sof-intel-byt-objs := byt.o
+snd-sof-intel-hsw-objs := hsw.o
+snd-sof-intel-bdw-objs := bdw.o
+snd-sof-intel-hda-common-objs := hda.o hda-loader.o hda-stream.o hda-trace.o \
+				 hda-dsp.o hda-ipc.o hda-ctrl.o hda-pcm.o \
+				 hda-dai.o hda-bus.o hda-loader-skl.o \
+				 skl.o apl.o cnl.o
+
+snd-sof-intel-hda-objs := hda-codec.o
+
+obj-$(CONFIG_SND_SOC_SOF_BAYTRAIL) += snd-sof-intel-byt.o
+obj-$(CONFIG_SND_SOC_SOF_HASWELL) += snd-sof-intel-hsw.o
+obj-$(CONFIG_SND_SOC_SOF_BROADWELL) += snd-sof-intel-bdw.o
+obj-$(CONFIG_SND_SOC_SOF_HDA_COMMON) += snd-sof-intel-hda-common.o
+obj-$(CONFIG_SND_SOC_SOF_HDA) += snd-sof-intel-hda.o