August 2017 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ASoC: dwc: Delete an error message for a failed memory allocation in dw_i2s_probe()
by SF Markus Elfring 11 Aug '17

11 Aug '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Fri, 11 Aug 2017 16:04:53 +0200 Omit an extra message for a memory allocation failure in this function. This issue was detected by using the Coccinelle software. Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_… Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> --- sound/soc/dwc/dwc-i2s.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/soc/dwc/dwc-i2s.c b/sound/soc/dwc/dwc-i2s.c index eebe9d34e7a0..e27e21f8569a 100644 --- a/sound/soc/dwc/dwc-i2s.c +++ b/sound/soc/dwc/dwc-i2s.c @@ -617,10 +617,8 @@ static int dw_i2s_probe(struct platform_device *pdev) const char *clk_id; dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL); - if (!dev) { - dev_warn(&pdev->dev, "kzalloc fail\n"); + if (!dev) return -ENOMEM; - } dw_i2s_dai = devm_kzalloc(&pdev->dev, sizeof(*dw_i2s_dai), GFP_KERNEL); if (!dw_i2s_dai) -- 2.14.0

1 0

[alsa-devel] [RFC PATCH 0/9] ASoC: qcom: Add support to QDSP based HDMI audio
by srinivas.kandagatla＠linaro.org 11 Aug '17

11 Aug '17

From: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> This patchset aims to provide a very basic version of QCOM DSP based audio support which is available in downstream andriod kernels. This patchset only support Digital audio based for HDMI-TX and will add support to other features as we move on. Why do we need this now: On All Qualcomm SOCs the audio services are usually provided by an on chip DSP using LPASS, however LPASS is mostly tied with a Q6DSP on most of the SOCs. So Bypassing the DSP is becoming almost impossible with new generation of QCOM SOCs. QDSP has 3 modules AFE (Audio FrontEnd), ADM (Audio Device Manager), and ASM(Audio Stream Manager) to provide this audio services. All these services use APR (Asynchronous Packet Router) protocol via smd/glink transport to communicate with Application processor. More details on each module is availble in there respective patch. This patchset is tested on DB820c, with HDMI audio playback on top of mainline with few additional patches. Here is block diagram to give a quick overview of the components +---------+ +---------+ +---------+ | q6pcm | |q6routing| | q6hdmi | | ASoC(FE | <------> | ASoC(BE | <-----> | ASoC(BE | | cpu dai)| |Platform)| | cpu dai)| | | | | | | +---------+ +---------+ +---------+ ^ ^ ^ | | | | +------------------+----------------+ | | | | | | v v v v v +---------+ +---------+ +---------+ | | | | | | | q6ASM | | q6ADM | | q6AFE | | | | | | | | | | | | | +---------+ +---------+ +---------+ ^ ^ ^ ^ | | | CPU Side | ------+---------------------+-------------------+-------- | | | | |APR(smd/glink) | | | | | | | | +------------------+----------------+ | | | | | +-----+--+-----------------------------------+--+------- | | | | QDSP Side | v v v v v +---------+ +---------+ +---------+ | | | | | | | ASM | <------> | ADM | <-----> | AFE | | | | | | | | | | | | | +---------+ +---------+ +---------+ ^ | +-------------------+ | ---------------------------+-------------------------- | Audio I/O | v v +--------------------------------------------------+ | Audio devices | | CODEC | HDMI-TX | PCM | SLIMBUS | I2S |MI2S |...| | | +--------------------------------------------------+ Srinivas Kandagatla (9): soc: qcom: add support APR driver ASoC: qcom: qdsp6v2: Add support to Q6AFE ASoC: qcom: qdsp6v2: Add support to Q6ADM ASoC: qcom: qdsp6v2: Add support to Q6ASM ASoC: qcom: qdsp6v2: Add support to q6 routing driver ASoC: qcom: qdsp6v2: Add support to q6 HDMI dai driver ASoC: qcom: qdsp6v2: Add support to q6 pcm driver ASoC: qcom: apq8096: Add db820c machine driver arm64: dts: msm8996: db820c: Add sound card support .../devicetree/bindings/soc/qcom/qcom,apr.txt | 66 ++ .../devicetree/bindings/sound/qcom,apq8096.txt | 85 ++ .../devicetree/bindings/sound/qcom,q6adm.txt | 15 + .../devicetree/bindings/sound/qcom,q6afe.txt | 15 + .../devicetree/bindings/sound/qcom,q6asm.txt | 15 + .../devicetree/bindings/sound/qcom,q6hdmi.txt | 27 + .../bindings/sound/qcom,q6pcm-routing.txt | 21 + .../devicetree/bindings/sound/qcom,q6pcm.txt | 21 + arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 37 + arch/arm64/boot/dts/qcom/msm8996.dtsi | 67 ++ drivers/soc/qcom/Kconfig | 8 + drivers/soc/qcom/Makefile | 1 + drivers/soc/qcom/apr.c | 406 ++++++++ include/dt-bindings/sound/qcom,afe.h | 8 + include/dt-bindings/sound/qcom,asm.h | 13 + include/linux/soc/qcom/apr.h | 163 ++++ sound/soc/qcom/Kconfig | 46 + sound/soc/qcom/Makefile | 5 + sound/soc/qcom/apq8096.c | 174 ++++ sound/soc/qcom/qdsp6v2/Makefile | 6 + sound/soc/qcom/qdsp6v2/common.h | 225 +++++ sound/soc/qcom/qdsp6v2/q6adm-v2.h | 76 ++ sound/soc/qcom/qdsp6v2/q6adm.c | 603 ++++++++++++ sound/soc/qcom/qdsp6v2/q6afe-v2.h | 62 ++ sound/soc/qcom/qdsp6v2/q6afe.c | 499 ++++++++++ sound/soc/qcom/qdsp6v2/q6asm-v2.h | 176 ++++ sound/soc/qcom/qdsp6v2/q6asm.c | 1008 ++++++++++++++++++++ sound/soc/qcom/qdsp6v2/q6hdmi.c | 258 +++++ sound/soc/qcom/qdsp6v2/q6pcm.c | 558 +++++++++++ sound/soc/qcom/qdsp6v2/q6routing-v2.h | 8 + sound/soc/qcom/qdsp6v2/q6routing.c | 403 ++++++++ 31 files changed, 5075 insertions(+) create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,apr.txt create mode 100644 Documentation/devicetree/bindings/sound/qcom,apq8096.txt create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6adm.txt create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6afe.txt create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6asm.txt create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6hdmi.txt create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6pcm-routing.txt create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6pcm.txt create mode 100644 drivers/soc/qcom/apr.c create mode 100644 include/dt-bindings/sound/qcom,afe.h create mode 100644 include/dt-bindings/sound/qcom,asm.h create mode 100644 include/linux/soc/qcom/apr.h create mode 100644 sound/soc/qcom/apq8096.c create mode 100644 sound/soc/qcom/qdsp6v2/Makefile create mode 100644 sound/soc/qcom/qdsp6v2/common.h create mode 100644 sound/soc/qcom/qdsp6v2/q6adm-v2.h create mode 100644 sound/soc/qcom/qdsp6v2/q6adm.c create mode 100644 sound/soc/qcom/qdsp6v2/q6afe-v2.h create mode 100644 sound/soc/qcom/qdsp6v2/q6afe.c create mode 100644 sound/soc/qcom/qdsp6v2/q6asm-v2.h create mode 100644 sound/soc/qcom/qdsp6v2/q6asm.c create mode 100644 sound/soc/qcom/qdsp6v2/q6hdmi.c create mode 100644 sound/soc/qcom/qdsp6v2/q6pcm.c create mode 100644 sound/soc/qcom/qdsp6v2/q6routing-v2.h create mode 100644 sound/soc/qcom/qdsp6v2/q6routing.c -- 2.9.3

1 9

[alsa-devel] [PATCH] ASoC: Broadwell RT5677: Delete an error message for a failed memory allocation in bdw_rt5677_probe()
by SF Markus Elfring 11 Aug '17

11 Aug '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Fri, 11 Aug 2017 13:05:40 +0200 Omit an extra message for a memory allocation failure in this function. This issue was detected by using the Coccinelle software. Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_… Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> --- sound/soc/intel/boards/bdw-rt5677.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/soc/intel/boards/bdw-rt5677.c b/sound/soc/intel/boards/bdw-rt5677.c index 058b8ccedf02..4b1431c3b460 100644 --- a/sound/soc/intel/boards/bdw-rt5677.c +++ b/sound/soc/intel/boards/bdw-rt5677.c @@ -349,7 +349,5 @@ static int bdw_rt5677_probe(struct platform_device *pdev) - if (!bdw_rt5677) { - dev_err(&pdev->dev, "Can't allocate bdw_rt5677\n"); + if (!bdw_rt5677) return -ENOMEM; - } snd_soc_card_set_drvdata(&bdw_rt5677_card, bdw_rt5677); -- 2.14.0

1 0

[alsa-devel] [PATCH] ASoC: Baytrail SST MAX98090: Delete an error message for a failed memory allocation in byt_max98090_probe()
by SF Markus Elfring 11 Aug '17

11 Aug '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Fri, 11 Aug 2017 12:42:40 +0200 Omit an extra message for a memory allocation failure in this function. This issue was detected by using the Coccinelle software. Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_… Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> --- sound/soc/intel/boards/byt-max98090.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/soc/intel/boards/byt-max98090.c b/sound/soc/intel/boards/byt-max98090.c index 047be7fa0ce9..fa68bb32adef 100644 --- a/sound/soc/intel/boards/byt-max98090.c +++ b/sound/soc/intel/boards/byt-max98090.c @@ -152,10 +152,8 @@ static int byt_max98090_probe(struct platform_device *pdev) int ret_val; priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_ATOMIC); - if (!priv) { - dev_err(&pdev->dev, "allocation failed\n"); + if (!priv) return -ENOMEM; - } ret_val = devm_acpi_dev_add_driver_gpios(dev->parent, acpi_byt_max98090_gpios); if (ret_val) -- 2.14.0

1 0

[alsa-devel] [PATCH] ALSA: seq: Fix CONFIG_SND_SEQ_MIDI dependency
by Takashi Iwai 11 Aug '17

11 Aug '17

The commit 0181307abc1d ("ALSA: seq: Reorganize kconfig and build") rewrote the dependency of each sequencer module in a standard way, but there was one change applied mistakenly: CONFIG_SND_SEQ_MIDI isn't enabled properly by CONFIG_SND_RAWMIDI. I seem to have changed the wrong one instead, CONFIG_SND_SEQ_MIDI_EMUL, which is eventually reverse-selected by CONFIG_SND_SEQ_MIDI itself. This ended up the lack of snd-seq-midi module as reported below. The fix is to put def_tristate properly to CONFIG_SND_SEQ_MIDI instead of *_MIDI_EMUL entry. Fixes: 0181307abc1d ("ALSA: seq: Reorganize kconfig and build") Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=196633 Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/seq/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/core/seq/Kconfig b/sound/core/seq/Kconfig index a536760a94c2..45c1336c6597 100644 --- a/sound/core/seq/Kconfig +++ b/sound/core/seq/Kconfig @@ -47,10 +47,10 @@ config SND_SEQ_HRTIMER_DEFAULT timer. config SND_SEQ_MIDI_EVENT - def_tristate SND_RAWMIDI + tristate config SND_SEQ_MIDI - tristate + def_tristate SND_RAWMIDI select SND_SEQ_MIDI_EVENT config SND_SEQ_MIDI_EMUL -- 2.13.3

1 0

[alsa-devel] [PATCH] ASoC: kirkwood: Delete an error message for a failed memory allocation in kirkwood_i2s_dev_probe()
by SF Markus Elfring 11 Aug '17

11 Aug '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Fri, 11 Aug 2017 09:35:33 +0200 Omit an extra message for a memory allocation failure in this function. This issue was detected by using the Coccinelle software. Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_… Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> --- sound/soc/kirkwood/kirkwood-i2s.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c index 3b09f71b9535..105a73cc5158 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c +++ b/sound/soc/kirkwood/kirkwood-i2s.c @@ -538,10 +538,9 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev) int err; priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); - if (!priv) { - dev_err(&pdev->dev, "allocation failed\n"); + if (!priv) return -ENOMEM; - } + dev_set_drvdata(&pdev->dev, priv); mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); -- 2.14.0

1 0

[alsa-devel] [PATCH] ASoC: rockchip: Delete an error message for a failed memory allocation in rockchip_i2s_probe()
by SF Markus Elfring 10 Aug '17

10 Aug '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Thu, 10 Aug 2017 18:38:09 +0200 Omit an extra message for a memory allocation failure in this function. This issue was detected by using the Coccinelle software. Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_… Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> --- sound/soc/rockchip/rockchip_i2s.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index 199338fdeda0..b6590467fd14 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -579,10 +579,8 @@ static int rockchip_i2s_probe(struct platform_device *pdev) int val; i2s = devm_kzalloc(&pdev->dev, sizeof(*i2s), GFP_KERNEL); - if (!i2s) { - dev_err(&pdev->dev, "Can't allocate rk_i2s_dev\n"); + if (!i2s) return -ENOMEM; - } i2s->dev = &pdev->dev; -- 2.14.0

1 0

[alsa-devel] [PATCH] ASoC: samsung: i2s: Null pointer dereference on samsung_i2s_remove
by Anton Vasilyev 10 Aug '17

10 Aug '17

If (quirks & QUIRK_SEC_DAI == 0) then samsung_i2s_probe() doesn't allocate sec_dai and pri_dai->sec_dai remains Null, but samsung_i2s_remove() permorms pri_dai->sec_dai dereference in any case. The patch adds sec_dai check on Null before derefence at samsung_i2s_remove(). Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Anton Vasilyev <vasilyev(a)ispras.ru> --- sound/soc/samsung/i2s.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index af3ba4d..6beeea8 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -1382,7 +1382,8 @@ static int samsung_i2s_remove(struct platform_device *pdev) sec_dai = pri_dai->sec_dai; pri_dai->sec_dai = NULL; - sec_dai->pri_dai = NULL; + if (sec_dai) + sec_dai->pri_dai = NULL; pm_runtime_get_sync(&pdev->dev); pm_runtime_disable(&pdev->dev); -- 2.7.4

2 1

[alsa-devel] [PATCH] ASoC: fsi: Delete an error message for a failed memory allocation in fsi_probe()
by SF Markus Elfring 10 Aug '17

10 Aug '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Thu, 10 Aug 2017 18:18:20 +0200 Omit an extra message for a memory allocation failure in this function. This issue was detected by using the Coccinelle software. Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_… Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> --- sound/soc/sh/fsi.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index 005b21506556..1f41cf1ff830 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c @@ -1962,10 +1962,8 @@ static int fsi_probe(struct platform_device *pdev) } master = devm_kzalloc(&pdev->dev, sizeof(*master), GFP_KERNEL); - if (!master) { - dev_err(&pdev->dev, "Could not allocate master\n"); + if (!master) return -ENOMEM; - } master->base = devm_ioremap_nocache(&pdev->dev, res->start, resource_size(res)); -- 2.14.0

1 0

[alsa-devel] [PATCH] conf/ucm: DB410c-HiFi: add CIC selection
by srinivas.kandagatla＠linaro.org 10 Aug '17

10 Aug '17

From: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> This patch adds CIC selection controls which have been added recently to the kernel to select mic source. Without this patch user has to manually select the control to record from DMIC or AMIC. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- src/conf/ucm/DB410c/HiFi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/conf/ucm/DB410c/HiFi b/src/conf/ucm/DB410c/HiFi index f9cbcf0..dcb7ac9 100644 --- a/src/conf/ucm/DB410c/HiFi +++ b/src/conf/ucm/DB410c/HiFi @@ -108,6 +108,7 @@ SectionDevice."Handset" { EnableSequence [ cdev "hw:0" cset "name='DEC1 MUX' ADC2" + cset "name='CIC1 MUX' AMIC" cset "name='ADC2 Volume' 8" cset "name='ADC2 MUX' INP2" ] @@ -130,6 +131,7 @@ SectionDevice."Primarymic" { EnableSequence [ cdev "hw:0" cset "name='DEC1 MUX' ADC1" + cset "name='CIC1 MUX' AMIC" cset "name='ADC1 Volume' 8" ] @@ -150,6 +152,7 @@ SectionDevice."Secondarymic" { EnableSequence [ cdev "hw:0" cset "name='DEC1 MUX' ADC2" + cset "name='CIC1 MUX' AMIC" cset "name='ADC2 Volume' 8" cset "name='ADC2 MUX' INP2" ] @@ -172,6 +175,7 @@ SectionDevice."DMIC" { EnableSequence [ cdev "hw:0" cset "name='DEC1 MUX' DMIC1" + cset "name='CIC1 MUX' DMIC" ] DisableSequence [ -- 2.9.3

2 1