April 2017 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH -next] ASoC: Intel: Skylake: Fix to use list_for_each_safe() when delete items
by Wei Yongjun 28 Apr '17

28 Apr '17

From: Wei Yongjun <weiyongjun1(a)huawei.com> Since we will remove items off the list using list_del() we need to use a safe version of the list_for_each() macro aptly named list_for_each_safe(). This is detected by Coccinelle semantic patch. Fixes: b8c722ddd548 ("ASoC: Intel: Skylake: Add support for deferred DSP module bind") Signed-off-by: Wei Yongjun <weiyongjun1(a)huawei.com> --- sound/soc/intel/skylake/skl-pcm.c | 4 ++-- sound/soc/intel/skylake/skl-topology.c | 4 ++-- 2 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c index 600faad..d43d197 100644 --- a/sound/soc/intel/skylake/skl-pcm.c +++ b/sound/soc/intel/skylake/skl-pcm.c @@ -1323,10 +1323,10 @@ int skl_platform_unregister(struct device *dev) { struct hdac_ext_bus *ebus = dev_get_drvdata(dev); struct skl *skl = ebus_to_skl(ebus); - struct skl_module_deferred_bind *modules; + struct skl_module_deferred_bind *modules, *tmp; if (!list_empty(&skl->bind_list)) { - list_for_each_entry(modules, &skl->bind_list, node) { + list_for_each_entry_safe(modules, tmp, &skl->bind_list, node) { list_del(&modules->node); kfree(modules); } diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index 74b3acf..aea7917 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -1091,7 +1091,7 @@ static int skl_tplg_mixer_dapm_post_pmd_event(struct snd_soc_dapm_widget *w, struct skl_module_cfg *src_module = NULL, *dst_module; struct skl_sst *ctx = skl->skl_sst; struct skl_pipe *s_pipe = mconfig->pipe; - struct skl_module_deferred_bind *modules; + struct skl_module_deferred_bind *modules, *tmp; if (s_pipe->state == SKL_PIPE_INVALID) return -EINVAL; @@ -1105,7 +1105,7 @@ static int skl_tplg_mixer_dapm_post_pmd_event(struct snd_soc_dapm_widget *w, src_module = w_module->w->priv; - list_for_each_entry(modules, &skl->bind_list, node) { + list_for_each_entry_safe(modules, tmp, &skl->bind_list, node) { /* * When the destination module is deleted, Unbind the * modules from deferred bind list.

3 5

[alsa-devel] [PATCH] ASoC: Intel: Skylake: use dev in dev_err rather than skl pointer
by Colin King 28 Apr '17

28 Apr '17

From: Colin Ian King <colin.king(a)canonical.com> The dev_err message is dereferencing an uininitialized skl pointer which should be avoided. Don't use skl, use dev instead. Detected by CoverityScan, CID#1432042 ("Uninitialized pointer read") Fixes: 9fe9c71192832 ("ASoC: Intel: Skylake: Move sst common initialization to a helper function") Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/soc/intel/skylake/bxt-sst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/intel/skylake/bxt-sst.c b/sound/soc/intel/skylake/bxt-sst.c index fde4bc0f35b0..f5e7dbb1ba39 100644 --- a/sound/soc/intel/skylake/bxt-sst.c +++ b/sound/soc/intel/skylake/bxt-sst.c @@ -564,7 +564,7 @@ int bxt_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq, ret = skl_sst_ctx_init(dev, irq, fw_name, dsp_ops, dsp, &skl_dev); if (ret < 0) { - dev_err(skl->dev, "%s: no device\n", __func__); + dev_err(dev, "%s: no device\n", __func__); return ret; } -- 2.11.0

2 1

[alsa-devel] [PATCH] ASoC: Intel: Skylake: uninitialized variable in error message
by Dan Carpenter 28 Apr '17

28 Apr '17

"skl" hasn't been initialized yet, so we can't dereference it. Fixes: 9fe9c7119283 ("ASoC: Intel: Skylake: Move sst common initialization to a helper function") Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/soc/intel/skylake/bxt-sst.c b/sound/soc/intel/skylake/bxt-sst.c index fde4bc0f35b0..f5e7dbb1ba39 100644 --- a/sound/soc/intel/skylake/bxt-sst.c +++ b/sound/soc/intel/skylake/bxt-sst.c @@ -564,7 +564,7 @@ int bxt_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq, ret = skl_sst_ctx_init(dev, irq, fw_name, dsp_ops, dsp, &skl_dev); if (ret < 0) { - dev_err(skl->dev, "%s: no device\n", __func__); + dev_err(dev, "%s: no device\n", __func__); return ret; }

2 1

[alsa-devel] [PATCH] ASoC: dwc: disallow building designware_pcm as a module
by Lubomir Rintel 27 Apr '17

27 Apr '17

It makes not sense: the whether the PIO PCM extension is used is hardcoded to the designware_i2s driver and designware_pcm doesn't have any module metadata, causing a kernel taint: [ 44.287000] designware_pcm: module license 'unspecified' taints kernel. Signed-off-by: Lubomir Rintel <lkundrak(a)v3.sk> --- sound/soc/dwc/Kconfig | 4 ++-- sound/soc/dwc/Makefile | 6 +++++- sound/soc/dwc/{designware_i2s.c => designware_i2s_main.c} | 2 +- sound/soc/dwc/{designware_pcm.c => designware_i2s_pcm.c} | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) rename sound/soc/dwc/{designware_i2s.c => designware_i2s_main.c} (99%) rename sound/soc/dwc/{designware_pcm.c => designware_i2s_pcm.c} (99%) diff --git a/sound/soc/dwc/Kconfig b/sound/soc/dwc/Kconfig index c297efe..704b7b2 100644 --- a/sound/soc/dwc/Kconfig +++ b/sound/soc/dwc/Kconfig @@ -8,10 +8,10 @@ config SND_DESIGNWARE_I2S maximum of 8 channels each for play and record. config SND_DESIGNWARE_PCM - tristate "PCM PIO extension for I2S driver" + bool "PCM PIO extension for I2S driver" depends on SND_DESIGNWARE_I2S help - Say Y, M or N if you want to add a custom ALSA extension that registers + Say Y if you want to add a custom ALSA extension that registers a PCM and uses PIO to transfer data. This functionality is specially suited for I2S devices that don't have diff --git a/sound/soc/dwc/Makefile b/sound/soc/dwc/Makefile index 38f1ca3..05c594f 100644 --- a/sound/soc/dwc/Makefile +++ b/sound/soc/dwc/Makefile @@ -1,5 +1,9 @@ # SYNOPSYS Platform Support + obj-$(CONFIG_SND_DESIGNWARE_I2S) += designware_i2s.o + +designware_i2s-objs := designware_i2s_main.o + ifdef CONFIG_SND_DESIGNWARE_PCM -obj-$(CONFIG_SND_DESIGNWARE_I2S) += designware_pcm.o +designware_i2s-objs += designware_i2s_pcm.o endif diff --git a/sound/soc/dwc/designware_i2s.c b/sound/soc/dwc/designware_i2s_main.c similarity index 99% rename from sound/soc/dwc/designware_i2s.c rename to sound/soc/dwc/designware_i2s_main.c index bdf8398..23c2212 100644 --- a/sound/soc/dwc/designware_i2s.c +++ b/sound/soc/dwc/designware_i2s_main.c @@ -1,7 +1,7 @@ /* * ALSA SoC Synopsys I2S Audio Layer * - * sound/soc/dwc/designware_i2s.c + * sound/soc/dwc/designware_i2s_main.c * * Copyright (C) 2010 ST Microelectronics * Rajeev Kumar <rajeevkumar.linux(a)gmail.com> diff --git a/sound/soc/dwc/designware_pcm.c b/sound/soc/dwc/designware_i2s_pcm.c similarity index 99% rename from sound/soc/dwc/designware_pcm.c rename to sound/soc/dwc/designware_i2s_pcm.c index 4a83a22..27664e2 100644 --- a/sound/soc/dwc/designware_pcm.c +++ b/sound/soc/dwc/designware_i2s_pcm.c @@ -1,7 +1,7 @@ /* * ALSA SoC Synopsys PIO PCM for I2S driver * - * sound/soc/dwc/designware_pcm.c + * sound/soc/dwc/designware_i2s_pcm.c * * Copyright (C) 2016 Synopsys * Jose Abreu <joabreu(a)synopsys.com> -- 2.9.3

4 13

[alsa-devel] [PATCH 0/2] ASoC: stm32: Add I2S driver
by olivier moysan 27 Apr '17

27 Apr '17

This patch-set handles the SPI/I2S IP on STM32 platforms. It applies to STM32 platforms implementing version 2 of SPI/I2S IP like STM32H7 series. The SPI/I2S block is a serial peripheral interface (SPI), which can also be configured to work on I2S/PCM mode. ASoC STM32 I2S driver only supports this I2S/PCM mode. The I2S/PCM interface can either support full duplex or half-duplex communication (transmitter or receiver only). I2S driver exhibits 3 DAIs corresponding to a playback, capture or full duplex PCM device. When the interface is configured as full duplex, the related PCM device must be opened twice. The PCM streams are started when both playback and capture devices are opened. The relevant DAI can be selected through Device Tree using sound-dai-cells parameter. The I2S/PCM interface supports four audio standards: I2S Philips standard, MSB justified standard, LSB justified standard, PCM standard PCM standard is declined in two versions, PCM short and long, according frame synchronization duration. These standards can be mapped to ASoC standards as follows: - I2S: i2s - MSB justified standard: left_j - LSB justified standard: right_j - PCM short: dsp_a PCM long format is not exposed as it does not match supported ASoC standards. olivier moysan (2): dt-bindings: Document STM32 I2S bindings ASoC: stm32: Add I2S driver .../devicetree/bindings/sound/st,stm32h7-i2s.txt | 71 ++ sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/stm/Kconfig | 8 + sound/soc/stm/Makefile | 2 + sound/soc/stm/stm32_i2s.c | 1069 ++++++++++++++++++++ 6 files changed, 1152 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/st,stm32h7-i2s.txt create mode 100644 sound/soc/stm/Kconfig create mode 100644 sound/soc/stm/Makefile create mode 100644 sound/soc/stm/stm32_i2s.c -- 1.9.1

3 15

[alsa-devel] [PATCH v1 1/8] lib/uuid: Introduce uuid_{be|le}_cmp_p{p}() helpers
by Andy Shevchenko 27 Apr '17

27 Apr '17

New helpers take pointers to uuid_{be|le} as parameters. When using them on a raw data we don't need to do an ugly dereference and, in some cases, a type casting. Cc: Andrew Morton <akpm(a)linux-foundation.org> Cc: Arnd Bergmann <arnd(a)arndb.de> Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Vinod Koul <vinod.koul(a)intel.com> Cc: Srinivas Pandruvada <srinivas.pandruvada(a)linux.intel.com> Cc: Benjamin Tissoires <benjamin.tissoires(a)redhat.com> Cc: Kirti Wankhede <kwankhede(a)nvidia.com> Cc: Alex Williamson <alex.williamson(a)redhat.com> Cc: "K. Y. Srinivasan" <kys(a)microsoft.com> Cc: Haiyang Zhang <haiyangz(a)microsoft.com> Cc: Stephen Hemminger <sthemmin(a)microsoft.com> Cc: Tomas Winkler <tomas.winkler(a)intel.com> Cc: Matt Fleming <matt(a)codeblueprint.co.uk> Cc: Ard Biesheuvel <ard.biesheuvel(a)linaro.org> Cc: "Rafael J. Wysocki" <rjw(a)rjwysocki.net> Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- include/linux/uuid.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/linux/uuid.h b/include/linux/uuid.h index 4dff73a89758..45312cb5ac65 100644 --- a/include/linux/uuid.h +++ b/include/linux/uuid.h @@ -58,6 +58,26 @@ static inline int uuid_be_cmp(const uuid_be u1, const uuid_be u2) return memcmp(&u1, &u2, sizeof(uuid_be)); } +static inline int uuid_le_cmp_p(const uuid_le *pu1, const uuid_le u2) +{ + return memcmp(pu1, &u2, sizeof(uuid_le)); +} + +static inline int uuid_be_cmp_p(const uuid_be *pu1, const uuid_be u2) +{ + return memcmp(pu1, &u2, sizeof(uuid_be)); +} + +static inline int uuid_le_cmp_pp(const uuid_le *pu1, const uuid_le *pu2) +{ + return memcmp(pu1, pu2, sizeof(uuid_le)); +} + +static inline int uuid_be_cmp_pp(const uuid_be *pu1, const uuid_be *pu2) +{ + return memcmp(pu1, pu2, sizeof(uuid_be)); +} + void generate_random_uuid(unsigned char uuid[16]); extern void uuid_le_gen(uuid_le *u); -- 2.11.0

7 18

[alsa-devel] [PATCH] ASoC: Intel: Skylake: fix uninitialized pointer use
by Arnd Bergmann 27 Apr '17

27 Apr '17

The error handling in bxt_sst_dsp_init() got changed in a way that it now derefences an uninitialized pointer when printing a warning about the device not being found: sound/soc/intel/skylake/bxt-sst.c: In function 'bxt_sst_dsp_init': sound/soc/intel/skylake/bxt-sst.c:567:14: error: 'skl' may be used uninitialized in this function [-Werror=maybe-uninitialized] As we do have a valid device pointer available at the call site, let's use that instead. Fixes: 9fe9c7119283 ("ASoC: Intel: Skylake: Move sst common initialization to a helper function") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- sound/soc/intel/skylake/bxt-sst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/intel/skylake/bxt-sst.c b/sound/soc/intel/skylake/bxt-sst.c index fde4bc0f35b0..f5e7dbb1ba39 100644 --- a/sound/soc/intel/skylake/bxt-sst.c +++ b/sound/soc/intel/skylake/bxt-sst.c @@ -564,7 +564,7 @@ int bxt_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq, ret = skl_sst_ctx_init(dev, irq, fw_name, dsp_ops, dsp, &skl_dev); if (ret < 0) { - dev_err(skl->dev, "%s: no device\n", __func__); + dev_err(dev, "%s: no device\n", __func__); return ret; } -- 2.9.0

3 2

[alsa-devel] FW: Further goals of thread-safe PCM API
by Wischer, Timo (ADITG/SW1) 27 Apr '17

27 Apr '17

Hi everyone, I am wondering about the implementation of the new thread-safety feature [1]. There are so many issues with deadlocks (e.g. [3]) which were already solved but also which are not yet solved. Why do you not using a recursive mutex to avoid most of this deadlocks? Using PTHREAD_MUTEX_RECURSIVE as the pthread attribute [2]. What is the preferred solution for external ALSA plugins which are using the external IO plugin SDK to prevent such deadlocks? For example I have one plugin which calls snd_pcm_avail() in the ext IO plug start callback. This ends up in a deadlock. #0 0x0000003f44e0feec in __lll_lock_wait () from /lib64/libpthread.so.0 #1 0x0000003f44e09b15 in pthread_mutex_lock () from /lib64/libpthread.so.0 #2 0x00007ffff7d3c8b4 in snd_pcm_lock (pcm=0x623150) at ../../../alsa-lib-1.1.2/src/pcm/pcm_local.h:1101 #3 snd_pcm_avail (pcm=0x623150) at ../../../alsa-lib-1.1.2/src/pcm/pcm.c:2762 #4 0x00007ffff7ae1e03 in ?? () from /usr/lib64/alsa-lib/libasound_module_pcm_loop.so #5 0x00007ffff7d7df85 in snd_pcm_ioplug_start (pcm=0x623150) at ../../../alsa-lib-1.1.2/src/pcm/pcm_ioplug.c:458 #6 0x00007ffff7d41065 in __snd_pcm_start (pcm=0x623150, pcm=0x623150) at ../../../alsa-lib-1.1.2/src/pcm/pcm_local.h:427 #7 snd1_pcm_write_areas (pcm=pcm@entry=0x623150, areas=areas@entry=0x7fffffffe750, offset=offset@entry=0, size=size@entry=64, func=func@entry=0x7ffff7d7de00 <ioplug_priv_transfer_areas>) at ../../../alsa-lib-1.1.2/src/pcm/pcm.c:7248 #8 0x00007ffff7d7eb65 in snd_pcm_ioplug_writei (pcm=0x623150, buffer=<optimized out>, size=64) at ../../../alsa-lib-1.1.2/src/pcm/pcm_ioplug.c:579 #9 0x000000000040601a in pcm_write ( data=0x623350 "\006\003\271\375N\004\063\376j\002n\374)\005\331\376I\005Z\376w\001\n\374\025\003\373\376{\003i\377T\001~\375}\375\244\372\267\002c\376%\004\352\377\312\b[\005\261\001\216\376\b\001,\377\352", count=count@entry=64) at ../../alsa-utils-1.1.2/aplay/aplay.c:2001 #10 0x00000000004062cb in playback_go (fd=6, loaded=<optimized out>, loaded@entry=0, count=147256, rtype=rtype@entry=2, name=name@entry=0x7fffffffed9a "/opt/platform/unit_tests/audio8k16S.wav") at ../../alsa-utils-1.1.2/aplay/aplay.c:2750 #11 0x0000000000407417 in playback (name=0x7fffffffed9a "/opt/platform/unit_tests/audio8k16S.wav") at ../../alsa-utils-1.1.2/aplay/aplay.c:2811 #12 0x0000000000409778 in main (argc=8, argv=0x7fffffffeb18) at ../../alsa-utils-1.1.2/aplay/aplay.c:859 Therefore do I have to replace all snd_pcm_* function calls in the external plugin with the non-thread-safe variants __snd_pcm_*? Or is there a better solution available? >From my point of view the usage of a recursive mutex would be the best and most stable solution. [1] http://git.alsa-project.org/?p=alsa-lib.git;a=commit;h=54931e5a5455ac681a32… [2] https://linux.die.net/man/3/pthread_mutexattr_settype [3] http://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff;h=24e63b75275e9c92… [4] http://www.alsa-project.org/alsa-doc/alsa-lib/group___p_c_m___i_o_plug.html… Best regards Timo Wischer Advanced Driver Information Technology GmbH Software Group I (ADITG/SW1) Robert-Bosch-Str. 200 31139 Hildesheim Germany twischer(a)de.adit-jv.com ADIT is a joint venture company of Robert Bosch GmbH/Robert Bosch Car Multimedia GmbH and DENSO Corporation Sitz: Hildesheim, Registergericht: Amtsgericht Hildesheim HRB 3438 Geschaeftsfuehrung: Wilhelm Grabow, Ken Yaguchi

2 4

[alsa-devel] [PATCH][resend] topology: Allow a data section to contain multiple tuples objects
by fuweix.tang＠intel.com 27 Apr '17

27 Apr '17

From: Mengdong Lin <mengdong.lin(a)linux.intel.com> It's easy to use a vendor tuples object to define a C structure instance as vendor specific parameter for kernel drivers. And sometimes the kernel drivers may want a group of structures. So this patch will allow user to define multiple vendor tuples objects in a data section, to avoid defining multiple data sections and each data section only has 1 vendor tuples object. There is no ABI change in this patch. Signed-off-by: Mengdong Lin <mengdong.lin(a)linux.intel.com> Signed-off-by: Fuwei Tang <fuweix.tang(a)intel.com> --- include/topology.h | 14 ++++++++++ src/topology/data.c | 78 ++++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 74 insertions(+), 18 deletions(-) diff --git a/include/topology.h b/include/topology.h index 1bebe1e..ccb3a00 100644 --- a/include/topology.h +++ b/include/topology.h @@ -214,6 +214,20 @@ extern "C" { * The keyword tuples is to define vendor specific tuples. Please refer to * section Vendor Tokens and Vendor tuples. * + * It's easy to use a vendor tuples object to define a C structure instance. + * And a data section can include multiple vendor tuples objects: + * + * <pre> + * SectionData."data element name" { + * index "1" #Index number + * tuples [ + * "id of the 1st vendor tuples section" + * "id of the 2nd vendor tuples section" + * ... + * ] + * }; + * </pre> + * * <h5>How to define an element with private data</h5> * An element can refer to a single data section or multiple data * sections. diff --git a/src/topology/data.c b/src/topology/data.c index 00785ef..36060eb 100644 --- a/src/topology/data.c +++ b/src/topology/data.c @@ -408,7 +408,7 @@ static unsigned int get_tuple_size(int type) } } -/* fill a data element's private buffer with its tuples */ +/* Add a tuples object to the private buffer of its parent data element */ static int copy_tuples(struct tplg_elem *elem, struct tplg_vendor_tuples *tuples, struct tplg_vendor_tokens *tokens) { @@ -423,12 +423,9 @@ static int copy_tuples(struct tplg_elem *elem, unsigned int i, j; int token_val; - if (priv) { - SNDERR("error: %s has more data than tuples\n", elem->id); - return -EINVAL; - } + size = priv ? priv->size : 0; /* original private data size */ - size = 0; + /* scan each tuples set (one set per type) */ for (i = 0; i < tuples->num_sets ; i++) { tuple_set = tuples->set[i]; set_size = sizeof(struct snd_soc_tplg_vendor_array) @@ -448,7 +445,7 @@ static int copy_tuples(struct tplg_elem *elem, return -ENOMEM; off = priv->size; - priv->size = size; + priv->size = size; /* update private data size */ array = (struct snd_soc_tplg_vendor_array *)(priv->data + off); array->size = set_size; @@ -495,6 +492,7 @@ static int build_tuples(snd_tplg_t *tplg, struct tplg_elem *elem) struct tplg_ref *ref; struct list_head *base, *pos; struct tplg_elem *tuples, *tokens; + int err; base = &elem->ref_list; list_for_each(pos, base) { @@ -504,23 +502,27 @@ static int build_tuples(snd_tplg_t *tplg, struct tplg_elem *elem) if (!ref->id || ref->type != SND_TPLG_TYPE_TUPLE) continue; - tplg_dbg("look up tuples %s\n", ref->id); + tplg_dbg("tuples '%s' used by data '%s'\n", ref->id, elem->id); if (!ref->elem) ref->elem = tplg_elem_lookup(&tplg->tuple_list, ref->id, SND_TPLG_TYPE_TUPLE, elem->index); tuples = ref->elem; - if (!tuples) + if (!tuples) { + SNDERR("error: cannot find tuples %s\n", ref->id); return -EINVAL; + } - tplg_dbg("found tuples %s\n", tuples->id); tokens = get_tokens(tplg, tuples); - if (!tokens) + if (!tokens) { + SNDERR("error: cannot find token for %s\n", ref->id); return -EINVAL; + } - tplg_dbg("found tokens %s\n", tokens->id); - /* a data object can only have one tuples object */ - return copy_tuples(elem, tuples->tuples, tokens->tokens); + /* a data object can have multiple tuples objects */ + err = copy_tuples(elem, tuples->tuples, tokens->tokens); + if (err < 0) + return err; } return 0; @@ -689,6 +691,47 @@ static int parse_tuple_sets(snd_config_t *cfg, return 0; } +/* Parse tuples references for a data element, either a single tuples section + * or a list of tuples sections. + */ +static int parse_tuples_refs(snd_config_t *cfg, + struct tplg_elem *elem) +{ + snd_config_type_t type; + snd_config_iterator_t i, next; + snd_config_t *n; + const char *val = NULL; + + type = snd_config_get_type(cfg); + + /* refer to a single tuples section */ + if (type == SND_CONFIG_TYPE_STRING) { + if (snd_config_get_string(cfg, &val) < 0) + return -EINVAL; + tplg_dbg("\ttuples: %s\n", val); + return tplg_ref_add(elem, SND_TPLG_TYPE_TUPLE, val); + } + + if (type != SND_CONFIG_TYPE_COMPOUND) { + SNDERR("error: compound type expected for %s", elem->id); + return -EINVAL; + } + + /* refer to a list of data sections */ + snd_config_for_each(i, next, cfg) { + const char *val; + + n = snd_config_iterator_entry(i); + if (snd_config_get_string(n, &val) < 0) + continue; + + tplg_dbg("\ttuples: %s\n", val); + tplg_ref_add(elem, SND_TPLG_TYPE_TUPLE, val); + } + + return 0; +} + /* Parse private data references for the element, either a single data section * or a list of data sections. */ @@ -1002,10 +1045,9 @@ int tplg_parse_data(snd_tplg_t *tplg, snd_config_t *cfg, } if (strcmp(id, "tuples") == 0) { - if (snd_config_get_string(n, &val) < 0) - return -EINVAL; - tplg_dbg(" Data: %s\n", val); - tplg_ref_add(elem, SND_TPLG_TYPE_TUPLE, val); + err = parse_tuples_refs(n, elem); + if (err < 0) + return err; continue; } -- 2.7.4

2 1

[alsa-devel] [PATCH 00/11] drm/i915: LPE audio runtime PM and multipipe
by ville.syrjala＠linux.intel.com 26 Apr '17

26 Apr '17

From: Ville Syrjälä <ville.syrjala(a)linux.intel.com> I was wondering why my VLV no longer runtime suspended, and after some thinking I decided it had to be the LPE audio preventing it. Turns out I was right, so here's my attempt at fixing it. And while looking at the code I couldn't help but notice that it couldn't actually handle multiple pipes playing back audio at the same time. And even having multiple displays active even if only one was playing audio was probably a recipe for failure. So I tried to fix that by registering a separate PCM device for each pipe. Note that the patch subjects may not reflect the subsystem very well since most of these straddle the border between drm and alsa. I think I just slapped on drm/i915 to most where there was no clear winner. Entire series available here: git://github.com/vsyrjala/linux.git lpe_audio_multipipe Cc: Takashi Iwai <tiwai(a)suse.de> Cc: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Ville Syrjälä (11): drm/i915: Fix runtime PM for LPE audio ALSA: x86: Clear the pdata.notify_lpe_audio pointer before teardown drm/i915: Stop pretending to mask/unmask LPE audio interrupts drm/i915: Remove the unsued pending_notify from LPE platform data drm/i915: Replace tmds_clock_speed and link_rate with just ls_clock drm/i915: Remove hdmi_connected from LPE audio pdata drm/i915: Reorganize intel_lpe_audio_notify() arguments drm/i915: Clean up the LPE audio platform data ALSA: x86: Prepare LPE audio ctls for multiple PCMs ALSA: x86: Split snd_intelhad into card and PCM specific structures ALSA: x86: Register multiple PCM devices for the LPE audio card drivers/gpu/drm/i915/i915_drv.h | 4 +- drivers/gpu/drm/i915/i915_irq.c | 15 +- drivers/gpu/drm/i915/intel_audio.c | 19 +-- drivers/gpu/drm/i915/intel_lpe_audio.c | 95 ++++------- include/drm/intel_lpe_audio.h | 20 ++- sound/x86/intel_hdmi_audio.c | 288 +++++++++++++++++++-------------- sound/x86/intel_hdmi_audio.h | 17 +- 7 files changed, 230 insertions(+), 228 deletions(-) -- 2.10.2

4 25