alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v4 0/3] Add support for different DMIC configurations
@ 2020-04-24 13:19 Mateusz Gorski
  2020-04-24 13:20 ` [PATCH v4 1/3] ASoC: Intel: Skylake: Add alternative topology binary name Mateusz Gorski
                   ` (3 more replies)
  0 siblings, 4 replies; 8+ messages in thread
From: Mateusz Gorski @ 2020-04-24 13:19 UTC (permalink / raw)
  To: alsa-devel
  Cc: Mateusz Gorski, cezary.rojewski, broonie, tiwai, pierre-louis.bossart

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

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

Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>

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  | 177 +++++++++++++++++++++++-
 sound/soc/intel/skylake/skl-topology.h  |   1 +
 3 files changed, 175 insertions(+), 5 deletions(-)

-- 
2.17.1


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

* [PATCH v4 1/3] ASoC: Intel: Skylake: Add alternative topology binary name
  2020-04-24 13:19 [PATCH v4 0/3] Add support for different DMIC configurations Mateusz Gorski
@ 2020-04-24 13:20 ` Mateusz Gorski
  2020-04-24 13:20 ` [PATCH v4 2/3] ASoC: Intel: Multiple I/O PCM format support for pipe Mateusz Gorski
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 8+ messages in thread
From: Mateusz Gorski @ 2020-04-24 13:20 UTC (permalink / raw)
  To: alsa-devel
  Cc: Mateusz Gorski, cezary.rojewski, broonie, tiwai, pierre-louis.bossart

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.

Signed-off-by: Mateusz Gorski <mateusz.gorski@linux.intel.com>
Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
---

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

 sound/soc/intel/skylake/skl-topology.c | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c
index 69cd7a81bf2a..34ddbdc2b32a 100644
--- a/sound/soc/intel/skylake/skl-topology.c
+++ b/sound/soc/intel/skylake/skl-topology.c
@@ -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
-- 
2.17.1


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

* [PATCH v4 2/3] ASoC: Intel: Multiple I/O PCM format support for pipe
  2020-04-24 13:19 [PATCH v4 0/3] Add support for different DMIC configurations Mateusz Gorski
  2020-04-24 13:20 ` [PATCH v4 1/3] ASoC: Intel: Skylake: Add alternative topology binary name Mateusz Gorski
@ 2020-04-24 13:20 ` Mateusz Gorski
  2020-04-24 15:26   ` Pierre-Louis Bossart
  2020-04-24 13:20 ` [PATCH v4 3/3] ASoC: Intel: Skylake: Automatic DMIC format configuration according to information from NHLT Mateusz Gorski
  2020-04-24 14:52 ` [PATCH v4 0/3] Add support for different DMIC configurations Mark Brown
  3 siblings, 1 reply; 8+ messages in thread
From: Mateusz Gorski @ 2020-04-24 13:20 UTC (permalink / raw)
  To: alsa-devel
  Cc: cezary.rojewski, Pavan K, tiwai, pierre-louis.bossart, broonie,
	Mateusz Gorski, S

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.

Signed-off-by: Mateusz Gorski <mateusz.gorski@linux.intel.com>
Signed-off-by: S, Pavan K <pavan.k.s@intel.com>
Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
---

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

 include/uapi/sound/skl-tplg-interface.h |  1 +
 sound/soc/intel/skylake/skl-topology.c  | 94 +++++++++++++++++++++++++
 sound/soc/intel/skylake/skl-topology.h  |  1 +
 3 files changed, 96 insertions(+)

diff --git a/include/uapi/sound/skl-tplg-interface.h b/include/uapi/sound/skl-tplg-interface.h
index 9eee32f5e407..f2711186c81f 100644
--- a/include/uapi/sound/skl-tplg-interface.h
+++ b/include/uapi/sound/skl-tplg-interface.h
@@ -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
diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c
index 34ddbdc2b32a..f51eaf77aad3 100644
--- a/sound/soc/intel/skylake/skl-topology.c
+++ b/sound/soc/intel/skylake/skl-topology.c
@@ -579,6 +579,38 @@ static int skl_tplg_unload_pipe_modules(struct skl_dev *skl,
 	return ret;
 }
 
+static bool skl_tplg_is_multi_fmt(struct skl_dev *skl, struct skl_pipe *pipe)
+{
+	struct skl_pipe_fmt *cur_fmt;
+	struct skl_pipe_fmt *next_fmt;
+	int i;
+
+	if (pipe->nr_cfgs <= 1)
+		return false;
+
+	if (pipe->conn_type != SKL_PIPE_CONN_TYPE_FE)
+		return true;
+
+	for (i = 0; i < pipe->nr_cfgs - 1; i++) {
+		if (pipe->direction == SNDRV_PCM_STREAM_PLAYBACK) {
+			cur_fmt = &pipe->configs[i].out_fmt;
+			next_fmt = &pipe->configs[i+1].out_fmt;
+		} else {
+			cur_fmt = &pipe->configs[i].in_fmt;
+			next_fmt = &pipe->configs[i+1].in_fmt;
+		}
+
+		if (!CHECK_HW_PARAMS(cur_fmt->channels, cur_fmt->freq,
+				     cur_fmt->bps,
+				     next_fmt->channels,
+				     next_fmt->freq,
+				     next_fmt->bps))
+			return true;
+	}
+
+	return false;
+}
+
 /*
  * Here, we select pipe format based on the pipe type and pipe
  * direction to determine the current config index for the pipeline.
@@ -601,6 +633,14 @@ skl_tplg_get_pipe_config(struct skl_dev *skl, struct skl_module_cfg *mconfig)
 		return 0;
 	}
 
+	if (skl_tplg_is_multi_fmt(skl, pipe)) {
+		pipe->cur_config_idx = pipe->pipe_config_idx;
+		pipe->memory_pages = pconfig->mem_pages;
+		dev_dbg(skl->dev, "found pipe config idx:%d\n",
+				pipe->cur_config_idx);
+		return 0;
+	}
+
 	if (pipe->conn_type == SKL_PIPE_CONN_TYPE_NONE) {
 		dev_dbg(skl->dev, "No conn_type detected, take 0th config\n");
 		pipe->cur_config_idx = 0;
@@ -1315,6 +1355,55 @@ static int skl_tplg_pga_event(struct snd_soc_dapm_widget *w,
 	return 0;
 }
 
+static int skl_tplg_multi_config_set_get(struct snd_kcontrol *kcontrol,
+		struct snd_ctl_elem_value *ucontrol, bool is_set)
+{
+	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;
+	struct soc_enum *ec = (struct soc_enum *)kcontrol->private_value;
+	u32 *pipe_id;
+
+	if (!ec)
+		return -EINVAL;
+
+	if (is_set && (ucontrol->value.enumerated.item[0] > ec->items))
+		return -EINVAL;
+
+	pipe_id = ec->dobj.private;
+
+	list_for_each_entry(ppl, &skl->ppl_list, node) {
+		if (ppl->pipe->ppl_id == *pipe_id) {
+			pipe = ppl->pipe;
+			break;
+			}
+		}
+	if (!pipe)
+		return -EIO;
+
+	if (is_set)
+		pipe->pipe_config_idx = ucontrol->value.enumerated.item[0];
+	else
+		ucontrol->value.enumerated.item[0]  =  pipe->pipe_config_idx;
+
+	return 0;
+}
+
+static int skl_tplg_multi_config_get(struct snd_kcontrol *kcontrol,
+			struct snd_ctl_elem_value *ucontrol)
+{
+	return skl_tplg_multi_config_set_get(kcontrol, ucontrol, false);
+}
+
+static int skl_tplg_multi_config_set(struct snd_kcontrol *kcontrol,
+			struct snd_ctl_elem_value *ucontrol)
+{
+	return skl_tplg_multi_config_set_get(kcontrol, ucontrol, true);
+}
+
 static int skl_tplg_tlv_control_get(struct snd_kcontrol *kcontrol,
 			unsigned int __user *data, unsigned int size)
 {
@@ -1854,6 +1943,11 @@ static const struct snd_soc_tplg_kcontrol_ops skl_tplg_kcontrol_ops[] = {
 		.get = skl_tplg_mic_control_get,
 		.put = skl_tplg_mic_control_set,
 	},
+	{
+		.id = SKL_CONTROL_TYPE_MULTI_IO_SELECT,
+		.get = skl_tplg_multi_config_get,
+		.put = skl_tplg_multi_config_set,
+	},
 };
 
 static int skl_tplg_fill_pipe_cfg(struct device *dev,
diff --git a/sound/soc/intel/skylake/skl-topology.h b/sound/soc/intel/skylake/skl-topology.h
index e967800dbb62..06576147cc29 100644
--- a/sound/soc/intel/skylake/skl-topology.h
+++ b/sound/soc/intel/skylake/skl-topology.h
@@ -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 {
-- 
2.17.1


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

* [PATCH v4 3/3] ASoC: Intel: Skylake: Automatic DMIC format configuration according to information from NHLT
  2020-04-24 13:19 [PATCH v4 0/3] Add support for different DMIC configurations Mateusz Gorski
  2020-04-24 13:20 ` [PATCH v4 1/3] ASoC: Intel: Skylake: Add alternative topology binary name Mateusz Gorski
  2020-04-24 13:20 ` [PATCH v4 2/3] ASoC: Intel: Multiple I/O PCM format support for pipe Mateusz Gorski
@ 2020-04-24 13:20 ` Mateusz Gorski
  2020-04-24 14:52 ` [PATCH v4 0/3] Add support for different DMIC configurations Mark Brown
  3 siblings, 0 replies; 8+ messages in thread
From: Mateusz Gorski @ 2020-04-24 13:20 UTC (permalink / raw)
  To: alsa-devel
  Cc: Mateusz Gorski, cezary.rojewski, broonie, tiwai, pierre-louis.bossart

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.

Signed-off-by: Mateusz Gorski <mateusz.gorski@linux.intel.com>
Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
---

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

 include/uapi/sound/skl-tplg-interface.h |  1 +
 sound/soc/intel/skylake/skl-topology.c  | 64 +++++++++++++++++++++++--
 2 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/include/uapi/sound/skl-tplg-interface.h b/include/uapi/sound/skl-tplg-interface.h
index f2711186c81f..a93c0decfdd5 100644
--- a/include/uapi/sound/skl-tplg-interface.h
+++ b/include/uapi/sound/skl-tplg-interface.h
@@ -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
diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c
index f51eaf77aad3..a331e6451b99 100644
--- a/sound/soc/intel/skylake/skl-topology.c
+++ b/sound/soc/intel/skylake/skl-topology.c
@@ -1404,6 +1404,18 @@ static int skl_tplg_multi_config_set(struct snd_kcontrol *kcontrol,
 	return skl_tplg_multi_config_set_get(kcontrol, ucontrol, true);
 }
 
+static int skl_tplg_multi_config_get_dmic(struct snd_kcontrol *kcontrol,
+		struct snd_ctl_elem_value *ucontrol)
+{
+	return skl_tplg_multi_config_set_get(kcontrol, ucontrol, false);
+}
+
+static int skl_tplg_multi_config_set_dmic(struct snd_kcontrol *kcontrol,
+		struct snd_ctl_elem_value *ucontrol)
+{
+	return skl_tplg_multi_config_set_get(kcontrol, ucontrol, true);
+}
+
 static int skl_tplg_tlv_control_get(struct snd_kcontrol *kcontrol,
 			unsigned int __user *data, unsigned int size)
 {
@@ -1948,6 +1960,11 @@ static const struct snd_soc_tplg_kcontrol_ops skl_tplg_kcontrol_ops[] = {
 		.get = skl_tplg_multi_config_get,
 		.put = skl_tplg_multi_config_set,
 	},
+	{
+		.id = SKL_CONTROL_TYPE_MULTI_IO_SELECT_DMIC,
+		.get = skl_tplg_multi_config_get_dmic,
+		.put = skl_tplg_multi_config_set_dmic,
+	}
 };
 
 static int skl_tplg_fill_pipe_cfg(struct device *dev,
@@ -3108,12 +3125,21 @@ 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);
 		}
+
+		/*
+		 * now that the control initializations are done, remove
+		 * write permission for the DMIC configuration enums to
+		 * avoid conflicts between NHLT settings and user interaction
+		 */
+
+		if (hdr->ops.get == SKL_CONTROL_TYPE_MULTI_IO_SELECT_DMIC)
+			kctl->access = SNDRV_CTL_ELEM_ACCESS_READ;
+
 		break;
 
 	default:
@@ -3583,6 +3609,37 @@ static int skl_manifest_load(struct snd_soc_component *cmpnt, int index,
 	return 0;
 }
 
+static void skl_tplg_complete(struct snd_soc_component *component)
+{
+	struct snd_soc_dobj *dobj;
+	struct snd_soc_acpi_mach *mach =
+		dev_get_platdata(component->card->dev);
+	int i;
+
+	list_for_each_entry(dobj, &component->dobj_list, list) {
+		struct snd_kcontrol *kcontrol = dobj->control.kcontrol;
+		struct soc_enum *se =
+			(struct soc_enum *)kcontrol->private_value;
+		char **texts = dobj->control.dtexts;
+		char chan_text[4];
+
+		if (dobj->type != SND_SOC_DOBJ_ENUM ||
+				dobj->control.kcontrol->put !=
+				skl_tplg_multi_config_set_dmic)
+			continue;
+		sprintf(chan_text, "c%d", mach->mach_params.dmic_num);
+
+		for (i = 0; i < se->items; i++) {
+			struct snd_ctl_elem_value val;
+
+			if (strstr(texts[i], chan_text)) {
+				val.value.enumerated.item[0] = i;
+				kcontrol->put(kcontrol, &val);
+			}
+		}
+	}
+}
+
 static struct snd_soc_tplg_ops skl_tplg_ops  = {
 	.widget_load = skl_tplg_widget_load,
 	.control_load = skl_tplg_control_load,
@@ -3592,6 +3649,7 @@ static struct snd_soc_tplg_ops skl_tplg_ops  = {
 	.io_ops_count = ARRAY_SIZE(skl_tplg_kcontrol_ops),
 	.manifest = skl_manifest_load,
 	.dai_load = skl_dai_load,
+	.complete = skl_tplg_complete,
 };
 
 /*
-- 
2.17.1


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

* Re: [PATCH v4 0/3] Add support for different DMIC configurations
  2020-04-24 13:19 [PATCH v4 0/3] Add support for different DMIC configurations Mateusz Gorski
                   ` (2 preceding siblings ...)
  2020-04-24 13:20 ` [PATCH v4 3/3] ASoC: Intel: Skylake: Automatic DMIC format configuration according to information from NHLT Mateusz Gorski
@ 2020-04-24 14:52 ` Mark Brown
  2020-04-27 11:14   ` Gorski, Mateusz
  3 siblings, 1 reply; 8+ messages in thread
From: Mark Brown @ 2020-04-24 14:52 UTC (permalink / raw)
  To: Mateusz Gorski; +Cc: cezary.rojewski, alsa-devel, tiwai, pierre-louis.bossart

[-- Attachment #1: Type: text/plain, Size: 238 bytes --]

On Fri, Apr 24, 2020 at 03:19:59PM +0200, Mateusz Gorski wrote:
> Set of patches to enable DMIC capture on different hardware
> configurations.

Neither this posting nor the last posting seem to have managed to send
me a copy of patch 2.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

* Re: [PATCH v4 2/3] ASoC: Intel: Multiple I/O PCM format support for pipe
  2020-04-24 13:20 ` [PATCH v4 2/3] ASoC: Intel: Multiple I/O PCM format support for pipe Mateusz Gorski
@ 2020-04-24 15:26   ` Pierre-Louis Bossart
  2020-04-27 11:14     ` Gorski, Mateusz
  0 siblings, 1 reply; 8+ messages in thread
From: Pierre-Louis Bossart @ 2020-04-24 15:26 UTC (permalink / raw)
  To: Mateusz Gorski, alsa-devel; +Cc: S, cezary.rojewski, broonie, Pavan K, tiwai


> +static int skl_tplg_multi_config_set_get(struct snd_kcontrol *kcontrol,
> +		struct snd_ctl_elem_value *ucontrol, bool is_set)
> +{
> +	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;
> +	struct soc_enum *ec = (struct soc_enum *)kcontrol->private_value;
> +	u32 *pipe_id;
> +
> +	if (!ec)
> +		return -EINVAL;
> +
> +	if (is_set && (ucontrol->value.enumerated.item[0] > ec->items))
> +		return -EINVAL;
> +
> +	pipe_id = ec->dobj.private;
> +
> +	list_for_each_entry(ppl, &skl->ppl_list, node) {
> +		if (ppl->pipe->ppl_id == *pipe_id) {
> +			pipe = ppl->pipe;
> +			break;
> +			}
> +		}

is there an alignment issue here or just a diff illusion?

> +	if (!pipe)
> +		return -EIO;
> +
> +	if (is_set)
> +		pipe->pipe_config_idx = ucontrol->value.enumerated.item[0];
> +	else
> +		ucontrol->value.enumerated.item[0]  =  pipe->pipe_config_idx;
> +
> +	return 0;
> +}
> +

You also have a number of other alignment/style issues reported by 
checkpatch.pl

---------------------------------------------------------------
0001-ASoC-Intel-Skylake-Add-alternative-topology-binary-n.patch
---------------------------------------------------------------
CHECK: Alignment should match open parenthesis
#41: FILE: sound/soc/intel/skylake/skl-topology.c:3572:
+		snprintf(alt_tplg_name, sizeof(alt_tplg_name), "%s-tplg.bin",
+				skl->mach->drv_name);

CHECK: Alignment should match open parenthesis
#43: FILE: sound/soc/intel/skylake/skl-topology.c:3574:
+		dev_info(bus->dev, "tplg fw %s load failed with %d, trying 
alternative tplg name %s",
+				skl->tplg_name, ret, alt_tplg_name);

CHECK: Alignment should match open parenthesis
#50: FILE: sound/soc/intel/skylake/skl-topology.c:3581:
+		dev_info(bus->dev, "tplg %s failed with %d, falling back to dfw_sst.bin",
+				alt_tplg_name, ret);

--------------------------------------------------------------
0002-ASoC-Intel-Multiple-I-O-PCM-format-support-for-pipe.patch
--------------------------------------------------------------
CHECK: spaces preferred around that '+' (ctx:VxV)
#58: FILE: sound/soc/intel/skylake/skl-topology.c:597:
+			next_fmt = &pipe->configs[i+1].out_fmt;
  			                           ^

CHECK: spaces preferred around that '+' (ctx:VxV)
#61: FILE: sound/soc/intel/skylake/skl-topology.c:600:
+			next_fmt = &pipe->configs[i+1].in_fmt;
  			                           ^

CHECK: Alignment should match open parenthesis
#86: FILE: sound/soc/intel/skylake/skl-topology.c:640:
+		dev_dbg(skl->dev, "found pipe config idx:%d\n",
+				pipe->cur_config_idx);

CHECK: Alignment should match open parenthesis
#98: FILE: sound/soc/intel/skylake/skl-topology.c:1359:
+static int skl_tplg_multi_config_set_get(struct snd_kcontrol *kcontrol,
+		struct snd_ctl_elem_value *ucontrol, bool is_set)

CHECK: Unnecessary parentheses around 
'ucontrol->value.enumerated.item[0] > ec->items'
#112: FILE: sound/soc/intel/skylake/skl-topology.c:1373:
+	if (is_set && (ucontrol->value.enumerated.item[0] > ec->items))

CHECK: Alignment should match open parenthesis
#135: FILE: sound/soc/intel/skylake/skl-topology.c:1396:
+static int skl_tplg_multi_config_get(struct snd_kcontrol *kcontrol,
+			struct snd_ctl_elem_value *ucontrol)

CHECK: Alignment should match open parenthesis
#141: FILE: sound/soc/intel/skylake/skl-topology.c:1402:
+static int skl_tplg_multi_config_set(struct snd_kcontrol *kcontrol,
+			struct snd_ctl_elem_value *ucontrol)

---------------------------------------------------------------
0003-ASoC-Intel-Skylake-Automatic-DMIC-format-configurati.patch
---------------------------------------------------------------
CHECK: Alignment should match open parenthesis
#40: FILE: sound/soc/intel/skylake/skl-topology.c:1408:
+static int skl_tplg_multi_config_get_dmic(struct snd_kcontrol *kcontrol,
+		struct snd_ctl_elem_value *ucontrol)

CHECK: Alignment should match open parenthesis
#46: FILE: sound/soc/intel/skylake/skl-topology.c:1414:
+static int skl_tplg_multi_config_set_dmic(struct snd_kcontrol *kcontrol,
+		struct snd_ctl_elem_value *ucontrol)

CHECK: Alignment should match open parenthesis
#110: FILE: sound/soc/intel/skylake/skl-topology.c:3627:
+		if (dobj->type != SND_SOC_DOBJ_ENUM ||
+				dobj->control.kcontrol->put !=


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

* Re: [PATCH v4 0/3] Add support for different DMIC configurations
  2020-04-24 14:52 ` [PATCH v4 0/3] Add support for different DMIC configurations Mark Brown
@ 2020-04-27 11:14   ` Gorski, Mateusz
  0 siblings, 0 replies; 8+ messages in thread
From: Gorski, Mateusz @ 2020-04-27 11:14 UTC (permalink / raw)
  To: Mark Brown; +Cc: cezary.rojewski, alsa-devel, tiwai, pierre-louis.bossart


>> Set of patches to enable DMIC capture on different hardware
>> configurations.
> Neither this posting nor the last posting seem to have managed to send
> me a copy of patch 2.


The only reason I can think of is the fact, that one of Signed-by tags 
in patch 2/3 had a comma in it and git send-patch added one additional, 
invalid CC recipient.

I have adjusted that Signed-by tag in patchset v5.


Mateusz


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

* Re: [PATCH v4 2/3] ASoC: Intel: Multiple I/O PCM format support for pipe
  2020-04-24 15:26   ` Pierre-Louis Bossart
@ 2020-04-27 11:14     ` Gorski, Mateusz
  0 siblings, 0 replies; 8+ messages in thread
From: Gorski, Mateusz @ 2020-04-27 11:14 UTC (permalink / raw)
  To: alsa-devel


>> +    list_for_each_entry(ppl, &skl->ppl_list, node) {
>> +        if (ppl->pipe->ppl_id == *pipe_id) {
>> +            pipe = ppl->pipe;
>> +            break;
>> +            }
>> +        }
>
> is there an alignment issue here or just a diff illusion?


There was, changed in v5.


>
> You also have a number of other alignment/style issues reported by 
> checkpatch.pl
>
I have only validated with standard chechpatch.pl settings, scanned with 
*--strict *and addressed all warnings in patchset v5.

Thanks,
Mateusz


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

end of thread, other threads:[~2020-04-27 11:16 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-24 13:19 [PATCH v4 0/3] Add support for different DMIC configurations Mateusz Gorski
2020-04-24 13:20 ` [PATCH v4 1/3] ASoC: Intel: Skylake: Add alternative topology binary name Mateusz Gorski
2020-04-24 13:20 ` [PATCH v4 2/3] ASoC: Intel: Multiple I/O PCM format support for pipe Mateusz Gorski
2020-04-24 15:26   ` Pierre-Louis Bossart
2020-04-27 11:14     ` Gorski, Mateusz
2020-04-24 13:20 ` [PATCH v4 3/3] ASoC: Intel: Skylake: Automatic DMIC format configuration according to information from NHLT Mateusz Gorski
2020-04-24 14:52 ` [PATCH v4 0/3] Add support for different DMIC configurations Mark Brown
2020-04-27 11:14   ` Gorski, Mateusz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).