June 2019 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 0/3] SOF PM and jack detection fixes
by Ranjani Sridharan 27 Jun '19

27 Jun '19

This set of patches addresses issues related to runtime suspend and jack detection during runtime suspend. The first 2 patches handle enabling WAKEEN in the SOF driver to address issue with jack detection when the SOF device is runtime suspended. More details about the issue can be found here: https://github.com/thesofproject/linux/issues/909 The third patch allows the SOF driver to suspend after the autosuspend delay instead of suspending immediately upon boot. Pan Xiuli (1): ASoC: SOF: mark last_busy value at runtime PM init Rander Wang (2): ASoC: SOF: Intel: hda: reduce ifdef usage for hda ASoC: SOF: Intel: hda: Enable jack detection in sof hda driver sound/soc/sof/intel/hda-codec.c | 45 +++++++++++++++++++++++++++-- sound/soc/sof/intel/hda-dsp.c | 51 +++++++++++++++++++++------------ sound/soc/sof/intel/hda.h | 4 +++ sound/soc/sof/sof-pci-dev.c | 3 ++ 4 files changed, 83 insertions(+), 20 deletions(-) -- 2.17.1

3 6

[alsa-devel] [BUG] Line6 Helix / X Stomp: parse_audio_format_rates_v2v3(): unable to retrieve number of sample rates (clock 16)
by nick83ola 27 Jun '19

27 Jun '19

Hi all, I just purchased an HX stomp and when I connect to linux I get the following error message: [ 322.404503] usb 1-6: new high-speed USB device number 13 using xhci_hcd [ 322.531804] usb 1-6: New USB device found, idVendor=0e41, idProduct=4246, bcdDevice= 2.00 [ 322.531806] usb 1-6: New USB device strings: Mfr=1, Product=3, SerialNumber=2 [ 322.531806] usb 1-6: Product: HX Stomp [ 322.531807] usb 1-6: Manufacturer: LINE 6 [ 322.531808] usb 1-6: SerialNumber: 3021888 [ 322.535789] usb 1-6: parse_audio_format_rates_v2v3(): unable to retrieve number of sample rates (clock 16) [ 322.535907] usb 1-6: parse_audio_format_rates_v2v3(): unable to retrieve number of sample rates (clock 16) I have some kernel development experience but not a lot with usb so can someone point me where to start looking? there was a previous discussion on the mailing list related to this by Jens Verwiebe (and other request for help). Here are the relevant patches/discussion https://www.spinics.net/lists/alsa-devel/msg71459.html https://patchwork.kernel.org/patch/10113121/ If someone can help me I have an HX stomp here and time to do some debugging. Also if someone from Line6 is listening would be helpful to have some hints. Cheers Nicola Lunghi

1 0

[alsa-devel] [RFC PATCH 0/4] ASoC: hdac_hdmi: refine the hdac_hdmi jacks
by libin.yang＠intel.com 27 Jun '19

27 Jun '19

From: Libin Yang <libin.yang(a)intel.com> This patchset refines the hdac_hdmi jacks: 1. kctl setting should not impact on hdmi jack status 2. bind jack to pin-port instead of pcm 3. move creating jack into hdac_hdmi from machine drivers Libin Yang (4): ASoC: hdac_hdmi: amixer kctl setting should not impact on jack status ASoC: hdac_hdmi: jack_event represents the status ASoC: hdac_hdmi: refine hdmi jacks ASoC: hdac_hdmi: fix some coding style issue sound/soc/codecs/hdac_hdmi.c | 176 +++++++++++---------- sound/soc/intel/boards/bxt_da7219_max98357a.c | 10 -- sound/soc/intel/boards/bxt_rt298.c | 10 -- sound/soc/intel/boards/glk_rt5682_max98357a.c | 10 -- sound/soc/intel/boards/kbl_da7219_max98357a.c | 10 -- sound/soc/intel/boards/kbl_da7219_max98927.c | 10 -- sound/soc/intel/boards/kbl_rt5660.c | 10 -- sound/soc/intel/boards/kbl_rt5663_max98927.c | 10 -- .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 9 -- sound/soc/intel/boards/skl_hda_dsp_common.c | 9 -- sound/soc/intel/boards/skl_nau88l25_max98357a.c | 11 -- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 11 -- sound/soc/intel/boards/skl_rt286.c | 10 -- sound/soc/intel/boards/sof_rt5682.c | 11 -- 14 files changed, 92 insertions(+), 215 deletions(-) -- 2.7.4

4 14

Re: [alsa-devel] [PATCH 2/5] sound: soc: skylake: no need to check return value of debugfs_create functions
by Takashi Iwai 27 Jun '19

27 Jun '19

On Mon, 24 Jun 2019 12:53:34 +0200, Mark Brown wrote: > > On Sat, Jun 22, 2019 at 10:39:11PM +0200, Takashi Iwai wrote: > > > Well, I just wonder whether you have ever seen a case where the > > debugfs creation failed. Or more practically, would it fail silently > > at all? > > > If there can be a silent failure, then it's bad to just ignore, yes. > > We may need either to make it more obvious or return an error. > > Currently debugfs doesn't report any errors other than via the return > codes (at least in the common creation stuff) so it's up to the callers > to do that. So this should be changed to follow a la sysfs creation error, IMO. At least, the name conflicts etc should be reported more obviously. thanks, Takashi

3 2

[alsa-devel] [PATCH 0/2] ASoC: soc-core: update dai_link init
by Jerome Brunet 27 Jun '19

27 Jun '19

My initial goal with this patchset was to allow a dai_link to have no no platform component, instead of having dummy by default. However, when rebasing, I discovered that Kuninori Morimoto had recently done that in a different way :) I am still submitting my change since it should allow multiple platform components on a dai_link, which is one of the FIXME note in soc-core. I have also added a check on the codecs component availability to align on what was done for platforms and cpus Jerome Brunet (2): ASoC: soc-core: defer card registration if codec component is missing ASoC: soc-core: support dai_link with platforms_num != 1 include/sound/soc.h | 6 ++++ sound/soc/soc-core.c | 72 +++++++++++++++++++++----------------------- 2 files changed, 41 insertions(+), 37 deletions(-) -- 2.21.0

3 4

[alsa-devel] [PATCH v3 1/1] ASoC: Intel: Skylake: Remove static table index when parsing topology
by Amadeusz Sławiński 26 Jun '19

26 Jun '19

Currently when we remove and reload driver we use previous ref_count value to start iterating over skl->modules which leads to out of table access. To fix this just inline the function and calculate indexes everytime we parse UUID token. Change-Id: Ic1de06143579c12eb15120d5d7c219767a939042 Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com> --- sound/soc/intel/skylake/skl-topology.c | 34 +++++++++----------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index 6241e35213af..6f991af7af23 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -3465,25 +3465,6 @@ static int skl_tplg_get_int_tkn(struct device *dev, return tkn_count; } -static int skl_tplg_get_manifest_uuid(struct device *dev, - struct skl *skl, - struct snd_soc_tplg_vendor_uuid_elem *uuid_tkn) -{ - static int ref_count; - struct skl_module *mod; - - if (uuid_tkn->token == SKL_TKN_UUID) { - mod = skl->modules[ref_count]; - guid_copy(&mod->uuid, (guid_t *)&uuid_tkn->uuid); - ref_count++; - } else { - dev_err(dev, "Not an UUID token tkn %d\n", uuid_tkn->token); - return -EINVAL; - } - - return 0; -} - /* * Fill the manifest structure by parsing the tokens based on the * type. @@ -3494,6 +3475,7 @@ static int skl_tplg_get_manifest_tkn(struct device *dev, { int tkn_count = 0, ret; int off = 0, tuple_size = 0; + u8 uuid_index = 0; struct snd_soc_tplg_vendor_array *array; struct snd_soc_tplg_vendor_value_elem *tkn_elem; @@ -3516,9 +3498,17 @@ static int skl_tplg_get_manifest_tkn(struct device *dev, continue; case SND_SOC_TPLG_TUPLE_TYPE_UUID: - ret = skl_tplg_get_manifest_uuid(dev, skl, array->uuid); - if (ret < 0) - return ret; + if (array->uuid->token != SKL_TKN_UUID) { + dev_err(dev, "Not an UUID token: %d\n", + array->uuid->token); + return -EINVAL; + } + if (uuid_index >= skl->nr_modules) { + dev_err(dev, "Too many UUID tokens\n"); + return -EINVAL; + } + guid_copy(&skl->modules[uuid_index++]->uuid, + (guid_t *)&array->uuid->uuid); tuple_size += sizeof(*array->uuid); continue; -- 2.17.1

1 0

[alsa-devel] [PATCH 1/2] ASoC: codecs: ad193x: Fix memory corruption on BE 64b systems
by Codrin Ciubotariu 26 Jun '19

26 Jun '19

Since change_bit() requires unsigned long*, making this cast on an unsigned int variable will change a wrong bit on BE platforms, causing memory corruption. Replace this function with a simple XOR. Fixes: 90f6e6803139 ("ASoC: codecs: ad193x: Fix frame polarity for DSP_A format") Reported-by: Dan Carpenter <dan.carpenter(a)oracle.com> Signed-off-by: Codrin Ciubotariu <codrin.ciubotariu(a)microchip.com> --- sound/soc/codecs/ad193x.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/ad193x.c b/sound/soc/codecs/ad193x.c index 05f4514048e2..3ebc0524f4b2 100644 --- a/sound/soc/codecs/ad193x.c +++ b/sound/soc/codecs/ad193x.c @@ -240,10 +240,8 @@ static int ad193x_set_dai_fmt(struct snd_soc_dai *codec_dai, } /* For DSP_*, LRCLK's polarity must be inverted */ - if (fmt & SND_SOC_DAIFMT_DSP_A) { - change_bit(ffs(AD193X_DAC_LEFT_HIGH) - 1, - (unsigned long *)&dac_fmt); - } + if (fmt & SND_SOC_DAIFMT_DSP_A) + dac_fmt ^= AD193X_DAC_LEFT_HIGH; switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { case SND_SOC_DAIFMT_CBM_CFM: /* codec clk & frm master */ -- 2.20.1

4 5

[alsa-devel] [PATCH v2 00/11] Fix driver reload issues
by Amadeusz Sławiński 26 Jun '19

26 Jun '19

Hi, This series of patches introduces fixes to various issues found while trying to unload all snd* modules and then loading them again. This allows for modules to be really _modules_ and be unloaded and loaded on demand, making it easier to develop and test them without constant system reboots. There are some fixes in flow, either we don't initialize things before cleaning them up, clean up in wrong places or don't clean up at all. Other patches fix memory management problems, mostly things are not being freed. And finally there is few miscellaneous patches, please refer to specific patches to see what they do. This series was tested on SKL, BXT, GLK & KBL. Changes from previous patchset: * followed suggetion by Pierre in "ALSA: hdac: Fix codec name after machine driver is unloaded and reloaded" * dropped patches which were merged Amadeusz Sławiński (11): ASoC: Intel: Skylake: Initialize lists before access so they are safe to use ALSA: hdac: Fix codec name after machine driver is unloaded and reloaded ASoC: compress: Fix memory leak from snd_soc_new_compress ASoC: Intel: Skylake: Don't return failure on machine driver reload ASoC: Intel: Skylake: Remove static table index when parsing topology ASoC: Intel: Skylake: Add function to cleanup debugfs interface ASoC: Intel: Skylake: Properly cleanup on component removal ASoC: Intel: Skylake: Fix NULL ptr dereference when unloading clk dev ASoC: Intel: hdac_hdmi: Set ops to NULL on remove ASoC: topology: Consolidate how dtexts and dvalues are freed ASoC: topology: Consolidate and fix asoc_tplg_dapm_widget_*_create flow sound/hda/ext/hdac_ext_bus.c | 8 +- sound/soc/codecs/hdac_hdmi.c | 6 ++ sound/soc/intel/skylake/skl-debug.c | 9 ++ sound/soc/intel/skylake/skl-pcm.c | 16 ++-- sound/soc/intel/skylake/skl-ssp-clk.c | 16 ++-- sound/soc/intel/skylake/skl-topology.c | 50 ++++++----- sound/soc/intel/skylake/skl-topology.h | 2 + sound/soc/intel/skylake/skl.c | 7 +- sound/soc/intel/skylake/skl.h | 5 ++ sound/soc/soc-compress.c | 17 ++-- sound/soc/soc-topology.c | 114 ++++++++++++------------- 11 files changed, 136 insertions(+), 114 deletions(-) -- 2.17.1

5 27

[alsa-devel] [PATCH] ASoC: rsnd: ssiu: tidyup SSI_MODE1/2 settings
by Kuninori Morimoto 26 Jun '19

26 Jun '19

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> R-Car Sound can use pin sharing and multi-SSI for SSI0/1/2/3/4/9. Because complex HW settings and spaghetti code, the settings for SSI9 pin sharing with SSI0 doesn't work. This patch tidyup settings for it. Reported-by: Hien Dang <hien.dang.eb(a)renesas.com> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Tested-by: Chaoliang Qin <chaoliang.qin.jg(a)renesas.com> --- sound/soc/sh/rcar/ssiu.c | 92 +++++++++++++++++++++++------------------------- 1 file changed, 44 insertions(+), 48 deletions(-) diff --git a/sound/soc/sh/rcar/ssiu.c b/sound/soc/sh/rcar/ssiu.c index 2347f34..f35d882 100644 --- a/sound/soc/sh/rcar/ssiu.c +++ b/sound/soc/sh/rcar/ssiu.c @@ -60,11 +60,11 @@ static int rsnd_ssiu_init(struct rsnd_mod *mod, struct rsnd_priv *priv) { struct rsnd_dai *rdai = rsnd_io_to_rdai(io); - u32 multi_ssi_slaves = rsnd_ssi_multi_slaves_runtime(io); + u32 ssis = rsnd_ssi_multi_slaves_runtime(io); int use_busif = rsnd_ssi_use_busif(io); int id = rsnd_mod_id(mod); - u32 mask1, val1; - u32 mask2, val2; + int is_clk_master = rsnd_rdai_is_clk_master(rdai); + u32 val1, val2; int i; /* clear status */ @@ -89,57 +89,53 @@ static int rsnd_ssiu_init(struct rsnd_mod *mod, rsnd_mod_bset(mod, SSI_MODE0, (1 << id), !use_busif << id); /* - * SSI_MODE1 + * SSI_MODE1 / SSI_MODE2 + * + * FIXME + * sharing/multi with SSI0 are mainly supported */ - mask1 = (1 << 4) | (1 << 20); /* mask sync bit */ - mask2 = (1 << 4); /* mask sync bit */ - val1 = val2 = 0; - if (id == 8) { - /* - * SSI8 pin is sharing with SSI7, nothing to do. - */ - } else if (rsnd_ssi_is_pin_sharing(io)) { - int shift = -1; - - switch (id) { - case 1: - shift = 0; - break; - case 2: - shift = 2; - break; - case 4: - shift = 16; - break; - default: - return -EINVAL; - } - - mask1 |= 0x3 << shift; - val1 = rsnd_rdai_is_clk_master(rdai) ? - 0x2 << shift : 0x1 << shift; + val1 = rsnd_mod_read(mod, SSI_MODE1); + val2 = rsnd_mod_read(mod, SSI_MODE2); + if (rsnd_ssi_is_pin_sharing(io)) { - } else if (multi_ssi_slaves) { + ssis |= (1 << id); - mask2 |= 0x00000007; - mask1 |= 0x0000000f; - - switch (multi_ssi_slaves) { - case 0x0206: /* SSI0/1/2/9 */ - val2 = (1 << 4) | /* SSI0129 sync */ - (rsnd_rdai_is_clk_master(rdai) ? 0x2 : 0x1); - /* fall through */ - case 0x0006: /* SSI0/1/2 */ - val1 = rsnd_rdai_is_clk_master(rdai) ? - 0xa : 0x5; + } else if (ssis) { + /* + * Multi SSI + * + * set synchronized bit here + */ - if (!val2) /* SSI012 sync */ - val1 |= (1 << 4); - } + /* SSI4 is synchronized with SSI3 */ + if (ssis & (1 << 4)) + val1 |= (1 << 20); + /* SSI012 are synchronized */ + if (ssis == 0x0006) + val1 |= (1 << 4); + /* SSI0129 are synchronized */ + if (ssis == 0x0206) + val2 |= (1 << 4); } - rsnd_mod_bset(mod, SSI_MODE1, mask1, val1); - rsnd_mod_bset(mod, SSI_MODE2, mask2, val2); + /* SSI1 is sharing pin with SSI0 */ + if (ssis & (1 << 1)) + val1 |= is_clk_master ? 0x2 : 0x1; + + /* SSI2 is sharing pin with SSI0 */ + if (ssis & (1 << 2)) + val1 |= is_clk_master ? 0x2 << 2 : + 0x1 << 2; + /* SSI4 is sharing pin with SSI3 */ + if (ssis & (1 << 4)) + val1 |= is_clk_master ? 0x2 << 16 : + 0x1 << 16; + /* SSI9 is sharing pin with SSI0 */ + if (ssis & (1 << 9)) + val2 |= is_clk_master ? 0x2 : 0x1; + + rsnd_mod_bset(mod, SSI_MODE1, 0x0013001f, val1); + rsnd_mod_bset(mod, SSI_MODE2, 0x00000017, val2); return 0; } -- 2.7.4

2 1

[alsa-devel] [PATCH] ASoC: madera: Update SPDX headers
by Charles Keepax 26 Jun '19

26 Jun '19

The madera driver was merged too late to catch Thomas Gleixner's cleanup of the SPDX headers tree wide. Update the headers to match what was done in that patch. Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- include/dt-bindings/sound/madera.h | 6 +----- include/sound/madera-pdata.h | 6 +----- sound/soc/codecs/cs47l35.c | 6 +----- sound/soc/codecs/cs47l85.c | 6 +----- sound/soc/codecs/cs47l90.c | 6 +----- sound/soc/codecs/madera.c | 6 +----- sound/soc/codecs/madera.h | 6 +----- 7 files changed, 7 insertions(+), 35 deletions(-) diff --git a/include/dt-bindings/sound/madera.h b/include/dt-bindings/sound/madera.h index 9ff4eae5259b0..d0096d5eb0dab 100644 --- a/include/dt-bindings/sound/madera.h +++ b/include/dt-bindings/sound/madera.h @@ -1,13 +1,9 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Device Tree defines for Madera codecs * * Copyright (C) 2016-2017 Cirrus Logic, Inc. and * Cirrus Logic International Semiconductor Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */ #ifndef DT_BINDINGS_SOUND_MADERA_H diff --git a/include/sound/madera-pdata.h b/include/sound/madera-pdata.h index 441decefb7f34..e3060f48f1081 100644 --- a/include/sound/madera-pdata.h +++ b/include/sound/madera-pdata.h @@ -1,13 +1,9 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Platform data for Madera codec driver * * Copyright (C) 2016-2019 Cirrus Logic, Inc. and * Cirrus Logic International Semiconductor Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */ #ifndef MADERA_CODEC_PDATA_H diff --git a/sound/soc/codecs/cs47l35.c b/sound/soc/codecs/cs47l35.c index 02f193dadd41a..511d0d6fa962a 100644 --- a/sound/soc/codecs/cs47l35.c +++ b/sound/soc/codecs/cs47l35.c @@ -1,14 +1,10 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only // // ALSA SoC Audio driver for CS47L35 codec // // Copyright (C) 2015-2019 Cirrus Logic, Inc. and // Cirrus Logic International Semiconductor Ltd. // -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by the -// Free Software Foundation; version 2. -// #include <linux/delay.h> #include <linux/device.h> diff --git a/sound/soc/codecs/cs47l85.c b/sound/soc/codecs/cs47l85.c index 4c4bae6e2c57e..32fe7ffb75268 100644 --- a/sound/soc/codecs/cs47l85.c +++ b/sound/soc/codecs/cs47l85.c @@ -1,14 +1,10 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only // // ALSA SoC Audio driver for CS47L85 codec // // Copyright (C) 2015-2019 Cirrus Logic, Inc. and // Cirrus Logic International Semiconductor Ltd. // -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by the -// Free Software Foundation; version 2. -// #include <linux/module.h> #include <linux/moduleparam.h> diff --git a/sound/soc/codecs/cs47l90.c b/sound/soc/codecs/cs47l90.c index 83c4e4628bdea..c4ecb0e6911af 100644 --- a/sound/soc/codecs/cs47l90.c +++ b/sound/soc/codecs/cs47l90.c @@ -1,14 +1,10 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only // // ALSA SoC Audio driver for CS47L90 codec // // Copyright (C) 2015-2019 Cirrus Logic, Inc. and // Cirrus Logic International Semiconductor Ltd. // -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by the -// Free Software Foundation; version 2. -// #include <linux/module.h> #include <linux/moduleparam.h> diff --git a/sound/soc/codecs/madera.c b/sound/soc/codecs/madera.c index 6146c7a070cb3..1b1be19a2f991 100644 --- a/sound/soc/codecs/madera.c +++ b/sound/soc/codecs/madera.c @@ -1,14 +1,10 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only // // Cirrus Logic Madera class codecs common support // // Copyright (C) 2015-2019 Cirrus Logic, Inc. and // Cirrus Logic International Semiconductor Ltd. // -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by the -// Free Software Foundation; version 2. -// #include <linux/delay.h> #include <linux/gcd.h> diff --git a/sound/soc/codecs/madera.h b/sound/soc/codecs/madera.h index aa2db156582b9..0af66f2807708 100644 --- a/sound/soc/codecs/madera.h +++ b/sound/soc/codecs/madera.h @@ -1,13 +1,9 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Cirrus Logic Madera class codecs common support * * Copyright (C) 2015-2018 Cirrus Logic, Inc. and * Cirrus Logic International Semiconductor Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by the - * Free Software Foundation; version 2. */ #ifndef ASOC_MADERA_H -- 2.11.0

2 1