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

[PATCH] ASoC: soc-core: Remove name length truncation
by Tom Eccles 09 Apr '20

09 Apr '20

snd_soc_dai.name and snd_soc_component.name are a simplified version of the parent device's name, truncated to NAME_SIZE characters (see fmt_single_name). NAME_SIZE was 32 characters. Some device names may share a common prefix longer than 32 characters, which leads to non-unique snd_soc_dai.name and snd_soc_component.name. When these are added to debugfs, the .name is used for the file. If the names are not unique, adding to debugfs fails. Instead, dynamically allocate name buffers to be as long as needed. Signed-off-by: Tom Eccles <tom.eccles(a)codethink.co.uk> --- sound/soc/soc-core.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 843b8b1c89d4..7803222ede54 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -43,8 +43,6 @@ #define CREATE_TRACE_POINTS #include <trace/events/asoc.h> -#define NAME_SIZE 32 - static DEFINE_MUTEX(client_mutex); static LIST_HEAD(component_list); static LIST_HEAD(unbind_card_list); @@ -2291,13 +2289,15 @@ EXPORT_SYMBOL_GPL(snd_soc_unregister_card); */ static char *fmt_single_name(struct device *dev, int *id) { - char *found, name[NAME_SIZE]; + char *found, *name; int id1, id2; if (dev_name(dev) == NULL) return NULL; - strlcpy(name, dev_name(dev), NAME_SIZE); + name = devm_kstrdup(dev, dev_name(dev), GFP_KERNEL); + if (!name) + return NULL; /* are we a "%s.%d" name (platform and SPI components) */ found = strstr(name, dev->driver->name); @@ -2313,20 +2313,23 @@ static char *fmt_single_name(struct device *dev, int *id) } else { /* I2C component devices are named "bus-addr" */ if (sscanf(name, "%x-%x", &id1, &id2) == 2) { - char tmp[NAME_SIZE]; + char *tmp; /* create unique ID number from I2C addr and bus */ *id = ((id1 & 0xffff) << 16) + id2; /* sanitize component name for DAI link creation */ - snprintf(tmp, NAME_SIZE, "%s.%s", dev->driver->name, - name); - strlcpy(name, tmp, NAME_SIZE); + tmp = devm_kasprintf(dev, GFP_KERNEL, "%s.%s", + dev->driver->name, name); + devm_kfree(dev, name); + if (!tmp) + return NULL; + name = tmp; } else *id = 0; } - return devm_kstrdup(dev, name, GFP_KERNEL); + return name; } /* base-commit: fff876253c1e1b329257ba33045195c93e25adcd -- 2.20.1

1 0

Re: [PATCH] ALSA: ctxfi: Remove unnecessary cast in kfree
by Takashi Iwai 09 Apr '20

09 Apr '20

On Thu, 09 Apr 2020 13:20:52 +0200, Xu Wang wrote: > > Remove unnecassary casts in the argument to kfree. > > Signed-off-by: Xu Wang <vulab(a)iscas.ac.cn> Applied, thanks. Takashi

1 0

[PATCH v2 0/6] ASoC: topology: Propagate error appropriately
by Amadeusz Sławiński 09 Apr '20

09 Apr '20

v1: Check if kstrdup succeeded. v2: Remove unneeded freeing, which is performed in another place by dobj handlers. Additionally for functions which have return status which was ignored, perform success checks and handle failures in appropriate way. Amadeusz Sławiński (6): ASoC: topology: Add missing memory checks ASoC: topology: Check return value of soc_tplg_create_tlv ASoC: topology: Check return value of soc_tplg_*_create ASoC: topology: Check soc_tplg_add_route return value ASoC: topology: Check return value of pcm_new_ver ASoC: topology: Check return value of soc_tplg_dai_config sound/soc/soc-topology.c | 113 ++++++++++++++++++++++++++++++--------- 1 file changed, 88 insertions(+), 25 deletions(-) -- 2.17.1

5 23

alsa-gobject: Add shared library to operate ALSA rawmidi character device
by GitHub pull_request - opened 09 Apr '20

09 Apr '20

alsa-project/alsa-gobject pull request #16 was opened from takaswie: This patchset is to add a new library, libalsarawmidi, to operate ALSA rawmidi character device. This library is compatible with GObject Introspection. ALSA rawmidi interface is designed to transfer MIDI messages. Userspace application operate ALSA rawmidi character device for incoming/outgoing transmission. The transmission line is abstracted as substream. One character device is associated to several substreams. The application can indicate subdevice to select a substream or a pair of substreams from them. The library has ALSARawmidi.StreamPair to operate the character device. Userspace application call ALSARawmidi.StreamPair.open() to open the chracter device, select subdevice and attach the substreams to the device. After the call, data transmission already starts. The application can call ALSARawmidi.StreamPair.write_to_substream() to transfer MIDI message bytes. The application can also call ALSARawmidi.StreamPair.read_from_substream() to receive MIDI message bytes, but this call can be blocked till any messages are actually received and available as a default. For polling, GSource which ALSARawmidi.StreamPair.create_source() returns is useful. The application can use it for GMainContext/GMainLoop. When any message is available, ALSARawmidi.StreamPair emits 'handle-messages' GObject signal. The application register its handler to the signal in advance, then process the messages. ALSARawmidi.StreamPair has the other methods to drain/drop running substream: - ALSARawmidi.StreamPair.drain_substream() - ALSARawmidi.StreamPair.drop_substream() ALSARawmidi.StreamPair has more methods to return GObject-derived objects for information/status/parameters of substream: - ALSARawmidi.StreamPair.get_substream_info() - ALSARawmidi.StreamPair.get_substream_status() - ALSARawmidi.StreamPair.set_substream_params() The library includes global method to query information about rawmidi: - ALSARawmidi.get_rawmidi_sysname() - ALSARawmidi.get_rawmidi_devnode() - ALSARawmidi.get_device_id_list() - ALSARawmidi.get_subdevice_id_list() - ALSARawmidi.get_substream_info() Request URL : https://github.com/alsa-project/alsa-gobject/pull/16 Patch URL : https://github.com/alsa-project/alsa-gobject/pull/16.patch Repository URL: https://github.com/alsa-project/alsa-gobject

1 0

[PATCH 1/1] ASoC: soc-compress: lock pcm_mutex to resolve lockdep error
by 이경택 09 Apr '20

09 Apr '20

snd_soc_runtime_activate() and snd_soc_runtime_deactivate() require locked pcm_mutex. Signed-off-by: Gyeongtaek Lee <gt82.lee(a)samsung.com> --- sound/soc/soc-compress.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index 392a1c5b15d3..42d416ac7e9b 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -207,7 +207,9 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream) fe->dpcm[stream].state = SND_SOC_DPCM_STATE_OPEN; fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_NO; + mutex_lock_nested(&fe->pcm_mutex, fe->pcm_subclass); snd_soc_runtime_activate(fe, stream); + mutex_unlock(&fe->pcm_mutex); mutex_unlock(&fe->card->mutex); @@ -285,7 +287,9 @@ static int soc_compr_free_fe(struct snd_compr_stream *cstream) else stream = SNDRV_PCM_STREAM_CAPTURE; + mutex_lock_nested(&fe->pcm_mutex, fe->pcm_subclass); snd_soc_runtime_deactivate(fe, stream); + mutex_unlock(&fe->pcm_mutex); fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_FE; -- 2.21.0

3 5

[PATCH] ASoC: rt5682: fix building without I2C
by Arnd Bergmann 08 Apr '20

08 Apr '20

When I2C is disabled, building rt5682 produces a compile-time error: sound/soc/codecs/rt5682.c:3716:1: warning: data definition has no type or storage class 3716 | module_i2c_driver(rt5682_i2c_driver); | ^~~~~~~~~~~~~~~~~ sound/soc/codecs/rt5682.c:3716:1: error: type defaults to 'int' in declaration of 'module_i2c_driver' [-Werror=implicit-int] sound/soc/codecs/rt5682.c:3716:1: warning: parameter names (without types) in function declaration sound/soc/codecs/rt5682.c:3706:26: error: 'rt5682_i2c_driver' defined but not used [-Werror=unused-variable] 3706 | static struct i2c_driver rt5682_i2c_driver = { | ^~~~~~~~~~~~~~~~~ Move the i2c specific entry points into an #ifdef section so it can actually be built standalone. Fixes: 5549ea647997 ("ASoC: rt5682: fix unmet dependencies") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- sound/soc/codecs/rt5682.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c index c9268a230daa..a6548f870807 100644 --- a/sound/soc/codecs/rt5682.c +++ b/sound/soc/codecs/rt5682.c @@ -3224,12 +3224,6 @@ static const struct regmap_config rt5682_regmap = { .use_single_write = true, }; -static const struct i2c_device_id rt5682_i2c_id[] = { - {"rt5682", 0}, - {} -}; -MODULE_DEVICE_TABLE(i2c, rt5682_i2c_id); - static int rt5682_parse_dt(struct rt5682_priv *rt5682, struct device *dev) { @@ -3526,7 +3520,7 @@ int rt5682_io_init(struct device *dev, struct sdw_slave *slave) EXPORT_SYMBOL_GPL(rt5682_io_init); #endif -static int rt5682_i2c_probe(struct i2c_client *i2c, +static int __maybe_unused rt5682_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { struct rt5682_platform_data *pdata = dev_get_platdata(&i2c->dev); @@ -3680,13 +3674,14 @@ static int rt5682_i2c_probe(struct i2c_client *i2c, rt5682_dai, ARRAY_SIZE(rt5682_dai)); } -static void rt5682_i2c_shutdown(struct i2c_client *client) +static void __maybe_unused rt5682_i2c_shutdown(struct i2c_client *client) { struct rt5682_priv *rt5682 = i2c_get_clientdata(client); rt5682_reset(rt5682); } +#ifdef CONFIG_I2C #ifdef CONFIG_OF static const struct of_device_id rt5682_of_match[] = { {.compatible = "realtek,rt5682i"}, @@ -3703,6 +3698,12 @@ static const struct acpi_device_id rt5682_acpi_match[] = { MODULE_DEVICE_TABLE(acpi, rt5682_acpi_match); #endif +static const struct i2c_device_id rt5682_i2c_id[] = { + {"rt5682", 0}, + {} +}; +MODULE_DEVICE_TABLE(i2c, rt5682_i2c_id); + static struct i2c_driver rt5682_i2c_driver = { .driver = { .name = "rt5682", @@ -3714,6 +3715,7 @@ static struct i2c_driver rt5682_i2c_driver = { .id_table = rt5682_i2c_id, }; module_i2c_driver(rt5682_i2c_driver); +#endif MODULE_DESCRIPTION("ASoC RT5682 driver"); MODULE_AUTHOR("Bard Liao <bardliao(a)realtek.com>"); -- 2.26.0

2 1

[PATCH] ASoC: brcm: fix dma_addr_t cast to pointer
by Arnd Bergmann 08 Apr '20

08 Apr '20

A dma_addr_t is not a pointer and a cast causes a warning when the sizes are different: sound/soc/bcm/bcm63xx-pcm-whistler.c: In function 'bcm63xx_pcm_pointer': sound/soc/bcm/bcm63xx-pcm-whistler.c:184:6: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast] 184 | if ((void *)prtd->dma_addr_next == NULL) Change the comparison to NULL to an equivalent if() check that does not warn. Fixes: 88eb404ccc3e ("ASoC: brcm: Add DSL/PON SoC audio driver") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- sound/soc/bcm/bcm63xx-pcm-whistler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/bcm/bcm63xx-pcm-whistler.c b/sound/soc/bcm/bcm63xx-pcm-whistler.c index e46c390683e7..b7a1efc7406e 100644 --- a/sound/soc/bcm/bcm63xx-pcm-whistler.c +++ b/sound/soc/bcm/bcm63xx-pcm-whistler.c @@ -181,7 +181,7 @@ bcm63xx_pcm_pointer(struct snd_soc_component *component, snd_pcm_uframes_t x; struct bcm63xx_runtime_data *prtd = substream->runtime->private_data; - if ((void *)prtd->dma_addr_next == NULL) + if (!prtd->dma_addr_next) prtd->dma_addr_next = substream->runtime->dma_addr; x = bytes_to_frames(substream->runtime, -- 2.26.0

1 0

[GIT PULL] ASoC fixes for v5.7
by Mark Brown 08 Apr '20

08 Apr '20

The following changes since commit 3d2cdb854659851d991f5b8e97e847e3fd240625: Merge series "ASoC: Intel: add SoundWire machine driver" from Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com>: (2020-03-27 17:28:36 +0000) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v5.7 for you to fetch changes up to ccfc531695f3a4aada042f6bdb33ac6be24e1aec: ASoC: cs4270: pull reset GPIO low then high (2020-04-07 15:29:54 +0100) ---------------------------------------------------------------- ASoC: Fixes for v5.7 A collection of fixes that have been accumilated since the merge window, mainly relating to x86 platform support. ---------------------------------------------------------------- Akshu Agrawal (1): ASoC: AMD: Clear format bits before setting them Cezary Rojewski (4): ASoC: Intel: broadwell: Remove ignore_suspend flag from SSP0 dai link ASoC: Intel: haswell: Remove ignore_suspend flag from SSP0 dai link ASoC: Intel: bdw-rt5677: Remove ignore_suspend flag from SSP0 dai link ASoC: Intel: bdw-rt5650: Remove ignore_suspend flag from SSP0 dai link Fabio Estevam (1): dt-bindings: sound: cs42l51: Remove unneeded I2C unit name Hans de Goede (6): ASoC: SOF: Turn "firmware boot complete" message into a dbg message ASoC: Intel: atom: Take the drv->lock mutex before calling sst_send_slot_map() ASoC: Intel: atom: Check drv->lock is locked in sst_fill_and_send_cmd_unlocked ASoC: Intel: atom: Fix uninitialized variable compiler warning ASoC: Intel: bytcr_rt5640: Add quirk for MPMAN MPWIN895CL tablet ASoC: rt5645: Add platform-data for Medion E1239T Julia Lawall (1): ASoC: stm32: sai: Add missing cleanup Mark Brown (1): Merge series "ASoC: Intel: boards: Remove ignore_suspend flag from SSP0 dai link" from Cezary Rojewski <cezary.rojewski(a)intel.com>: Mike Willard (1): ASoC: cs4270: pull reset GPIO low then high Pierre-Louis Bossart (1): ASoC: soc-dai: fix DAI startup/shutdown sequence Stephan Gerhold (1): ASoC: qcom: q6asm-dai: Add SNDRV_PCM_INFO_BATCH flag Takashi Iwai (1): ASoC: bcm: Fix pointer cast warning YueHaibing (1): ASoC: rt5682: Fix build error without CONFIG_I2C 이경택 (4): ASoC: fix regwmask ASoC: dapm: connect virtual mux with default value ASoC: dpcm: allow start or stop during pause for backend ASoC: topology: use name_prefix for new kcontrol .../devicetree/bindings/sound/cirrus,cs42l51.yaml | 2 +- include/sound/soc-dai.h | 2 +- sound/soc/amd/raven/acp3x-i2s.c | 1 + sound/soc/amd/raven/acp3x.h | 2 ++ sound/soc/bcm/bcm63xx-pcm-whistler.c | 2 +- sound/soc/codecs/cs4270.c | 40 +++++++++++++++++++--- sound/soc/codecs/rt5645.c | 8 +++++ sound/soc/codecs/rt5682.c | 5 ++- sound/soc/intel/atom/sst-atom-controls.c | 4 +++ sound/soc/intel/atom/sst/sst_pvt.c | 2 +- sound/soc/intel/boards/bdw-rt5650.c | 1 - sound/soc/intel/boards/bdw-rt5677.c | 1 - sound/soc/intel/boards/broadwell.c | 1 - sound/soc/intel/boards/bytcr_rt5640.c | 11 ++++++ sound/soc/intel/boards/haswell.c | 1 - sound/soc/qcom/qdsp6/q6asm-dai.c | 4 +-- sound/soc/soc-dai.c | 8 ++--- sound/soc/soc-dapm.c | 8 ++++- sound/soc/soc-ops.c | 4 +-- sound/soc/soc-pcm.c | 6 ++-- sound/soc/soc-topology.c | 2 +- sound/soc/sof/loader.c | 2 +- sound/soc/stm/stm32_sai_sub.c | 4 ++- 23 files changed, 93 insertions(+), 28 deletions(-)

2 1

[PATCH 1/2] ALSA: usb-audio: Add mixer workaround for TRX40 and co
by Takashi Iwai 08 Apr '20

08 Apr '20

Some recent boards (supposedly with a new AMD platform) contain the USB audio class 2 device that is often tied with HD-audio. The device exposes an Input Gain Pad control (id=19, control=12) but this node doesn't behave correctly, returning an error for each inquiry of GET_MIN and GET_MAX that should have been mandatory. As a workaround, simply ignore this node by adding a usbmix_name_map table entry. The currently known devices are: * 0414:a002 - Gigabyte TRX40 Aorus Pro WiFi * 0b05:1916 - ASUS ROG Zenith II * 0b05:1917 - ASUS ROG Strix * 0db0:0d64 - MSI TRX40 Creator * 0db0:543d - MSI TRX40 BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=206543 Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/usb/mixer_maps.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/sound/usb/mixer_maps.c b/sound/usb/mixer_maps.c index 5ebca8013840..72b575c34860 100644 --- a/sound/usb/mixer_maps.c +++ b/sound/usb/mixer_maps.c @@ -359,6 +359,14 @@ static const struct usbmix_name_map corsair_virtuoso_map[] = { { 0 } }; +/* Some mobos shipped with a dummy HD-audio show the invalid GET_MIN/GET_MAX + * response for Input Gain Pad (id=19, control=12). Skip it. + */ +static const struct usbmix_name_map asus_rog_map[] = { + { 19, NULL, 12 }, /* FU, Input Gain Pad */ + {} +}; + /* * Control map entries */ @@ -488,6 +496,26 @@ static const struct usbmix_ctl_map usbmix_ctl_maps[] = { .id = USB_ID(0x1b1c, 0x0a42), .map = corsair_virtuoso_map, }, + { /* Gigabyte TRX40 Aorus Pro WiFi */ + .id = USB_ID(0x0414, 0xa002), + .map = asus_rog_map, + }, + { /* ASUS ROG Zenith II */ + .id = USB_ID(0x0b05, 0x1916), + .map = asus_rog_map, + }, + { /* ASUS ROG Strix */ + .id = USB_ID(0x0b05, 0x1917), + .map = asus_rog_map, + }, + { /* MSI TRX40 Creator */ + .id = USB_ID(0x0db0, 0x0d64), + .map = asus_rog_map, + }, + { /* MSI TRX40 */ + .id = USB_ID(0x0db0, 0x543d), + .map = asus_rog_map, + }, { 0 } /* terminator */ }; -- 2.25.0

1 1

[PATCH] ALSA: hda/realtek - Add quirk for MSI GL63
by Takashi Iwai 08 Apr '20

08 Apr '20

MSI GL63 laptop requires the similar quirk like other MSI models, ALC1220_FIXUP_CLEVO_P950. The board BIOS doesn't provide a PCI SSID for the device, hence we need to take the codec SSID (1462:1275) instead. BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=207157 Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 019239190f6d..de2826f90d34 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -2455,6 +2455,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = { SND_PCI_QUIRK(0x1458, 0xa0b8, "Gigabyte AZ370-Gaming", ALC1220_FIXUP_GB_DUAL_CODECS), SND_PCI_QUIRK(0x1458, 0xa0cd, "Gigabyte X570 Aorus Master", ALC1220_FIXUP_CLEVO_P950), SND_PCI_QUIRK(0x1462, 0x1228, "MSI-GP63", ALC1220_FIXUP_CLEVO_P950), + SND_PCI_QUIRK(0x1462, 0x1275, "MSI-GL63", ALC1220_FIXUP_CLEVO_P950), SND_PCI_QUIRK(0x1462, 0x1276, "MSI-GL73", ALC1220_FIXUP_CLEVO_P950), SND_PCI_QUIRK(0x1462, 0x1293, "MSI-GP65", ALC1220_FIXUP_CLEVO_P950), SND_PCI_QUIRK(0x1462, 0x7350, "MSI-7350", ALC889_FIXUP_CD), -- 2.25.0

1 0