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

[alsa-devel] [PATCH] ALSA: compress: avoid integer overflow for long duration offload playback
by bgoswami＠codeaurora.org 18 Jun '19

18 Jun '19

From: Banajit Goswami <bgoswami(a)codeaurora.org> Currently a 32 bit variable is used for storing number of bytes copied to DSP, which can overflow when playback continues for a long duration. Change data type for this variable to __u64 to prevent overflow. Signed-off-by: Dhananjay Kumar <dhakumar(a)codeaurora.org> Signed-off-by: Banajit Goswami <bgoswami(a)codeaurora.org> --- include/uapi/sound/compress_offload.h | 2 +- sound/core/compress_offload.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/uapi/sound/compress_offload.h b/include/uapi/sound/compress_offload.h index 56d9567..db5edf3 100644 --- a/include/uapi/sound/compress_offload.h +++ b/include/uapi/sound/compress_offload.h @@ -67,7 +67,7 @@ struct snd_compr_params { */ struct snd_compr_tstamp { __u32 byte_offset; - __u32 copied_total; + __u64 copied_total; __u32 pcm_frames; __u32 pcm_io_frames; __u32 sampling_rate; diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index a1a6fd7..2d0a709 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -184,7 +184,7 @@ static int snd_compr_update_tstamp(struct snd_compr_stream *stream, if (!stream->ops->pointer) return -ENOTSUPP; stream->ops->pointer(stream, tstamp); - pr_debug("dsp consumed till %d total %d bytes\n", + pr_debug("dsp consumed till %d total %llu bytes\n", tstamp->byte_offset, tstamp->copied_total); if (stream->direction == SND_COMPRESS_PLAYBACK) stream->runtime->total_bytes_transferred = tstamp->copied_total; -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

3 2

[alsa-devel] [PATCH] ASoC: Intel: skl: extract common function
by Tzung-Bi Shih 18 Jun '19

18 Jun '19

Extract common logic to a function to avoid duplicate code. Signed-off-by: Tzung-Bi Shih <tzungbi(a)google.com> --- Refactor HDMI init to as most Intel machine drivers did, e.g. kbl_da7219_max98357a.c. .../soc/intel/boards/skl_nau88l25_max98357a.c | 39 +++++------------- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 40 +++++-------------- 2 files changed, 18 insertions(+), 61 deletions(-) diff --git a/sound/soc/intel/boards/skl_nau88l25_max98357a.c b/sound/soc/intel/boards/skl_nau88l25_max98357a.c index 3ce8efbeed12..485614c4fa47 100644 --- a/sound/soc/intel/boards/skl_nau88l25_max98357a.c +++ b/sound/soc/intel/boards/skl_nau88l25_max98357a.c @@ -179,7 +179,7 @@ static int skylake_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd) return ret; } -static int skylake_hdmi1_init(struct snd_soc_pcm_runtime *rtd) +static int skylake_hdmi_init(struct snd_soc_pcm_runtime *rtd, int device) { struct skl_nau8825_private *ctx = snd_soc_card_get_drvdata(rtd->card); struct snd_soc_dai *dai = rtd->codec_dai; @@ -189,7 +189,7 @@ static int skylake_hdmi1_init(struct snd_soc_pcm_runtime *rtd) if (!pcm) return -ENOMEM; - pcm->device = SKL_DPCM_AUDIO_HDMI1_PB; + pcm->device = device; pcm->codec_dai = dai; list_add_tail(&pcm->head, &ctx->hdmi_pcm_list); @@ -197,40 +197,19 @@ static int skylake_hdmi1_init(struct snd_soc_pcm_runtime *rtd) return 0; } -static int skylake_hdmi2_init(struct snd_soc_pcm_runtime *rtd) +static int skylake_hdmi1_init(struct snd_soc_pcm_runtime *rtd) { - struct skl_nau8825_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *dai = rtd->codec_dai; - struct skl_hdmi_pcm *pcm; - - pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL); - if (!pcm) - return -ENOMEM; - - pcm->device = SKL_DPCM_AUDIO_HDMI2_PB; - pcm->codec_dai = dai; - - list_add_tail(&pcm->head, &ctx->hdmi_pcm_list); + return skylake_hdmi_init(rtd, SKL_DPCM_AUDIO_HDMI1_PB); +} - return 0; +static int skylake_hdmi2_init(struct snd_soc_pcm_runtime *rtd) +{ + return skylake_hdmi_init(rtd, SKL_DPCM_AUDIO_HDMI2_PB); } static int skylake_hdmi3_init(struct snd_soc_pcm_runtime *rtd) { - struct skl_nau8825_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *dai = rtd->codec_dai; - struct skl_hdmi_pcm *pcm; - - pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL); - if (!pcm) - return -ENOMEM; - - pcm->device = SKL_DPCM_AUDIO_HDMI3_PB; - pcm->codec_dai = dai; - - list_add_tail(&pcm->head, &ctx->hdmi_pcm_list); - - return 0; + return skylake_hdmi_init(rtd, SKL_DPCM_AUDIO_HDMI3_PB); } static int skylake_nau8825_fe_init(struct snd_soc_pcm_runtime *rtd) diff --git a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c index 1a7ac8bdf543..772cbd6940db 100644 --- a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c +++ b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c @@ -198,7 +198,7 @@ static int skylake_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd) return ret; } -static int skylake_hdmi1_init(struct snd_soc_pcm_runtime *rtd) +static int skylake_hdmi_init(struct snd_soc_pcm_runtime *rtd, int device) { struct skl_nau88125_private *ctx = snd_soc_card_get_drvdata(rtd->card); struct snd_soc_dai *dai = rtd->codec_dai; @@ -208,7 +208,7 @@ static int skylake_hdmi1_init(struct snd_soc_pcm_runtime *rtd) if (!pcm) return -ENOMEM; - pcm->device = SKL_DPCM_AUDIO_HDMI1_PB; + pcm->device = device; pcm->codec_dai = dai; list_add_tail(&pcm->head, &ctx->hdmi_pcm_list); @@ -216,41 +216,19 @@ static int skylake_hdmi1_init(struct snd_soc_pcm_runtime *rtd) return 0; } -static int skylake_hdmi2_init(struct snd_soc_pcm_runtime *rtd) +static int skylake_hdmi1_init(struct snd_soc_pcm_runtime *rtd) { - struct skl_nau88125_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *dai = rtd->codec_dai; - struct skl_hdmi_pcm *pcm; - - pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL); - if (!pcm) - return -ENOMEM; - - pcm->device = SKL_DPCM_AUDIO_HDMI2_PB; - pcm->codec_dai = dai; - - list_add_tail(&pcm->head, &ctx->hdmi_pcm_list); - - return 0; + return skylake_hdmi_init(rtd, SKL_DPCM_AUDIO_HDMI1_PB); } +static int skylake_hdmi2_init(struct snd_soc_pcm_runtime *rtd) +{ + return skylake_hdmi_init(rtd, SKL_DPCM_AUDIO_HDMI2_PB); +} static int skylake_hdmi3_init(struct snd_soc_pcm_runtime *rtd) { - struct skl_nau88125_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *dai = rtd->codec_dai; - struct skl_hdmi_pcm *pcm; - - pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL); - if (!pcm) - return -ENOMEM; - - pcm->device = SKL_DPCM_AUDIO_HDMI3_PB; - pcm->codec_dai = dai; - - list_add_tail(&pcm->head, &ctx->hdmi_pcm_list); - - return 0; + return skylake_hdmi_init(rtd, SKL_DPCM_AUDIO_HDMI3_PB); } static int skylake_nau8825_fe_init(struct snd_soc_pcm_runtime *rtd) -- 2.22.0.410.gd8fdbe21b5-goog

2 2

[alsa-devel] [PATCH] ASoC: Add missing newline at end of file
by Geert Uytterhoeven 18 Jun '19

18 Jun '19

"git diff" says: \ No newline at end of file after modifying the files. Signed-off-by: Geert Uytterhoeven <geert+renesas(a)glider.be> --- sound/soc/mediatek/common/Makefile | 2 +- sound/soc/tegra/Makefile | 2 +- sound/usb/bcd2000/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/mediatek/common/Makefile b/sound/soc/mediatek/common/Makefile index 9ab90433a8d7b297..acbe01e9e9286d7a 100644 --- a/sound/soc/mediatek/common/Makefile +++ b/sound/soc/mediatek/common/Makefile @@ -3,4 +3,4 @@ snd-soc-mtk-common-objs := mtk-afe-platform-driver.o mtk-afe-fe-dai.o obj-$(CONFIG_SND_SOC_MEDIATEK) += snd-soc-mtk-common.o -obj-$(CONFIG_SND_SOC_MTK_BTCVSD) += mtk-btcvsd.o \ No newline at end of file +obj-$(CONFIG_SND_SOC_MTK_BTCVSD) += mtk-btcvsd.o diff --git a/sound/soc/tegra/Makefile b/sound/soc/tegra/Makefile index 2329b72c93e37807..c84f183919f2f1ab 100644 --- a/sound/soc/tegra/Makefile +++ b/sound/soc/tegra/Makefile @@ -37,4 +37,4 @@ obj-$(CONFIG_SND_SOC_TEGRA_WM9712) += snd-soc-tegra-wm9712.o obj-$(CONFIG_SND_SOC_TEGRA_TRIMSLICE) += snd-soc-tegra-trimslice.o obj-$(CONFIG_SND_SOC_TEGRA_ALC5632) += snd-soc-tegra-alc5632.o obj-$(CONFIG_SND_SOC_TEGRA_MAX98090) += snd-soc-tegra-max98090.o -obj-$(CONFIG_SND_SOC_TEGRA_SGTL5000) += snd-soc-tegra-sgtl5000.o \ No newline at end of file +obj-$(CONFIG_SND_SOC_TEGRA_SGTL5000) += snd-soc-tegra-sgtl5000.o diff --git a/sound/usb/bcd2000/Makefile b/sound/usb/bcd2000/Makefile index 99546074e5f47ddb..e2d916e24787f963 100644 --- a/sound/usb/bcd2000/Makefile +++ b/sound/usb/bcd2000/Makefile @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only snd-bcd2000-y := bcd2000.o -obj-$(CONFIG_SND_BCD2000) += snd-bcd2000.o \ No newline at end of file +obj-$(CONFIG_SND_BCD2000) += snd-bcd2000.o -- 2.17.1

3 3

[alsa-devel] [RFC PATCH 0/6] ALSA/HDA: abort probe when DMICs are detected
by Pierre-Louis Bossart 18 Jun '19

18 Jun '19

This is the second take on same problem of detecting when the HDaudio legacy driver can be used and when the SST or SOF drivers are required. The previous attempt based on a the PCI Class information was a resounding failure and broke audio on Linus' laptop, so we need additional information to avoid enabling a DSP-based driver without a good reason to do so. This patchset suggests the use of the NHLT information which *in theory* exposes DMIC endpoints. The legacy HDaudio driver cannot handle DMICs and will not provide any capture capabilities. Since it's typically the first one to probe due to the Makefile order, aborting the probe will let the PCI subsystem look for the next driver which hopefully will support this capability. I tested this patch on 5 devices (SKL, KBL, APL, GLK, WHL), three without DMICs and two with, and the detection seems to work as planned. I would appreciate it if HDaudio integrators and folks at Google/Canonical/Endless can give this a try. As usual I expect that we will have to use quirks and work-arounds, but it'd be a better idea than a build-time mutual exclusion. We could also make this optional (Kconfig and/or module parameters) if people prefer to muck with blacklists. Feedback and comments welcome! Pierre-Louis Bossart (6): ASoC: Intel: boards: remove unnecessary inclusion of skl.h ASoC: Intel: Skylake: move NHLT header to common directory ASoC: Intel: common: move parts of NHLT code to new module ASoC: Intel: Skylake: use common NHLT module ALSA / hda: stop probe if DMICS are detected on Skylake+ platforms [HACK] ASoC: Intel: NHLT: handle VENDOR_DEFINED DMIC geometry sound/pci/hda/Kconfig | 1 + sound/pci/hda/hda_intel.c | 30 ++++++ sound/soc/intel/Kconfig | 3 + sound/soc/intel/boards/glk_rt5682_max98357a.c | 1 - sound/soc/intel/boards/kbl_da7219_max98357a.c | 1 - sound/soc/intel/boards/kbl_da7219_max98927.c | 1 - sound/soc/intel/boards/skl_hda_dsp_common.c | 1 - sound/soc/intel/common/Makefile | 3 + sound/soc/intel/common/intel-nhlt.c | 101 ++++++++++++++++++ .../skl-nhlt.h => common/intel-nhlt.h} | 28 +++++ sound/soc/intel/skylake/skl-nhlt.c | 91 +--------------- sound/soc/intel/skylake/skl-ssp-clk.c | 1 + sound/soc/intel/skylake/skl-topology.c | 1 + sound/soc/intel/skylake/skl.c | 11 +- sound/soc/intel/skylake/skl.h | 4 - 15 files changed, 176 insertions(+), 102 deletions(-) create mode 100644 sound/soc/intel/common/intel-nhlt.c rename sound/soc/intel/{skylake/skl-nhlt.h => common/intel-nhlt.h} (83%) -- 2.20.1

4 26

[alsa-devel] [PATCH 0/2] v2 pcm_file propagate write error instead of an assert
by Adam Miartus 18 Jun '19

18 Jun '19

patch possible case whenre file write causes assert in pcm_file plugin, by reporting error to user and printing a message user has a chance to recover error state, or capture correct logs before assert happens, and may have an idea how to recover Adam Miartus (2): pcm_file: do not disrupt playback on output file write fail pcm_file: report write output file error to api user src/pcm/pcm_file.c | 61 ++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 18 deletions(-) -- 2.7.4

3 5

[alsa-devel] [PATCH 00/10] ALSA: firewire-motu: reserve/release isochronous resources in pcm.hw_params/hw_free callbacks
by Takashi Sakamoto 18 Jun '19

18 Jun '19

Hi, This patchset is the last part of patches for all of drivers in ALSA firewire stack to reserve/release isochronous resources in pcm.hw_params/hw_free callbacks, like the other patchsets: https://mailman.alsa-project.org/pipermail/alsa-devel/2019-June/150118.html https://mailman.alsa-project.org/pipermail/alsa-devel/2019-June/150863.html In current implementation, the resources are reserved at the same time to start packet streaming, and released at the same time to stop packet streaming. However, once allocated, the resources are available independent of lifetime of each of packet streaming. The isochronous resources are the resources of IEEE 1394 bus. On the other side of view, it's a kind of resources of hardware to maintain the bus (isochronous resource manager). For this kind of reservation and release, hw_params and hw_free operations are suitable in ALSA PCM interface. Ideally, the operation to reserve/release isochronous resource should be separated from the operation to start/stop packet streaming. However, IEEE 1394 bus has reset event. Once reset occurs, isochronous resource manager releases allocated resources. The resources should be reallocated by requesters themselves. For this reason, in this patchset, bus generation is checked before starting packet streaming. If generation is updated, reallocation is requested to isochronous resource manager, then packet streaming starts. Takashi Sakamoto (10): ALSA: firewire-motu: unify the count of subscriber for packet streaming ALSA: firewire-motu: unify midi callback function ALSA: firewire-motu: add helper function to keep isochronous resources ALSA: firewire-motu: code refactoring for condition to stop streaming ALSA: firewire-motu: rename helper functions to begin/finish streaming session ALSA: firewire-motu: minor code refactoring to stop isochronous context ALSA: firewire-motu: code refactoring to finish streaming session ALSA: firewire-motu: reserve/release isochronous resources in pcm.hw_params/hw_free callbacks ALSA: firewire-motu: update isochronous resources when starting packet streaming after bus-reset ALSA: firewire-motu: code refactoring for pcm.hw_params/hw_free callbacks sound/firewire/motu/motu-midi.c | 59 ++------- sound/firewire/motu/motu-pcm.c | 62 +++------ sound/firewire/motu/motu-stream.c | 203 +++++++++++++++--------------- sound/firewire/motu/motu.h | 7 +- 4 files changed, 135 insertions(+), 196 deletions(-) -- 2.20.1

2 11

[alsa-devel] [PATCH] ASoC: qcom: common: Mark links as nonatomic
by Bjorn Andersson 18 Jun '19

18 Jun '19

The interface used to communicate with the DSP can sleep, so mark the links as nonatomic. This prevents various sleep while atomic errors when bringing up the audio interface. Suggested-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Signed-off-by: Bjorn Andersson <bjorn.andersson(a)linaro.org> --- sound/soc/qcom/common.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/qcom/common.c b/sound/soc/qcom/common.c index 97488b5cc515..2c7348ddbbb3 100644 --- a/sound/soc/qcom/common.c +++ b/sound/soc/qcom/common.c @@ -116,6 +116,7 @@ int qcom_snd_parse_of(struct snd_soc_card *card) goto err; } + link->nonatomic = 1; link->dpcm_playback = 1; link->dpcm_capture = 1; link->stream_name = link->name; -- 2.18.0

1 0

[alsa-devel] [PATCH] slimbus: core: generate uevent for non-dt only
by Bjorn Andersson 18 Jun '19

18 Jun '19

From: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Rely on MODULE_ALIAS() for automatic kernel module loading, rather than basing it on the OF compatible. This ensures that drivers without of_device_id table, such as wcd9335, will be automatically loaded. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> [bjorn: Added commit message] Signed-off-by: Bjorn Andersson <bjorn.andersson(a)linaro.org> --- drivers/slimbus/core.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/slimbus/core.c b/drivers/slimbus/core.c index b2f07d2043eb..526e3215d8fe 100644 --- a/drivers/slimbus/core.c +++ b/drivers/slimbus/core.c @@ -98,11 +98,6 @@ static int slim_device_remove(struct device *dev) static int slim_device_uevent(struct device *dev, struct kobj_uevent_env *env) { struct slim_device *sbdev = to_slim_device(dev); - int ret; - - ret = of_device_uevent_modalias(dev, env); - if (ret != -ENODEV) - return ret; return add_uevent_var(env, "MODALIAS=slim:%s", dev_name(&sbdev->dev)); } -- 2.18.0

1 0

[alsa-devel] [PATCH v1 1/1] ASoC: rsnd: fixup mod ID calculation in rsnd_ctu_probe_
by Jiada Wang 18 Jun '19

18 Jun '19

From: Nilkanth Ahirrao <anilkanth(a)jp.adit-jv.com> commit 7e4f3419ebfe ("ASoC: rsnd: add .get_id/.get_id_sub") introduces rsnd_ctu_id which calcualates and gives the main Device id of the CTU by dividing the id by 4. rsnd_mod_id uses this interface to get the CTU main Device id. But this commit forgets to revert the main Device id calcution previously done in rsnd_ctu_probe_ which also divides the id by 4. This path corrects the same to get the correct main Device id. The issue is observered when rsnd_ctu_probe_ is done for CTU1 Fixes: 7e4f3419ebfe ("ASoC: rsnd: add .get_id/.get_id_sub") Signed-off-by: Nilkanth Ahirrao <anilkanth(a)jp.adit-jv.com> Signed-off-by: Suresh Udipi <sudipi(a)jp.adit-jv.com> Signed-off-by: Jiada Wang <jiada_wang(a)mentor.com> --- sound/soc/sh/rcar/ctu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sh/rcar/ctu.c b/sound/soc/sh/rcar/ctu.c index 8cb06dab234e..7647b3d4c0ba 100644 --- a/sound/soc/sh/rcar/ctu.c +++ b/sound/soc/sh/rcar/ctu.c @@ -108,7 +108,7 @@ static int rsnd_ctu_probe_(struct rsnd_mod *mod, struct rsnd_dai_stream *io, struct rsnd_priv *priv) { - return rsnd_cmd_attach(io, rsnd_mod_id(mod) / 4); + return rsnd_cmd_attach(io, rsnd_mod_id(mod)); } static void rsnd_ctu_value_init(struct rsnd_dai_stream *io, -- 2.19.2

2 1

[alsa-devel] [PATCH] ASoC: rockchip: pdm: select CONFIG_RATIONAL
by Arnd Bergmann 17 Jun '19

17 Jun '19

Without this, we get a link error: sound/soc/rockchip/rockchip_pdm.o: In function `rockchip_pdm_hw_params': rockchip_pdm.c:(.text+0x754): undefined reference to `rational_best_approximation' Fixes: 624e8e00acaf ("ASoC: rockchip: pdm: fixup pdm fractional div") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- sound/soc/rockchip/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig index 28a80c1cb41d..b43657e6e655 100644 --- a/sound/soc/rockchip/Kconfig +++ b/sound/soc/rockchip/Kconfig @@ -20,6 +20,7 @@ config SND_SOC_ROCKCHIP_PDM tristate "Rockchip PDM Controller Driver" depends on CLKDEV_LOOKUP && SND_SOC_ROCKCHIP select SND_SOC_GENERIC_DMAENGINE_PCM + select RATIONAL help Say Y or M if you want to add support for PDM driver for Rockchip PDM Controller. The Controller supports up to maximum of -- 2.20.0

2 1