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

[alsa-devel] [PATCH 0/5] Assorted fixes discovered with gcc 4.1
by Geert Uytterhoeven 04 Jun '19

04 Jun '19

Hi all, Ever since commit cafa0010cd51fb71 ("Raise the minimum required gcc version to 4.6"), I felt bored when looking at my test build logs, as I was no longer discovering many real issues. Hence I started wondering if the modern gcc versions are really catching these classes of bugs caught before with gcc 4.1, or if they just go undetected. I reverted some changes and applied some fixes, which allowed me to compile most of the kernel with gcc 4.1 again. I built an m68k/allmodconfig kernel, looked at all new warnings, and fixed the ones that are not false positives. The result is a patch series of 5 patches, of which one or two fix real bugs. Thanks for your comments, and for applying where appropriate! Geert Uytterhoeven (5): lightnvm: Fix uninitialized pointer in nvm_remove_tgt() rxrpc: Fix uninitialized error code in rxrpc_send_data_packet() net: sched: pie: Use ULL suffix for 64-bit constant ALSA: fireface: Use ULL suffixes for 64-bit constants [RFC] devlink: Fix uninitialized error code in devlink_fmsg_prepare_skb() drivers/lightnvm/core.c | 2 +- net/core/devlink.c | 2 +- net/rxrpc/output.c | 4 +++- net/sched/sch_pie.c | 2 +- sound/firewire/fireface/ff-protocol-latter.c | 10 +++++----- 5 files changed, 11 insertions(+), 9 deletions(-) -- 2.17.1 Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert(a)linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds

9 19

[alsa-devel] [PATCH] ASoC: core: move DAI pre-links initiation to snd_soc_instantiate_card
by Tzung-Bi Shih 04 Jun '19

04 Jun '19

Kernel crashes when an ASoC component rebinding. As an example, by using the following commands: - echo -n max98357a > /sys/bus/platform/drivers/max98357a/unbind - echo -n max98357a > /sys/bus/platform/drivers/max98357a/bind Got the error message: "Unable to handle kernel NULL pointer dereference at virtual address". The call trace: snd_soc_is_matching_component+0x30/0x6c soc_bind_dai_link+0x16c/0x240 snd_soc_bind_card+0x1e4/0xb10 snd_soc_add_component+0x270/0x300 snd_soc_register_component+0x54/0x6c devm_snd_soc_register_component+0x68/0xac max98357a_platform_probe+0x7c/0x94 The dai_link->platforms has been reset to NULL by soc_cleanup_platform() in soc_cleanup_card_resources() when un-registering component. However, it has no chance to re-allocate the dai_link->platforms when registering the component again. Move the DAI pre-links initiation from snd_soc_register_card() to snd_soc_instantiate_card() to make sure all DAI pre-links get initiated when component rebinding. Signed-off-by: Tzung-Bi Shih <tzungbi(a)google.com> --- sound/soc/soc-core.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 2d3520fca613..82ff384753c7 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2072,6 +2072,15 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) mutex_lock(&client_mutex); mutex_lock_nested(&card->mutex, SND_SOC_CARD_CLASS_INIT); + for_each_card_prelinks(card, i, dai_link) { + ret = soc_init_dai_link(card, dai_link); + if (ret) { + dev_err(card->dev, "ASoC: failed to init link %s: %d\n", + dai_link->name, ret); + goto probe_end; + } + } + card->dapm.bias_level = SND_SOC_BIAS_OFF; card->dapm.dev = card->dev; card->dapm.card = card; @@ -2241,7 +2250,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) snd_soc_dapm_sync(&card->dapm); probe_end: - if (ret < 0) + if (ret < 0 && ret != -EPROBE_DEFER) soc_cleanup_card_resources(card); mutex_unlock(&card->mutex); @@ -2794,26 +2803,9 @@ static int snd_soc_bind_card(struct snd_soc_card *card) */ int snd_soc_register_card(struct snd_soc_card *card) { - int i, ret; - struct snd_soc_dai_link *link; - if (!card->name || !card->dev) return -EINVAL; - mutex_lock(&client_mutex); - for_each_card_prelinks(card, i, link) { - - ret = soc_init_dai_link(card, link); - if (ret) { - soc_cleanup_platform(card); - dev_err(card->dev, "ASoC: failed to init link %s\n", - link->name); - mutex_unlock(&client_mutex); - return ret; - } - } - mutex_unlock(&client_mutex); - dev_set_drvdata(card->dev, card); snd_soc_initialize_card_lists(card); -- 2.22.0.rc1.257.g3120a18244-goog

2 3

[alsa-devel] [PATCH 0/5] ASoC: SOF: suspend/resume debug tools
by Pierre-Louis Bossart 03 Jun '19

03 Jun '19

No new functionality per se, just utilities for developers. The vast majority of current integration issues are related to HDAudio + trace support combined with runtime suspend/resume. Add a couple of changes to make it easier for developers to see the firmware logs across suspend/resume transitions, disable the trace and/or disable runtime_pm to help narrow down the problems. Kai Vehmanen (2): ASoC: SOF: trace: remove code duplication in sof_wait_trace_avail() ASoC: SOF: force end-of-file for debugfs trace at suspend Pierre-Louis Bossart (3): ASoC: SOF: trace: move to opt-in with Kconfig and module parameter ASoC: SOF: acpi: add module param to disable pm_runtime ASoC: SOF: pci: add module param to disable pm_runtime sound/soc/sof/Kconfig | 8 +++++ sound/soc/sof/core.c | 26 ++++++++++---- sound/soc/sof/sof-acpi-dev.c | 12 ++++++- sound/soc/sof/sof-pci-dev.c | 12 ++++++- sound/soc/sof/sof-priv.h | 3 ++ sound/soc/sof/trace.c | 67 ++++++++++++++++++++++++++++++------ 6 files changed, 110 insertions(+), 18 deletions(-) base-commit: 188d45fe779eeb8e3521b59fcb12cc48a6f2c203 -- 2.20.1

2 9

[alsa-devel] [PATCH v2] ASoC: hda: fix unbalanced codec dev refcount for HDA_DEV_ASOC
by Ranjani Sridharan 03 Jun '19

03 Jun '19

HDA_DEV_ASOC type codec device refcounts are managed differently from HDA_DEV_LEGACY devices. The refcount is released explicitly in snd_hdac_ext_bus_device_remove() for ASOC type devices. So, remove the put_device() call in snd_hda_codec_dev_free() for such devices to make the refcount balanced. This will prevent the NULL pointer exception when the codec driver is released after the card is freed. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- sound/pci/hda/hda_codec.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index b20eb7fc83eb..fcdf2cd3783b 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -840,7 +840,14 @@ static int snd_hda_codec_dev_free(struct snd_device *device) if (codec->core.type == HDA_DEV_LEGACY) snd_hdac_device_unregister(&codec->core); codec_display_power(codec, false); - put_device(hda_codec_dev(codec)); + + /* + * In the case of ASoC HD-audio bus, the device refcount is released in + * snd_hdac_ext_bus_device_remove() explicitly. + */ + if (codec->core.type == HDA_DEV_LEGACY) + put_device(hda_codec_dev(codec)); + return 0; } -- 2.17.1

3 2

[alsa-devel] [PATCH v2] Revert "ASoC: core: use component driver name as component name"
by Krzysztof Kozlowski 03 Jun '19

03 Jun '19

Using component driver as a name is not unique and it breaks audio in certain configurations, e.g. Hardkernel Odroid XU3 board where following components are registered: - "3830000.i2s" with driver name "snd_dmaengine_pcm" - "3830000.i2s-sec" with driver name "snd_dmaengine_pcm" - "3830000.i2s" with driver name "samsung-i2s" This reverts commit b19671d6caf1ac393681864d5d85dda9fa99a448. Signed-off-by: Krzysztof Kozlowski <krzk(a)kernel.org> --- Changes since v1: 1. Fix driver name in commit msg. --- sound/soc/soc-core.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 2d3520fca613..7abb017a83f3 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3113,10 +3113,7 @@ static int snd_soc_component_initialize(struct snd_soc_component *component, { struct snd_soc_dapm_context *dapm; - if (driver->name) - component->name = kstrdup(driver->name, GFP_KERNEL); - else - component->name = fmt_single_name(dev, &component->id); + component->name = fmt_single_name(dev, &component->id); if (!component->name) { dev_err(dev, "ASoC: Failed to allocate name\n"); return -ENOMEM; -- 2.7.4

2 2

[alsa-devel] [PATCH] ASoC: soc-core: fix ifnullfree.cocci warnings
by Julia Lawall 03 Jun '19

03 Jun '19

From: kbuild test robot <lkp(a)intel.com> sound/soc/soc-core.c:391:2-7: WARNING: NULL check before some freeing functions is not needed. NULL check before some freeing functions is not needed. Based on checkpatch warning "kfree(NULL) is safe this check is probably not required" and kfreeaddr.cocci by Julia Lawall. Generated by: scripts/coccinelle/free/ifnullfree.cocci Fixes: 8e144273005d ("ASoC: soc-core: merge soc_new_pcm_runtime() and soc_rtd_init()") Signed-off-by: kbuild test robot <lkp(a)intel.com> Signed-off-by: Julia Lawall <julia.lawall(a)lip6.fr> --- tree: https://github.com/morimoto/linux fw-cleanup-2019-05-30-v3 head: 7f2c61a9097fcf25dac44865db31e7eab5c8fc9d commit: 8e144273005d3caf8b9978e407e3d00b6180dd49 [96/103] ASoC: soc-core: merge soc_new_pcm_runtime() and soc_rtd_init() :::::: branch date: 12 hours ago :::::: commit date: 12 hours ago Please take the patch only if it's a positive warning. Thanks! soc-core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -387,8 +387,7 @@ static void soc_free_pcm_runtime(struct snd_soc_rtdcom_del_all(rtd); - if (rtd->codec_dais) - kfree(rtd->codec_dais); + kfree(rtd->codec_dais); list_del(&rtd->list); kfree(rtd);

2 1

[alsa-devel] [PATCH v3 00/30] Update cros_ec_commands.h
by Gwendal Grignou 03 Jun '19

03 Jun '19

The interface between CrosEC embedded controller and the host, described by cros_ec_commands.h, as diverged from what the embedded controller really support. The source of thruth is at https://chromium.googlesource.com/chromiumos/platform/ec/+/master/include/e… That include file is converted to remove ACPI and Embedded only code. >From now on, cros_ec_commands.h will be automatically generated from the file above, do not modify directly. Fell free to squash the commits below. Changes in v3: - Rebase after commit 81888d8ab1532 ("mfd: cros_ec: Update the EC feature codes") - Add Acked-by: Benson Leung <bleung(a)chromium.org> Changes in v2: - Move I2S changes at the end of the patchset, squashed with change in sound/soc/codecs/cros_ec_codec.c to match new interface. - Add Acked-by: Enric Balletbo i Serra <enric.balletbo(a)collabora.com> Gwendal Grignou (30): mfd: cros_ec: Update license term mfd: cros_ec: Zero BUILD_ macro mfd: cros_ec: set comments properly mfd: cros_ec: add ec_align macros mfd: cros_ec: Define commands as 4-digit UPPER CASE hex values mfd: cros_ec: use BIT macro mfd: cros_ec: Update ACPI interface definition mfd: cros_ec: move HDMI CEC API definition mfd: cros_ec: Remove zero-size structs mfd: cros_ec: Add Flash V2 commands API mfd: cros_ec: Add PWM_SET_DUTY API mfd: cros_ec: Add lightbar v2 API mfd: cros_ec: Expand hash API mfd: cros_ec: Add EC transport protocol v4 mfd: cros_ec: Complete MEMS sensor API mfd: cros_ec: Fix event processing API mfd: cros_ec: Add fingerprint API mfd: cros_ec: Fix temperature API mfd: cros_ec: Complete Power and USB PD API mfd: cros_ec: Add API for keyboard testing mfd: cros_ec: Add Hibernate API mfd: cros_ec: Add Smart Battery Firmware update API mfd: cros_ec: Add I2C passthru protection API mfd: cros_ec: Add API for EC-EC communication mfd: cros_ec: Add API for Touchpad support mfd: cros_ec: Add API for Fingerprint support mfd: cros_ec: Add API for rwsig mfd: cros_ec: Add SKU ID and Secure storage API mfd: cros_ec: Add Management API entry points mfd: cros_ec: Update I2S API include/linux/mfd/cros_ec_commands.h | 3658 ++++++++++++++++++++------ sound/soc/codecs/cros_ec_codec.c | 8 +- 2 files changed, 2915 insertions(+), 751 deletions(-) -- 2.21.0.1020.gf2820cf01a-goog

4 37

[alsa-devel] [PATCH v2] mfd: madera: Add missing of table registration
by Daniel Gomez 03 Jun '19

03 Jun '19

MODULE_DEVICE_TABLE(of, <of_match_table> should be called to complete DT OF mathing mechanism and register it. Before this patch: modinfo ./drivers/mfd/madera.ko | grep alias After this patch: modinfo ./drivers/mfd/madera.ko | grep alias alias: of:N*T*Ccirrus,wm1840C* alias: of:N*T*Ccirrus,wm1840 alias: of:N*T*Ccirrus,cs47l91C* alias: of:N*T*Ccirrus,cs47l91 alias: of:N*T*Ccirrus,cs47l90C* alias: of:N*T*Ccirrus,cs47l90 alias: of:N*T*Ccirrus,cs47l85C* alias: of:N*T*Ccirrus,cs47l85 alias: of:N*T*Ccirrus,cs47l35C* alias: of:N*T*Ccirrus,cs47l35 Reported-by: Javier Martinez Canillas <javier(a)dowhile0.org> Signed-off-by: Daniel Gomez <dagmcr(a)gmail.com> --- drivers/mfd/madera-core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/mfd/madera-core.c b/drivers/mfd/madera-core.c index 2a77988..826b971 100644 --- a/drivers/mfd/madera-core.c +++ b/drivers/mfd/madera-core.c @@ -286,6 +286,7 @@ const struct of_device_id madera_of_match[] = { { .compatible = "cirrus,wm1840", .data = (void *)WM1840 }, {} }; +MODULE_DEVICE_TABLE(of, madera_of_match); EXPORT_SYMBOL_GPL(madera_of_match); static int madera_get_reset_gpio(struct madera *madera) -- 2.7.4

3 2

[alsa-devel] Why open-coding in sof_hda_bus_init()?
by Takashi Iwai 03 Jun '19

03 Jun '19

Hi, while looking at SOF code due to the recent debugging session, I noticed that sof_hda_bus_init() is basically an open-code of the existing snd_hdac_ext_bus_init(). Why don't we simply call snd_hdac_ext_bus_init() like below? The only thing that differs is the handling of bus->id number, where SOF fixes to zero (which was actually done in a patch after the first commit). But judging from the comment, this doesn't seem like a big matter, as we assume a single bus, so far... thanks, Takashi --- diff --git a/sound/soc/sof/intel/Makefile b/sound/soc/sof/intel/Makefile index b8f58e006e29..f42450a9a7b6 100644 --- a/sound/soc/sof/intel/Makefile +++ b/sound/soc/sof/intel/Makefile @@ -7,7 +7,7 @@ snd-sof-intel-ipc-objs := intel-ipc.o snd-sof-intel-hda-common-objs := hda.o hda-loader.o hda-stream.o hda-trace.o \ hda-dsp.o hda-ipc.o hda-ctrl.o hda-pcm.o \ - hda-dai.o hda-bus.o \ + hda-dai.o \ apl.o cnl.o snd-sof-intel-hda-objs := hda-codec.o diff --git a/sound/soc/sof/intel/hda-bus.c b/sound/soc/sof/intel/hda-bus.c deleted file mode 100644 index a7e6d8227df6..000000000000 --- a/sound/soc/sof/intel/hda-bus.c +++ /dev/null @@ -1,111 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) -// -// This file is provided under a dual BSD/GPLv2 license. When using or -// redistributing this file, you may do so under either license. -// -// Copyright(c) 2018 Intel Corporation. All rights reserved. -// -// Authors: Keyon Jie <yang.jie(a)linux.intel.com> - -#include <linux/io.h> -#include <sound/hdaudio.h> -#include "../sof-priv.h" -#include "hda.h" - -#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) - -static const struct hdac_bus_ops bus_ops = { - .command = snd_hdac_bus_send_cmd, - .get_response = snd_hdac_bus_get_response, -}; - -#endif - -static void sof_hda_writel(u32 value, u32 __iomem *addr) -{ - writel(value, addr); -} - -static u32 sof_hda_readl(u32 __iomem *addr) -{ - return readl(addr); -} - -static void sof_hda_writew(u16 value, u16 __iomem *addr) -{ - writew(value, addr); -} - -static u16 sof_hda_readw(u16 __iomem *addr) -{ - return readw(addr); -} - -static void sof_hda_writeb(u8 value, u8 __iomem *addr) -{ - writeb(value, addr); -} - -static u8 sof_hda_readb(u8 __iomem *addr) -{ - return readb(addr); -} - -static int sof_hda_dma_alloc_pages(struct hdac_bus *bus, int type, - size_t size, struct snd_dma_buffer *buf) -{ - return snd_dma_alloc_pages(type, bus->dev, size, buf); -} - -static void sof_hda_dma_free_pages(struct hdac_bus *bus, - struct snd_dma_buffer *buf) -{ - snd_dma_free_pages(buf); -} - -static const struct hdac_io_ops io_ops = { - .reg_writel = sof_hda_writel, - .reg_readl = sof_hda_readl, - .reg_writew = sof_hda_writew, - .reg_readw = sof_hda_readw, - .reg_writeb = sof_hda_writeb, - .reg_readb = sof_hda_readb, - .dma_alloc_pages = sof_hda_dma_alloc_pages, - .dma_free_pages = sof_hda_dma_free_pages, -}; - -/* - * This can be used for both with/without hda link support. - */ -void sof_hda_bus_init(struct hdac_bus *bus, struct device *dev, - const struct hdac_ext_bus_ops *ext_ops) -{ - memset(bus, 0, sizeof(*bus)); - bus->dev = dev; - - bus->io_ops = &io_ops; - INIT_LIST_HEAD(&bus->stream_list); - - bus->irq = -1; - bus->ext_ops = ext_ops; - - /* - * There is only one HDA bus atm. keep the index as 0. - * Need to fix when there are more than one HDA bus. - */ - bus->idx = 0; - - spin_lock_init(&bus->reg_lock); - -#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) - INIT_LIST_HEAD(&bus->codec_list); - INIT_LIST_HEAD(&bus->hlink_list); - - mutex_init(&bus->cmd_mutex); - mutex_init(&bus->lock); - bus->ops = &bus_ops; - INIT_WORK(&bus->unsol_work, snd_hdac_bus_process_unsol_events); - bus->cmd_dma_state = true; -#endif - -} diff --git a/sound/soc/sof/intel/hda.h b/sound/soc/sof/intel/hda.h index 92d45c43b4b1..a9de6a297b56 100644 --- a/sound/soc/sof/intel/hda.h +++ b/sound/soc/sof/intel/hda.h @@ -532,8 +532,11 @@ int hda_dsp_ctrl_init_chip(struct snd_sof_dev *sdev, bool full_reset); /* * HDA bus operations. */ -void sof_hda_bus_init(struct hdac_bus *bus, struct device *dev, - const struct hdac_ext_bus_ops *ext_ops); +static inline void sof_hda_bus_init(struct hdac_bus *bus, struct device *dev, + const struct hdac_ext_bus_ops *ext_ops) +{ + snd_hdac_ext_bus_init(bus, dev, NULL, NULL, ext_ops); +} #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) /*

3 10

[alsa-devel] [PATCH] ALSA: pcm: Check for integer overflow during multiplication
by bgoswami＠codeaurora.org 03 Jun '19

03 Jun '19

From: Phani Kumar Uppalapati <phaniu(a)codeaurora.org> Channel info data structure is parsed from userspace and if the number of channels is not set correctly, it could lead to integer overflow when the number of channels is multiplied with pcm bit width. Add a condition to check for integer overflow during the multiplication operationi, and return error if overflow detected. Signed-off-by: Phani Kumar Uppalapati <phaniu(a)codeaurora.org> Signed-off-by: Banajit Goswami <bgoswami(a)codeaurora.org> --- sound/core/pcm_lib.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index 345ab1a..f45ae3a 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -1718,6 +1718,11 @@ static int snd_pcm_lib_ioctl_channel_info(struct snd_pcm_substream *substream, switch (runtime->access) { case SNDRV_PCM_ACCESS_MMAP_INTERLEAVED: case SNDRV_PCM_ACCESS_RW_INTERLEAVED: + if ((UINT_MAX/width) < info->channel) { + snd_printd("%s: integer overflow in multiplication\n", + __func__); + return -EINVAL; + } info->first = info->channel * width; info->step = runtime->channels * width; break; @@ -1725,6 +1730,12 @@ static int snd_pcm_lib_ioctl_channel_info(struct snd_pcm_substream *substream, case SNDRV_PCM_ACCESS_RW_NONINTERLEAVED: { size_t size = runtime->dma_bytes / runtime->channels; + + if ((size > 0) && ((UINT_MAX/(size * 8)) < info->channel)) { + snd_printd("%s: integer overflow in multiplication\n", + __func__); + return -EINVAL; + } info->first = info->channel * size * 8; info->step = width; break; -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

3 2