Skip to contentSkip to conversation

Add support for different DMIC configurations

PATCH In review Mateusz Gorski 3 participants 6 messages Apr 27, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v6 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.

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

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

Changes in v4:
- refactored patch 2/3 to use one common helper function to deal with both set and get pipe configuration operations, as suggested by Pierre
- adjusted patch 3/3 to also use this helper function for DMIC pipes
- added comment in patch 3/3 explaining the change of access rights for DMIC enums

Changes in v5:
- fixed alignment issue in patch 2/3
- addressed "checkpatch.pl --strict" warnings in patches

Changes in v6:
- fixed commit message in patch 2/3

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

PATCH v6 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:

Changes in v4:
--none--

Changes in v5:
- addressed "checkpatch.pl --strict" warnings

Changes in v6:
--none--

 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..4b114ece58c6 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 v6 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

Changes in v4:
- added helper function to set and get pipe config

Changes in v5:
- fixed alignment issue
- addressed "checkpatch.pl --strict" warnings

Changes in v6:
--none--

 include/uapi/sound/skl-tplg-interface.h |  1 +
 sound/soc/intel/skylake/skl-topology.c  | 95 +++++++++++++++++++++++++
 sound/soc/intel/skylake/skl-topology.h  |  1 +
 3 files changed, 97 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 +95 -0

119 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
#3 lore raw

PATCH v6 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--

Changes in v4:
- added comment about access rights for DMIC pipe configuration enums
- adjusted set and get functions for DMIC enums to use helper function introduced in patch 2/3

Changes in v5:
- addressed "checkpatch.pl --strict" warnings

Changes in v6:
--none--

 include/uapi/sound/skl-tplg-interface.h |  1 +
 sound/soc/intel/skylake/skl-topology.c  | 64 +++++++++++++++++++++++--
 2 files changed, 62 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 +61 -3

97 lines not on this page · raw message

Signature · 1 line
2.17.1
Reviewed-by on the v6 series
#4 lore raw
In reply to Mateusz Gorski
Quoted 8 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.

Quoted 36 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

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

Changes in v4:
- refactored patch 2/3 to use one common helper function to deal with both set and get pipe configuration operations, as suggested by Pierre
- adjusted patch 3/3 to also use this helper function for DMIC pipes
- added comment in patch 3/3 explaining the change of access rights for DMIC enums

Changes in v5:
- fixed alignment issue in patch 2/3
- addressed "checkpatch.pl --strict" warnings in patches

Changes in v6:
- fixed commit message in patch 2/3

  include/uapi/sound/skl-tplg-interface.h |   2 +
  sound/soc/intel/skylake/skl-topology.c  | 178 +++++++++++++++++++++++-
  sound/soc/intel/skylake/skl-topology.h  |   1 +
  3 files changed, 176 insertions(+), 5 deletions(-)
maintainer
#5 lore raw
In reply to Mateusz Gorski
Quoted 8 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.

[...]

Applied to

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

Thanks!

[1/3] ASoC: Intel: Skylake: Add alternative topology binary name

      commit: 1b290ef023b3eeb4f4688b582fecb773915ef937
[2/3] ASoC: Intel: Multiple I/O PCM format support for pipe
      commit: 1b450791d517d4d6666ab9ab6d9a20c8819e3572
[3/3] ASoC: Intel: Skylake: Automatic DMIC format configuration according to information from NHLT
      commit: 2d744ecf2b98405723a2138a547e5c75009bc4e5

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