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

[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] [PATCH] treewide: fix typos of SPDX-License-Identifier
by Masahiro Yamada 03 Jun '19

03 Jun '19

Prior to the adoption of SPDX, it was difficult for tools to determine the correct license due to incomplete or badly formatted license text. The SPDX solves this issue, assuming people can correctly spell "SPDX-License-Identifier" although this assumption is broken in some places. Since scripts/spdxcheck.py parses only lines that exactly matches to the correct tag, it cannot (should not) detect this kind of error. If the correct tag is missing, scripts/checkpatch.pl warns like this: WARNING: Missing or malformed SPDX-License-Identifier tag in line * So, people should notice it before the patch submission, but in reality broken tags sometimes slip in. The checkpatch warning is not useful for checking the committed files globally since large number of files still have no SPDX tag. Also, I am not sure about the legal effect when the SPDX tag is broken. Anyway, these typos are absolutely worth fixing. It is pretty easy to find suspicious lines by grep. $ git grep --not -e SPDX-License-Identifier --and -e SPDX- -- \ :^LICENSES :^scripts/spdxcheck.py :^*/license-rules.rst arch/arm/kernel/bugs.c:// SPDX-Identifier: GPL-2.0 drivers/phy/st/phy-stm32-usbphyc.c:// SPDX-Licence-Identifier: GPL-2.0 drivers/pinctrl/sh-pfc/pfc-r8a77980.c:// SPDX-Lincense-Identifier: GPL 2.0 lib/test_stackinit.c:// SPDX-Licenses: GPLv2 sound/soc/codecs/max9759.c:// SPDX-Licence-Identifier: GPL-2.0 Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- arch/arm/kernel/bugs.c | 2 +- drivers/phy/st/phy-stm32-usbphyc.c | 2 +- drivers/pinctrl/sh-pfc/pfc-r8a77980.c | 2 +- lib/test_stackinit.c | 2 +- sound/soc/codecs/max9759.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/kernel/bugs.c b/arch/arm/kernel/bugs.c index d41d3598e5e5..14c8dbbb7d2d 100644 --- a/arch/arm/kernel/bugs.c +++ b/arch/arm/kernel/bugs.c @@ -1,4 +1,4 @@ -// SPDX-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0 #include <linux/init.h> #include <asm/bugs.h> #include <asm/proc-fns.h> diff --git a/drivers/phy/st/phy-stm32-usbphyc.c b/drivers/phy/st/phy-stm32-usbphyc.c index 1255cd1d9a60..56bdea4b0bd9 100644 --- a/drivers/phy/st/phy-stm32-usbphyc.c +++ b/drivers/phy/st/phy-stm32-usbphyc.c @@ -1,4 +1,4 @@ -// SPDX-Licence-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0 /* * STMicroelectronics STM32 USB PHY Controller driver * diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a77980.c b/drivers/pinctrl/sh-pfc/pfc-r8a77980.c index 473da65890a7..9ed4ead2dafb 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a77980.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a77980.c @@ -1,4 +1,4 @@ -// SPDX-Lincense-Identifier: GPL 2.0 +// SPDX-License-Identifier: GPL-2.0 /* * R8A77980 processor support - PFC hardware block. * diff --git a/lib/test_stackinit.c b/lib/test_stackinit.c index 13115b6f2b88..e97dc54b4fdf 100644 --- a/lib/test_stackinit.c +++ b/lib/test_stackinit.c @@ -1,4 +1,4 @@ -// SPDX-Licenses: GPLv2 +// SPDX-License-Identifier: GPL-2.0 /* * Test cases for compiler-based stack variable zeroing via future * compiler flags or CONFIG_GCC_PLUGIN_STRUCTLEAK*. diff --git a/sound/soc/codecs/max9759.c b/sound/soc/codecs/max9759.c index ecfb4a80424b..00e9d4fd1651 100644 --- a/sound/soc/codecs/max9759.c +++ b/sound/soc/codecs/max9759.c @@ -1,4 +1,4 @@ -// SPDX-Licence-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0 /* * MAX9759 Amplifier Driver * -- 2.17.1

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