Skip to contentSkip to conversation

Add support for different DMIC configurations

PATCH Superseded Mateusz Gorski 2 participants 8 messages Apr 23, 2020 – Apr 24, 2020

Subsystems (3)

v3 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

v3 cover Add support for different DMIC configurations

Set of patches to enable DMIC capture on different hardware configurations.
Information about supported DMIC configuration is read from NHLT and correct pipeline configuration is selected automatically. Also, adding additional option for topology binary name which is based on used machine driver.

Changes in v2:
- removed patch 1/4 swapping machine device and platform device registration order
- alt_tplg_name creation now uses different field to read machine driver name
- including of <sound/soc-acpi.h> moved to different patch

Changes in v3:
- cosmetic changes in skl-topology.c file

Mateusz Gorski (3):
ASoC: Intel: Skylake: Add alternative topology binary name
ASoC: Intel: Multiple I/O PCM format support for pipe
ASoC: Intel: Skylake: Automatic DMIC format configuration according to
information from NHLT

 include/uapi/sound/skl-tplg-interface.h |   2 +
 sound/soc/intel/skylake/skl-topology.c  | 188 +++++++++++++++++++++++-
 sound/soc/intel/skylake/skl-topology.h  |   1 +
 3 files changed, 186 insertions(+), 5 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH v3 1/3 ASoC: Intel: Skylake: Add alternative topology binary name

Add alternative topology binary file name based on used machine driver and fallback to use this name after failed attempt to load topology file with name based on NHLT.
This change addresses multiple issues with current mechanism, for example - there are devices without NHLT table, and that currently results in tplg_name being empty.

---

Changes in v2:
- added <sound/soc-acpi.h> include
- machine driver name is now read from different field

Changes in v3:
- deleted additional newline after component_load:

 sound/soc/intel/skylake/skl-topology.c | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)
sound/soc/intel/skylake/skl-topology.c +17 -2
index 69cd7a81bf2a..34ddbdc2b32a 100644
@@ -14,6 +14,7 @@
 #include <linux/uuid.h>
 #include <sound/intel-nhlt.h>
 #include <sound/soc.h>
+#include <sound/soc-acpi.h>
 #include <sound/soc-topology.h>
 #include <uapi/sound/snd_sst_tokens.h>
 #include <uapi/sound/skl-tplg-interface.h>
@@ -3565,8 +3566,20 @@ int skl_tplg_init(struct snd_soc_component *component, struct hdac_bus *bus)
 
 	ret = request_firmware(&fw, skl->tplg_name, bus->dev);
 	if (ret < 0) {
-		dev_info(bus->dev, "tplg fw %s load failed with %d, falling back to dfw_sst.bin",
-				skl->tplg_name, ret);
+		char alt_tplg_name[64];
+
+		snprintf(alt_tplg_name, sizeof(alt_tplg_name), "%s-tplg.bin",
+				skl->mach->drv_name);
+		dev_info(bus->dev, "tplg fw %s load failed with %d, trying alternative tplg name %s",
+				skl->tplg_name, ret, alt_tplg_name);
+
+		ret = request_firmware(&fw, alt_tplg_name, bus->dev);
+		if (!ret)
+			goto component_load;
+
+		dev_info(bus->dev, "tplg %s failed with %d, falling back to dfw_sst.bin",
+				alt_tplg_name, ret);
+
 		ret = request_firmware(&fw, "dfw_sst.bin", bus->dev);
 		if (ret < 0) {
 			dev_err(bus->dev, "Fallback tplg fw %s load failed with %d\n",
@@ -3575,6 +3588,8 @@ int skl_tplg_init(struct snd_soc_component *component, struct hdac_bus *bus)
 		}
 	}
 
+component_load:
+
 	/*
 	 * The complete tplg for SKL is loaded as index 0, we don't use
 	 * any other index
Signature · 1 line
2.17.1
#2 lore raw

PATCH v3 2/3 ASoC: Intel: Multiple I/O PCM format support for pipe

In reply to Mateusz Gorski

For pipes supporting multiple input/output formats, kcontrol is created and selection of pipe input and output configuration is done based on control set.

If more than one configuration is supported, then this patch allows user to select configuration of choice using amixer settings.

---

Changes in v2:
--none--

Changes in v3:
- reordered declarations in skl_tplg_is_multi_fmt

 include/uapi/sound/skl-tplg-interface.h |   1 +
 sound/soc/intel/skylake/skl-topology.c  | 110 ++++++++++++++++++++++++
 sound/soc/intel/skylake/skl-topology.h  |   1 +
 3 files changed, 112 insertions(+)
include/uapi/sound/skl-tplg-interface.h +1 -0
index 9eee32f5e407..f2711186c81f 100644
@@ -18,6 +18,7 @@
  */
 #define SKL_CONTROL_TYPE_BYTE_TLV	0x100
 #define SKL_CONTROL_TYPE_MIC_SELECT	0x102
+#define SKL_CONTROL_TYPE_MULTI_IO_SELECT	0x103
 
 #define HDA_SST_CFG_MAX	900 /* size of copier cfg*/
 #define MAX_IN_QUEUE 8
sound/soc/intel/skylake/skl-topology.c +110 -0

134 lines not on this page · raw message

sound/soc/intel/skylake/skl-topology.h +1 -0
index e967800dbb62..06576147cc29 100644
@@ -306,6 +306,7 @@ struct skl_pipe {
 	struct skl_path_config configs[SKL_MAX_PATH_CONFIGS];
 	struct list_head w_list;
 	bool passthru;
+	u32 pipe_config_idx;
 };
 
 enum skl_module_state {
Signature · 1 line
2.17.1
#5 lore raw

PATCH v3 3/3 ASoC: Intel: Skylake: Automatic DMIC format configuration according to information from NHLT

In reply to Mateusz Gorski

Automatically choose DMIC pipeline format configuration depending on information included in NHLT.
Change the access rights of appropriate kcontrols to read-only in order to prevent user interference.

---

Changes in v2:
- removed <sound/soc-acpi.h> include (moved to patch 1/3)

Changes in v3:
--none--

 include/uapi/sound/skl-tplg-interface.h |  1 +
 sound/soc/intel/skylake/skl-topology.c  | 59 +++++++++++++++++++++++--
 2 files changed, 57 insertions(+), 3 deletions(-)
include/uapi/sound/skl-tplg-interface.h +1 -0
index f2711186c81f..a93c0decfdd5 100644
@@ -19,6 +19,7 @@
 #define SKL_CONTROL_TYPE_BYTE_TLV	0x100
 #define SKL_CONTROL_TYPE_MIC_SELECT	0x102
 #define SKL_CONTROL_TYPE_MULTI_IO_SELECT	0x103
+#define SKL_CONTROL_TYPE_MULTI_IO_SELECT_DMIC	0x104
 
 #define HDA_SST_CFG_MAX	900 /* size of copier cfg*/
 #define MAX_IN_QUEUE 8
sound/soc/intel/skylake/skl-topology.c +56 -3

92 lines not on this page · raw message

Signature · 1 line
2.17.1
#6 lore raw

Re: [PATCH v3 3/3] ASoC: Intel: Skylake: Automatic DMIC format configuration according to information from NHLT

sound/soc/intel/skylake/skl-topology.c static int skl_tplg_control_load(struct snd_soc_component *cmpnt, · line 3148

Quoted 13 lines
sound/soc/intel/skylake/skl-topology.c +2 -3
@@ -3124,12 +3141,15 @@ static int skl_tplg_control_load(struct snd_soc_component *cmpnt,
  	case SND_SOC_TPLG_CTL_ENUM:
  		tplg_ec = container_of(hdr,
  				struct snd_soc_tplg_enum_control, hdr);
-		if (kctl->access & SNDRV_CTL_ELEM_ACCESS_READWRITE) {
+		if (kctl->access & SNDRV_CTL_ELEM_ACCESS_READ) {
  			se = (struct soc_enum *)kctl->private_value;
  			if (tplg_ec->priv.size)
-				return skl_init_enum_data(bus->dev, se,
-						tplg_ec);
+				skl_init_enum_data(bus->dev, se, tplg_ec);
  		}

I finally got the explanations and it wouldn't hurt to have a comment here:

/*
* now that the initializations are done, remove write permissions for
* the DMIC to avoid conflicts between NHLT settings and user
* interaction
*/

Quoted 3 lines
sound/soc/intel/skylake/skl-topology.c +3 -0
+		if (hdr->ops.get == SKL_CONTROL_TYPE_MULTI_IO_SELECT_DMIC)
+			kctl->access = SNDRV_CTL_ELEM_ACCESS_READ;
+
Reviewed-by on the v3 series
#7 lore raw
In reply to Mateusz Gorski
Quoted 14 lines · Mateusz Gorski

Set of patches to enable DMIC capture on different hardware configurations.
Information about supported DMIC configuration is read from NHLT and correct pipeline configuration is selected automatically. Also, adding additional option for topology binary name which is based on used machine driver.

Changes in v2:
- removed patch 1/4 swapping machine device and platform device registration order
- alt_tplg_name creation now uses different field to read machine driver name
- including of <sound/soc-acpi.h> moved to different patch

Quoted 2 lines

Changes in v3:
- cosmetic changes in skl-topology.c file

I suggested a couple of improvements/nit-picks but the code looks good to me already so:

Quoted 11 lines

Mateusz Gorski (3):
ASoC: Intel: Skylake: Add alternative topology binary name
ASoC: Intel: Multiple I/O PCM format support for pipe
ASoC: Intel: Skylake: Automatic DMIC format configuration according to
information from NHLT

  include/uapi/sound/skl-tplg-interface.h |   2 +
  sound/soc/intel/skylake/skl-topology.c  | 188 +++++++++++++++++++++++-
  sound/soc/intel/skylake/skl-topology.h  |   1 +
  3 files changed, 186 insertions(+), 5 deletions(-)
#3 lore raw

Re: [PATCH v3 2/3] ASoC: Intel: Multiple I/O PCM format support for pipe

In reply to Mateusz Gorski
Quoted 19 lines
sound/soc/intel/skylake/skl-topology.c +17 -0
+static int skl_tplg_multi_config_get(struct snd_kcontrol *kcontrol,
+			struct snd_ctl_elem_value *ucontrol)
+{
+	struct snd_soc_component *component =
+		snd_soc_kcontrol_component(kcontrol);
+	struct hdac_bus *bus = snd_soc_component_get_drvdata(component);
+	struct skl_dev *skl = bus_to_skl(bus);
+	struct skl_pipeline *ppl;
+	struct skl_pipe *pipe = NULL;
+	u32 *pipe_id;
+	struct soc_enum *ec = (struct soc_enum *)kcontrol->private_value;
+
+	if (!ec)
+		return -EINVAL;
+
+	pipe_id = ec->dobj.private;
+

sound/soc/intel/skylake/skl-topology.c static int skl_tplg_pga_event(struct snd_soc_dapm_widget *w, · line 1384

Quoted 10 lines
sound/soc/intel/skylake/skl-topology.c +10 -0
+	list_for_each_entry(ppl, &skl->ppl_list, node) {
+		if (ppl->pipe->ppl_id == *pipe_id) {
+			pipe = ppl->pipe;
+			break;
+		}
+	}
+	if (!pipe)
+		return -EIO;
+
+	ucontrol->value.enumerated.item[0]  =  pipe->pipe_config_idx;

maybe one nit-pick is that there is a one-line difference between the _set and _get functions, and it might be simpler to use a common helper with a boolean flag used at the end to do this:

sound/soc/intel/skylake/skl-topology.c static int skl_tplg_pga_event(struct snd_soc_dapm_widget *w, · line 1384

Quoted 1 line
sound/soc/intel/skylake/skl-topology.c +1 -0
+	ucontrol->value.enumerated.item[0]  =  pipe->pipe_config_idx;

or that:

Quoted 1 line
sound/soc/intel/skylake/skl-topology.c +1 -0
+	pipe->pipe_config_idx = ucontrol->value.enumerated.item[0];
#4 lore raw

Re: [PATCH v3 2/3] ASoC: Intel: Multiple I/O PCM format support for pipe

Quoted 8 lines

maybe one nit-pick is that there is a one-line difference between the _set and _get functions, and it might be simpler to use a common helper with a boolean flag used at the end to do this:

Quoted 1 line

+    ucontrol->value.enumerated.item[0]  = pipe->pipe_config_idx;

or that:

Quoted 1 line

+    pipe->pipe_config_idx = ucontrol->value.enumerated.item[0];

Thanks for this hint, adressed in v4 together with comment about access rights.

Mateusz