Loopback mode kcontrol support

drivers/acpi/blacklist.c

@@ -91,6 +91,7 @@ static int __init dmi_enable_rev_override(const struct dmi_system_id *d)
 
 static const struct dmi_system_id acpi_rev_dmi_table[] __initconst = {
 #ifdef CONFIG_ACPI_REV_OVERRIDE_POSSIBLE
+#if !IS_ENABLED(CONFIG_SND_SOC_SOF_INTEL)
  /*
  * DELL XPS 13 (2015) switches sound between HDA and I2S
  * depending on the ACPI _REV callback. If userspace supports
@@ -105,6 +106,7 @@ static const struct dmi_system_id acpi_rev_dmi_table[] __initconst = {
  DMI_MATCH(DMI_PRODUCT_NAME, "XPS 13 9343"),
  },
  },
+#endif
  {
  .callback = dmi_enable_rev_override,
  .ident = "DELL Precision 5520",

include/sound/pcm.h

@@ -462,6 +462,7 @@ struct snd_pcm_substream {
  /* -- timer section -- */
  struct snd_timer *timer; /* timer */
  unsigned timer_running: 1; /* time is running */
+ unsigned wait_time; /* time in ms for R/W to wait for avail */
  /* -- next substream -- */
  struct snd_pcm_substream *next;
  /* -- linked substreams -- */
@@ -579,6 +580,11 @@ int snd_pcm_start(struct snd_pcm_substream *substream);
 int snd_pcm_stop(struct snd_pcm_substream *substream, snd_pcm_state_t status);
 int snd_pcm_drain_done(struct snd_pcm_substream *substream);
 int snd_pcm_stop_xrun(struct snd_pcm_substream *substream);
+static inline void snd_pcm_wait_time(struct snd_pcm_substream *substream,
+ unsigned wait_time)
+{
+ substream->wait_time = wait_time;
+}
 #ifdef CONFIG_PM
 int snd_pcm_suspend(struct snd_pcm_substream *substream);
 int snd_pcm_suspend_all(struct snd_pcm *pcm);

include/sound/soc-acpi-intel-match.h

@@ -29,5 +29,11 @@ extern struct snd_soc_acpi_mach snd_soc_acpi_intel_broadwell_machines[];
 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_legacy_machines[];
 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_machines[];
 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[];
+extern struct snd_soc_acpi_mach snd_soc_acpi_intel_skl_machines[];
+extern struct snd_soc_acpi_mach snd_soc_acpi_intel_kbl_machines[];
+extern struct snd_soc_acpi_mach snd_soc_acpi_intel_bxt_machines[];
+extern struct snd_soc_acpi_mach snd_soc_acpi_intel_glk_machines[];
+extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_machines[];
+extern struct snd_soc_acpi_mach snd_soc_acpi_intel_icl_machines[];
 
 #endif

include/sound/soc-topology.h

@@ -30,6 +30,9 @@ struct snd_soc_dapm_context;
 struct snd_soc_card;
 struct snd_kcontrol_new;
 struct snd_soc_dai_link;
+struct snd_soc_dai_driver;
+struct snd_soc_dai;
+struct snd_soc_dapm_route;
 
 /* object scan be loaded and unloaded in groups with identfying indexes */
 #define SND_SOC_TPLG_INDEX_ALL 0 /* ID that matches all FW objects */
@@ -109,35 +112,44 @@ struct snd_soc_tplg_widget_events {
 struct snd_soc_tplg_ops {
 
  /* external kcontrol init - used for any driver specific init */
- int (*control_load)(struct snd_soc_component *,
+ int (*control_load)(struct snd_soc_component *, int index,
  struct snd_kcontrol_new *, struct snd_soc_tplg_ctl_hdr *);
  int (*control_unload)(struct snd_soc_component *,
  struct snd_soc_dobj *);
 
+ /* DAPM graph route element loading and unloading */
+ int (*dapm_route_load)(struct snd_soc_component *, int index,
+ struct snd_soc_dapm_route *route);
+ int (*dapm_route_unload)(struct snd_soc_component *,
+ struct snd_soc_dobj *);
+
  /* external widget init - used for any driver specific init */
- int (*widget_load)(struct snd_soc_component *,
+ int (*widget_load)(struct snd_soc_component *, int index,
  struct snd_soc_dapm_widget *,
  struct snd_soc_tplg_dapm_widget *);
- int (*widget_ready)(struct snd_soc_component *,
+ int (*widget_ready)(struct snd_soc_component *, int index,
  struct snd_soc_dapm_widget *,
  struct snd_soc_tplg_dapm_widget *);
  int (*widget_unload)(struct snd_soc_component *,
  struct snd_soc_dobj *);
 
  /* FE DAI - used for any driver specific init */
- int (*dai_load)(struct snd_soc_component *,
- struct snd_soc_dai_driver *dai_drv);
+ int (*dai_load)(struct snd_soc_component *, int index,
+ struct snd_soc_dai_driver *dai_drv,
+ struct snd_soc_tplg_pcm *pcm, struct snd_soc_dai *dai);
+
  int (*dai_unload)(struct snd_soc_component *,
  struct snd_soc_dobj *);
 
  /* DAI link - used for any driver specific init */
- int (*link_load)(struct snd_soc_component *,
- struct snd_soc_dai_link *link);
+ int (*link_load)(struct snd_soc_component *, int index,
+ struct snd_soc_dai_link *link,
+ struct snd_soc_tplg_link_config *cfg);
  int (*link_unload)(struct snd_soc_component *,
  struct snd_soc_dobj *);
 
  /* callback to handle vendor bespoke data */
- int (*vendor_load)(struct snd_soc_component *,
+ int (*vendor_load)(struct snd_soc_component *, int index,
  struct snd_soc_tplg_hdr *);
  int (*vendor_unload)(struct snd_soc_component *,
  struct snd_soc_tplg_hdr *);
@@ -146,7 +158,7 @@ struct snd_soc_tplg_ops {
  void (*complete)(struct snd_soc_component *);
 
  /* manifest - optional to inform component of manifest */
- int (*manifest)(struct snd_soc_component *,
+ int (*manifest)(struct snd_soc_component *, int index,
  struct snd_soc_tplg_manifest *);
 
  /* vendor specific kcontrol handlers available for binding */

include/sound/soc.h

@@ -492,6 +492,11 @@ int snd_soc_platform_write(struct snd_soc_platform *platform,
 int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num);
 #ifdef CONFIG_SND_SOC_COMPRESS
 int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num);
+#else
+static inline int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)
+{
+ return 0;
+}
 #endif
 
 void snd_soc_disconnect_sync(struct device *dev);
@@ -1012,6 +1017,14 @@ struct snd_soc_platform_driver {
 
  /* platform stream compress ops */
  const struct snd_compr_ops *compr_ops;
+
+ /* this platform uses topology and ignore machine driver FEs */
+ const char *ignore_machine;
+ const char *topology_name_prefix;
+ int (*be_hw_params_fixup)(struct snd_soc_pcm_runtime *rtd,
+ struct snd_pcm_hw_params *params);
+ bool use_dai_pcm_id; /* use the DAI link PCM ID as PCM device number */
+ int be_pcm_base; /* base device ID for all BE PCMs */
 };
 
 struct snd_soc_dai_link_component {
@@ -1118,6 +1131,9 @@ struct snd_soc_dai_link {
  /* pmdown_time is ignored at stop */
  unsigned int ignore_pmdown_time:1;
 
+ /* Do not create a PCM for this DAI link (Backend link) */
+ unsigned int ignore:1;
+
  struct list_head list; /* DAI link list of the soc card */
  struct snd_soc_dobj dobj; /* For topology */
 };
@@ -1157,6 +1173,7 @@ struct snd_soc_card {
  const char *long_name;
  const char *driver_name;
  char dmi_longname[80];
+ char topology_shortname[32];
 
  struct device *dev;
  struct snd_card *snd_card;
@@ -1276,6 +1293,7 @@ struct snd_soc_pcm_runtime {
  /* runtime devices */
  struct snd_pcm *pcm;
  struct snd_compr *compr;
+ struct snd_sof_pcm *sof;
  struct snd_soc_codec *codec;
  struct snd_soc_platform *platform; /* will be removed */
  struct snd_soc_dai *codec_dai;

include/sound/sof.h

@@ -0,0 +1,81 @@
+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
+/*
+ * This file is provided under a dual BSD/GPLv2 license. When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * Copyright(c) 2017 Intel Corporation. All rights reserved.
+ *
+ * Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
+ */
+
+#ifndef __INCLUDE_SOUND_SOF_H
+#define __INCLUDE_SOUND_SOF_H
+
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/interrupt.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/pci.h>
+#include <sound/soc-acpi.h>
+#include <uapi/sound/sof-ipc.h>
+
+struct snd_sof_dsp_ops;
+
+/*
+ * SOF Platform data.
+ */
+struct snd_sof_pdata {
+ u32 id; /* PCI/ACPI ID */
+ const struct firmware *fw;
+ const char *drv_name;
+ const char *name;
+
+ /* parent devices */
+ struct device *dev;
+ struct pci_dev *pci;
+ struct platform_device *pdev;
+
+ /* descriptor */
+ const struct sof_dev_desc *desc;
+
+ /* machine */
+ struct platform_device *pdev_mach;
+ const struct snd_soc_acpi_mach *machine;
+};
+
+/*
+ * Descriptor used for setting up SOF platform data. This is used when
+ * ACPI/PCI data is missing or mapped differently.
+ */
+struct sof_dev_desc {
+ /* list of machines using this configuration */
+ struct snd_soc_acpi_mach *machines;
+
+ /* Platform resource indexes in BAR / ACPI resources. */
+ /* Must set to -1 if not used - add new items to end */
+ int resindex_lpe_base;
+ int resindex_pcicfg_base;
+ int resindex_imr_base;
+ int irqindex_host_ipc;
+ int resindex_dma_base;
+
+ /* DMA only valid when resindex_dma_base != -1*/
+ int dma_engine;
+ int dma_size;
+
+ /* IPC timeouts in ms */
+ int ipc_timeout;
+ int boot_timeout;
+
+ /* defaults for no codec mode */
+ const char *nocodec_fw_filename;
+ const char *nocodec_tplg_filename;
+};
+
+int sof_nocodec_setup(struct device *dev,
+ struct snd_sof_pdata *sof_pdata,
+ struct snd_soc_acpi_mach *mach,
+ const struct sof_dev_desc *desc);
+
+#endif

include/uapi/sound/asoc.h

@@ -139,6 +139,15 @@
 #define SND_SOC_TPLG_DAI_FLGBIT_SYMMETRIC_CHANNELS (1 << 1)
 #define SND_SOC_TPLG_DAI_FLGBIT_SYMMETRIC_SAMPLEBITS (1 << 2)
 
+/* DAI clock gating */
+#define SND_SOC_TPLG_DAI_CLK_GATE_UNDEFINED 0
+#define SND_SOC_TPLG_DAI_CLK_GATE_GATED 1
+#define SND_SOC_TPLG_DAI_CLK_GATE_CONT 2
+
+/* DAI mclk_direction */
+#define SND_SOC_TPLG_MCLK_CO 0 /* for codec, mclk is output */
+#define SND_SOC_TPLG_MCLK_CI 1 /* for codec, mclk is input */
+
 /* DAI physical PCM data formats.
  * Add new formats to the end of the list.
  */
@@ -160,6 +169,18 @@
 #define SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_SAMPLEBITS (1 << 2)
 #define SND_SOC_TPLG_LNK_FLGBIT_VOICE_WAKEUP (1 << 3)
 
+/* DAI topology BCLK parameter
+ * For the backwards capability, by default codec is bclk master
+ */
+#define SND_SOC_TPLG_BCLK_CM 0 /* codec is bclk master */
+#define SND_SOC_TPLG_BCLK_CS 1 /* codec is bclk slave */
+
+/* DAI topology FSYNC parameter
+ * For the backwards capability, by default codec is fsync master
+ */
+#define SND_SOC_TPLG_FSYNC_CM 0 /* codec is fsync master */
+#define SND_SOC_TPLG_FSYNC_CS 1 /* codec is fsync slave */
+
 /*
  * Block Header.
  * This header precedes all object and object arrays below.
@@ -312,12 +333,12 @@ struct snd_soc_tplg_hw_config {
  __le32 size; /* in bytes of this structure */
  __le32 id; /* unique ID - - used to match */
  __le32 fmt; /* SND_SOC_DAI_FORMAT_ format value */
- __u8 clock_gated; /* 1 if clock can be gated to save power */
+ __u8 clock_gated; /* SND_SOC_TPLG_DAI_CLK_GATE_ value */
  __u8 invert_bclk; /* 1 for inverted BCLK, 0 for normal */
  __u8 invert_fsync; /* 1 for inverted frame clock, 0 for normal */
- __u8 bclk_master; /* 1 for master of BCLK, 0 for slave */
- __u8 fsync_master; /* 1 for master of FSYNC, 0 for slave */
- __u8 mclk_direction; /* 0 for input, 1 for output */
+ __u8 bclk_master; /* SND_SOC_TPLG_BCLK_ value */
+ __u8 fsync_master; /* SND_SOC_TPLG_FSYNC_ value */
+ __u8 mclk_direction; /* SND_SOC_TPLG_MCLK_ value */
  __le16 reserved; /* for 32bit alignment */
  __le32 mclk_rate; /* MCLK or SYSCLK freqency in Hz */
  __le32 bclk_rate; /* BCLK freqency in Hz */

include/uapi/sound/sof-abi.h

@@ -0,0 +1,29 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note)) OR BSD-3-Clause) */
+/*
+ * This file is provided under a dual BSD/GPLv2 license. When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * Copyright(c) 2017 Intel Corporation. All rights reserved.
+ */
+
+#ifndef __INCLUDE_UAPI_ABI_H__
+#define __INCLUDE_UAPI_ABI_H__
+
+#define SOF_ABI_VERSION 1
+#define SOF_ABI_MAGIC 0x00464F53 /* "SOF\0" */
+
+/*
+ * Header for all non IPC ABI data. Identifies data type, size and ABI.
+ * Used by any bespoke component data structures or binary blobs.
+ */
+
+struct sof_abi_hdr {
+ uint32_t magic; /* 'S', 'O', 'F', '\0' */
+ uint32_t type; /* component specific type */
+ uint32_t size; /* size in bytes of data excluding this struct */
+ uint32_t abi; /* SOF ABI version */
+ uint32_t comp_abi; /* component specific ABI version */
+ char data[0];
+} __attribute__((packed));
+
+#endif