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

[alsa-devel] next/master boot bisection: next-20190115 on sun8i-h3-libretech-all-h3-cc
by kernelci.org bot 15 Jan '19

15 Jan '19

* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * This automated bisection report was sent to you on the basis * * that you may be involved with the breaking commit it has * * found. No manual investigation has been done to verify it, * * and the root cause of the problem may be somewhere else. * * Hope this helps! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * next/master boot bisection: next-20190115 on sun8i-h3-libretech-all-h3-cc Summary: Start: 5aa6589e17bd Add linux-next specific files for 20190115 Details: https://kernelci.org/boot/id/5c3d77f659b51450786edd44 Plain log: https://storage.kernelci.org//next/master/next-20190115/arm/sunxi_defconfig… HTML log: https://storage.kernelci.org//next/master/next-20190115/arm/sunxi_defconfig… Result: 8780cf1142a5 ASoC: soc-core: defer card probe until all component is added to list Checks: revert: PASS verify: PASS Parameters: Tree: next URL: http://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git Branch: master Target: sun8i-h3-libretech-all-h3-cc CPU arch: arm Lab: lab-baylibre Config: sunxi_defconfig Test suite: boot Breaking commit found: ------------------------------------------------------------------------------- commit 8780cf1142a59568a3aa77959cbd76b2edb6fd81 Author: Ajit Pandey <ajitp(a)codeaurora.org> Date: Wed Jan 9 14:17:07 2019 +0530 ASoC: soc-core: defer card probe until all component is added to list DAI component probe is not called if it is not present in component list during sound card registration. Check if component is available in component list for platform and cpu dai before soundcard registration. Signed-off-by: Ajit Pandey <ajitp(a)codeaurora.org> Signed-off-by: Rohit kumar <rohitkr(a)codeaurora.org> Signed-off-by: Mark Brown <broonie(a)kernel.org> diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 0462b3ec977a..eec92f17dd15 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1027,7 +1027,6 @@ static int snd_soc_init_platform(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link) { struct snd_soc_dai_link_component *platform = dai_link->platform; - /* * FIXME * @@ -1129,6 +1128,14 @@ static int soc_init_dai_link(struct snd_soc_card *card, link->name); return -EINVAL; } + + /* + * Defer card registartion if platform dai component is not added to + * component list. + */ + if (!soc_find_component(link->platform->of_node, link->platform->name)) + return -EPROBE_DEFER; + /* * CPU device may be specified by either name or OF node, but * can be left unspecified, and will be matched based on DAI @@ -1140,6 +1147,14 @@ static int soc_init_dai_link(struct snd_soc_card *card, link->name); return -EINVAL; } + + /* + * Defer card registartion if cpu dai component is not added to + * component list. + */ + if (!soc_find_component(link->cpu_of_node, link->cpu_name)) + return -EPROBE_DEFER; + /* * At least one of CPU DAI name or CPU device name/node must be * specified ------------------------------------------------------------------------------- Git bisection log: ------------------------------------------------------------------------------- git bisect start # good: [3719876809e745b9db5293d418600c194bbf5c23] sbitmap: Protect swap_lock from softirqs git bisect good 3719876809e745b9db5293d418600c194bbf5c23 # bad: [5aa6589e17bd4dbc1856e37281f00a290d733ab0] Add linux-next specific files for 20190115 git bisect bad 5aa6589e17bd4dbc1856e37281f00a290d733ab0 # bad: [f2dd4e3054741e22c4c97c8a0fa05faa7239d60a] Merge remote-tracking branch 'crypto/master' git bisect bad f2dd4e3054741e22c4c97c8a0fa05faa7239d60a # bad: [3ba858cbc004b32f8767d295b9b566eb0381da0c] Merge remote-tracking branch 'qcom/for-next' git bisect bad 3ba858cbc004b32f8767d295b9b566eb0381da0c # bad: [4cc2339ea8900debf88333934fa9b1dbc96ee2aa] Merge remote-tracking branch 'btrfs-fixes/next-fixes' git bisect bad 4cc2339ea8900debf88333934fa9b1dbc96ee2aa # good: [259764fd4e5b47aedd6317d2edf5d813333909c5] Merge remote-tracking branch 'net/master' git bisect good 259764fd4e5b47aedd6317d2edf5d813333909c5 # bad: [29568b4049ff4ef23ce0a2dd46cbaed94b589c78] Merge remote-tracking branch 'usb-serial-fixes/usb-linus' git bisect bad 29568b4049ff4ef23ce0a2dd46cbaed94b589c78 # good: [798729dc036d5bb384e24bb48af5c9ea6554d945] Merge remote-tracking branch 'sound-current/for-linus' git bisect good 798729dc036d5bb384e24bb48af5c9ea6554d945 # bad: [d9c51542207a29b7b06c11f1085a1e3b8eb24f07] Merge branch 'asoc-5.0' into asoc-linus git bisect bad d9c51542207a29b7b06c11f1085a1e3b8eb24f07 # good: [678e2b44c8e3fec3afc7202f1996a4500a50be93] ALSA: compress: prevent potential divide by zero bugs git bisect good 678e2b44c8e3fec3afc7202f1996a4500a50be93 # good: [667e9334fa64da2273e36ce131b05ac9e47c5769] ASoC: tlv320aic32x4: Kernel OOPS while entering DAPM standby mode git bisect good 667e9334fa64da2273e36ce131b05ac9e47c5769 # bad: [8780cf1142a59568a3aa77959cbd76b2edb6fd81] ASoC: soc-core: defer card probe until all component is added to list git bisect bad 8780cf1142a59568a3aa77959cbd76b2edb6fd81 # good: [44fabd8cdaaa3acb80ad2bb3b5c61ae2136af661] ASoC: atom: fix a missing check of snd_pcm_lib_malloc_pages git bisect good 44fabd8cdaaa3acb80ad2bb3b5c61ae2136af661 # first bad commit: [8780cf1142a59568a3aa77959cbd76b2edb6fd81] ASoC: soc-core: defer card probe until all component is added to list -------------------------------------------------------------------------------

1 0

[alsa-devel] next/pending-fixes boot bisection: v5.0-rc2-361-g08b435ee366b on sun8i-h3-libretech-all-h3-cc
by kernelci.org bot 15 Jan '19

15 Jan '19

* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * This automated bisection report was sent to you on the basis * * that you may be involved with the breaking commit it has * * found. No manual investigation has been done to verify it, * * and the root cause of the problem may be somewhere else. * * Hope this helps! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * next/pending-fixes boot bisection: v5.0-rc2-361-g08b435ee366b on sun8i-h3-libretech-all-h3-cc Summary: Start: 08b435ee366b Merge remote-tracking branch 'drm-misc-fixes/for-linux-next-fixes' Details: https://kernelci.org/boot/id/5c3d795559b51455d36edd69 Plain log: https://storage.kernelci.org//next/pending-fixes/v5.0-rc2-361-g08b435ee366b… HTML log: https://storage.kernelci.org//next/pending-fixes/v5.0-rc2-361-g08b435ee366b… Result: 8780cf1142a5 ASoC: soc-core: defer card probe until all component is added to list Checks: revert: PASS verify: PASS Parameters: Tree: next URL: http://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git Branch: pending-fixes Target: sun8i-h3-libretech-all-h3-cc CPU arch: arm Lab: lab-baylibre Config: sunxi_defconfig Test suite: boot Breaking commit found: ------------------------------------------------------------------------------- commit 8780cf1142a59568a3aa77959cbd76b2edb6fd81 Author: Ajit Pandey <ajitp(a)codeaurora.org> Date: Wed Jan 9 14:17:07 2019 +0530 ASoC: soc-core: defer card probe until all component is added to list DAI component probe is not called if it is not present in component list during sound card registration. Check if component is available in component list for platform and cpu dai before soundcard registration. Signed-off-by: Ajit Pandey <ajitp(a)codeaurora.org> Signed-off-by: Rohit kumar <rohitkr(a)codeaurora.org> Signed-off-by: Mark Brown <broonie(a)kernel.org> diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 0462b3ec977a..eec92f17dd15 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1027,7 +1027,6 @@ static int snd_soc_init_platform(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link) { struct snd_soc_dai_link_component *platform = dai_link->platform; - /* * FIXME * @@ -1129,6 +1128,14 @@ static int soc_init_dai_link(struct snd_soc_card *card, link->name); return -EINVAL; } + + /* + * Defer card registartion if platform dai component is not added to + * component list. + */ + if (!soc_find_component(link->platform->of_node, link->platform->name)) + return -EPROBE_DEFER; + /* * CPU device may be specified by either name or OF node, but * can be left unspecified, and will be matched based on DAI @@ -1140,6 +1147,14 @@ static int soc_init_dai_link(struct snd_soc_card *card, link->name); return -EINVAL; } + + /* + * Defer card registartion if cpu dai component is not added to + * component list. + */ + if (!soc_find_component(link->cpu_of_node, link->cpu_name)) + return -EPROBE_DEFER; + /* * At least one of CPU DAI name or CPU device name/node must be * specified ------------------------------------------------------------------------------- Git bisection log: ------------------------------------------------------------------------------- git bisect start # good: [3719876809e745b9db5293d418600c194bbf5c23] sbitmap: Protect swap_lock from softirqs git bisect good 3719876809e745b9db5293d418600c194bbf5c23 # bad: [08b435ee366bab63250c375ffea3c94cb02fcd93] Merge remote-tracking branch 'drm-misc-fixes/for-linux-next-fixes' git bisect bad 08b435ee366bab63250c375ffea3c94cb02fcd93 # good: [f80eb2d45c4e34750337d1210a78bfe2ebf43b73] Merge remote-tracking branch 'ipsec/master' git bisect good f80eb2d45c4e34750337d1210a78bfe2ebf43b73 # bad: [e242412b491b4e34643f82c6f422e964beb81704] Merge remote-tracking branch 'input-current/for-linus' git bisect bad e242412b491b4e34643f82c6f422e964beb81704 # bad: [eb1c2383c8b929fcc5a56f5698ff3fe3d0ec54e6] Merge remote-tracking branch 'sound-asoc-fixes/for-linus' git bisect bad eb1c2383c8b929fcc5a56f5698ff3fe3d0ec54e6 # bad: [04eb1efcd614d6f067b76a355b3a3599667959dc] ASoC: soc-core: Hold client_mutex around soc_init_dai_link() git bisect bad 04eb1efcd614d6f067b76a355b3a3599667959dc # good: [a41d9dbf5dac5b6a1283ee8001f22807d18352ea] ASoC: qdsp6: q6asm-dai: Fix a small memory leak git bisect good a41d9dbf5dac5b6a1283ee8001f22807d18352ea # good: [6175471755075d256c1c654151fc1cad183c1e33] ASoC: ti: davinci-mcasp: Move context save/restore to runtime_pm callbacks git bisect good 6175471755075d256c1c654151fc1cad183c1e33 # good: [44fabd8cdaaa3acb80ad2bb3b5c61ae2136af661] ASoC: atom: fix a missing check of snd_pcm_lib_malloc_pages git bisect good 44fabd8cdaaa3acb80ad2bb3b5c61ae2136af661 # bad: [239b8b34a856777e562373ae0de605536a7ccade] ASoC: Intel: Boards: move the codec PLL configuration to _init git bisect bad 239b8b34a856777e562373ae0de605536a7ccade # bad: [8780cf1142a59568a3aa77959cbd76b2edb6fd81] ASoC: soc-core: defer card probe until all component is added to list git bisect bad 8780cf1142a59568a3aa77959cbd76b2edb6fd81 # first bad commit: [8780cf1142a59568a3aa77959cbd76b2edb6fd81] ASoC: soc-core: defer card probe until all component is added to list -------------------------------------------------------------------------------

1 0

[alsa-devel] next/master boot bisection: next-20190115 on sun8i-h2-plus-libretech-all-h3-cc
by kernelci.org bot 15 Jan '19

15 Jan '19

* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * This automated bisection report was sent to you on the basis * * that you may be involved with the breaking commit it has * * found. No manual investigation has been done to verify it, * * and the root cause of the problem may be somewhere else. * * Hope this helps! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * next/master boot bisection: next-20190115 on sun8i-h2-plus-libretech-all-h3-cc Summary: Start: 5aa6589e17bd Add linux-next specific files for 20190115 Details: https://kernelci.org/boot/id/5c3d783659b51451106edd6c Plain log: https://storage.kernelci.org//next/master/next-20190115/arm/sunxi_defconfig… HTML log: https://storage.kernelci.org//next/master/next-20190115/arm/sunxi_defconfig… Result: 8780cf1142a5 ASoC: soc-core: defer card probe until all component is added to list Checks: revert: PASS verify: PASS Parameters: Tree: next URL: http://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git Branch: master Target: sun8i-h2-plus-libretech-all-h3-cc CPU arch: arm Lab: lab-baylibre Config: sunxi_defconfig Test suite: boot Breaking commit found: ------------------------------------------------------------------------------- commit 8780cf1142a59568a3aa77959cbd76b2edb6fd81 Author: Ajit Pandey <ajitp(a)codeaurora.org> Date: Wed Jan 9 14:17:07 2019 +0530 ASoC: soc-core: defer card probe until all component is added to list DAI component probe is not called if it is not present in component list during sound card registration. Check if component is available in component list for platform and cpu dai before soundcard registration. Signed-off-by: Ajit Pandey <ajitp(a)codeaurora.org> Signed-off-by: Rohit kumar <rohitkr(a)codeaurora.org> Signed-off-by: Mark Brown <broonie(a)kernel.org> diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 0462b3ec977a..eec92f17dd15 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1027,7 +1027,6 @@ static int snd_soc_init_platform(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link) { struct snd_soc_dai_link_component *platform = dai_link->platform; - /* * FIXME * @@ -1129,6 +1128,14 @@ static int soc_init_dai_link(struct snd_soc_card *card, link->name); return -EINVAL; } + + /* + * Defer card registartion if platform dai component is not added to + * component list. + */ + if (!soc_find_component(link->platform->of_node, link->platform->name)) + return -EPROBE_DEFER; + /* * CPU device may be specified by either name or OF node, but * can be left unspecified, and will be matched based on DAI @@ -1140,6 +1147,14 @@ static int soc_init_dai_link(struct snd_soc_card *card, link->name); return -EINVAL; } + + /* + * Defer card registartion if cpu dai component is not added to + * component list. + */ + if (!soc_find_component(link->cpu_of_node, link->cpu_name)) + return -EPROBE_DEFER; + /* * At least one of CPU DAI name or CPU device name/node must be * specified ------------------------------------------------------------------------------- Git bisection log: ------------------------------------------------------------------------------- git bisect start # good: [3719876809e745b9db5293d418600c194bbf5c23] sbitmap: Protect swap_lock from softirqs git bisect good 3719876809e745b9db5293d418600c194bbf5c23 # bad: [5aa6589e17bd4dbc1856e37281f00a290d733ab0] Add linux-next specific files for 20190115 git bisect bad 5aa6589e17bd4dbc1856e37281f00a290d733ab0 # bad: [f2dd4e3054741e22c4c97c8a0fa05faa7239d60a] Merge remote-tracking branch 'crypto/master' git bisect bad f2dd4e3054741e22c4c97c8a0fa05faa7239d60a # bad: [3ba858cbc004b32f8767d295b9b566eb0381da0c] Merge remote-tracking branch 'qcom/for-next' git bisect bad 3ba858cbc004b32f8767d295b9b566eb0381da0c # bad: [4cc2339ea8900debf88333934fa9b1dbc96ee2aa] Merge remote-tracking branch 'btrfs-fixes/next-fixes' git bisect bad 4cc2339ea8900debf88333934fa9b1dbc96ee2aa # good: [259764fd4e5b47aedd6317d2edf5d813333909c5] Merge remote-tracking branch 'net/master' git bisect good 259764fd4e5b47aedd6317d2edf5d813333909c5 # bad: [29568b4049ff4ef23ce0a2dd46cbaed94b589c78] Merge remote-tracking branch 'usb-serial-fixes/usb-linus' git bisect bad 29568b4049ff4ef23ce0a2dd46cbaed94b589c78 # good: [798729dc036d5bb384e24bb48af5c9ea6554d945] Merge remote-tracking branch 'sound-current/for-linus' git bisect good 798729dc036d5bb384e24bb48af5c9ea6554d945 # bad: [d9c51542207a29b7b06c11f1085a1e3b8eb24f07] Merge branch 'asoc-5.0' into asoc-linus git bisect bad d9c51542207a29b7b06c11f1085a1e3b8eb24f07 # good: [678e2b44c8e3fec3afc7202f1996a4500a50be93] ALSA: compress: prevent potential divide by zero bugs git bisect good 678e2b44c8e3fec3afc7202f1996a4500a50be93 # good: [667e9334fa64da2273e36ce131b05ac9e47c5769] ASoC: tlv320aic32x4: Kernel OOPS while entering DAPM standby mode git bisect good 667e9334fa64da2273e36ce131b05ac9e47c5769 # bad: [8780cf1142a59568a3aa77959cbd76b2edb6fd81] ASoC: soc-core: defer card probe until all component is added to list git bisect bad 8780cf1142a59568a3aa77959cbd76b2edb6fd81 # good: [44fabd8cdaaa3acb80ad2bb3b5c61ae2136af661] ASoC: atom: fix a missing check of snd_pcm_lib_malloc_pages git bisect good 44fabd8cdaaa3acb80ad2bb3b5c61ae2136af661 # first bad commit: [8780cf1142a59568a3aa77959cbd76b2edb6fd81] ASoC: soc-core: defer card probe until all component is added to list -------------------------------------------------------------------------------

1 0

[alsa-devel] [PATCH] ASoC: core: Make snd_soc_find_component() more robust
by Mark Brown 15 Jan '19

15 Jan '19

There are some use cases where you're checking for a lot of things on a card and it makes sense that you might end up trying to call snd_soc_find_component() without either a name or an of_node. Currently in that case we try to dereference the name and crash but it's more useful to allow the caller to just treat that as a case where we don't find anything, that error handling will already exist. Inspired by a patch from Ajit Pandey fixing some callers. Fixes: 8780cf1142a5 ("ASoC: soc-core: defer card probe until all component is added to list") Reported-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/soc-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index cdcc417c94ca..b680c673c553 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -742,7 +742,7 @@ static struct snd_soc_component *soc_find_component( if (of_node) { if (component->dev->of_node == of_node) return component; - } else if (strcmp(component->name, name) == 0) { + } else if (name && strcmp(component->name, name) == 0) { return component; } } -- 2.20.1

1 1

[alsa-devel] [PATCH 1/3] ASoC: cs4341: fix waring unused-function
by Anders Roxell 15 Jan '19

15 Jan '19

The driver cs4341 can be built with SPI and/or I2C, but it has to be one of them at least. When I2C is set as a module we see the warning below: sound/soc/codecs/cs4341.c:213:12: warning: ‘cs4341_probe’ defined but not used [-Wunused-function] static int cs4341_probe(struct device *dev) ^~~~~~~~~~~~ Rework so that we use IS_ENABLED instead of defined. Also change so SND_SOC_CS4341 depends on SND_SOC_I2C_AND_SPI to we dont' get a link error when SND_SOC_CS4341=y, I2C=m and REGMAP_I2C=m is set. Suggested-by: Arnd Bergmann <arnd(a)arndb.de> Signed-off-by: Anders Roxell <anders.roxell(a)linaro.org> --- sound/soc/codecs/Kconfig | 2 +- sound/soc/codecs/cs4341.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 87cb9c51e6f5..87ecb38e57f4 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -546,7 +546,7 @@ config SND_SOC_CS43130 config SND_SOC_CS4341 tristate "Cirrus Logic CS4341 CODEC" - depends on I2C || SPI_MASTER + depends on SND_SOC_I2C_AND_SPI select REGMAP_I2C if I2C select REGMAP_SPI if SPI_MASTER diff --git a/sound/soc/codecs/cs4341.c b/sound/soc/codecs/cs4341.c index d2e616a89fd4..ade7477d04f1 100644 --- a/sound/soc/codecs/cs4341.c +++ b/sound/soc/codecs/cs4341.c @@ -223,7 +223,7 @@ static int cs4341_probe(struct device *dev) &cs4341_dai, 1); } -#if defined(CONFIG_I2C) +#if IS_ENABLED(CONFIG_I2C) static int cs4341_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { @@ -317,7 +317,7 @@ static int __init cs4341_init(void) { int ret = 0; -#if defined(CONFIG_I2C) +#if IS_ENABLED(CONFIG_I2C) ret = i2c_add_driver(&cs4341_i2c_driver); if (ret) return ret; @@ -332,7 +332,7 @@ module_init(cs4341_init); static void __exit cs4341_exit(void) { -#if defined(CONFIG_I2C) +#if IS_ENABLED(CONFIG_I2C) i2c_del_driver(&cs4341_i2c_driver); #endif #if defined(CONFIG_SPI_MASTER) -- 2.19.2

2 4

[alsa-devel] [PATCH] ASoC: msm8916-wcd-digital: remove few unused variables
by Srinivas Kandagatla 15 Jan '19

15 Jan '19

This patch removes unused variables which also fixes below warnings: msm8916-wcd-digital.c:245:30: warning: 'rx2_mix2_inp1_chain_enum' defined but not used [-Wunused-const-variable=] static const struct soc_enum rx2_mix2_inp1_chain_enum = SOC_ENUM_SINGLE( ^~~~~~~~~~~~~~~~~~~~~~~~ msm8916-wcd-digital.c:234:30: warning: 'rx_mix2_inp1_chain_enum' defined but not used [-Wunused-const-variable=] static const struct soc_enum rx_mix2_inp1_chain_enum = SOC_ENUM_SINGLE( ^~~~~~~~~~~~~~~~~~~~~~~ msm8916-wcd-digital.c:224:26: warning: 'adc2_mux_text' defined but not used [-Wunused-const-variable=] static const char *const adc2_mux_text[] = { "ZERO", "INP2", "INP3" }; ^~~~~~~~~~~~~ msm8916-wcd-digital.c:223:26: warning: 'rx_mix2_text' defined but not used [-Wunused-const-variable=] Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- sound/soc/codecs/msm8916-wcd-digital.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/sound/soc/codecs/msm8916-wcd-digital.c b/sound/soc/codecs/msm8916-wcd-digital.c index 3063dedd21cf..423bfebabed4 100644 --- a/sound/soc/codecs/msm8916-wcd-digital.c +++ b/sound/soc/codecs/msm8916-wcd-digital.c @@ -220,8 +220,6 @@ static const char *const dec_mux_text[] = { }; static const char *const cic_mux_text[] = { "AMIC", "DMIC" }; -static const char *const rx_mix2_text[] = { "ZERO", "IIR1", "IIR2" }; -static const char *const adc2_mux_text[] = { "ZERO", "INP2", "INP3" }; /* RX1 MIX1 */ static const struct soc_enum rx_mix1_inp_enum[] = { @@ -230,10 +228,6 @@ static const struct soc_enum rx_mix1_inp_enum[] = { SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX1_B2_CTL, 0, 6, rx_mix1_text), }; -/* RX1 MIX2 */ -static const struct soc_enum rx_mix2_inp1_chain_enum = SOC_ENUM_SINGLE( - LPASS_CDC_CONN_RX1_B3_CTL, 0, 3, rx_mix2_text); - /* RX2 MIX1 */ static const struct soc_enum rx2_mix1_inp_enum[] = { SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX2_B1_CTL, 0, 6, rx_mix1_text), @@ -241,10 +235,6 @@ static const struct soc_enum rx2_mix1_inp_enum[] = { SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX2_B2_CTL, 0, 6, rx_mix1_text), }; -/* RX2 MIX2 */ -static const struct soc_enum rx2_mix2_inp1_chain_enum = SOC_ENUM_SINGLE( - LPASS_CDC_CONN_RX2_B3_CTL, 0, 3, rx_mix2_text); - /* RX3 MIX1 */ static const struct soc_enum rx3_mix1_inp_enum[] = { SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX3_B1_CTL, 0, 6, rx_mix1_text), -- 2.20.1

2 1

[alsa-devel] [PATCH v2] ASoC: msm8916-wcd-digital: Select REGMAP_MMIO to fix build error
by Axel Lin 15 Jan '19

15 Jan '19

Fix below build error: ERROR: "__devm_regmap_init_mmio_clk" [sound/soc/codecs/snd-soc-msm8916-digital.ko] undefined! Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- v2: select REGMAP_MMIO is for SND_SOC_MSM8916_WCD_DIGITAL, not SND_SOC_MSM8916_WCD_ANALOG. sound/soc/codecs/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 87cb9c51e6f5..17049b9bc178 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -706,6 +706,7 @@ config SND_SOC_MSM8916_WCD_ANALOG config SND_SOC_MSM8916_WCD_DIGITAL tristate "Qualcomm MSM8916 WCD DIGITAL Codec" + select REGMAP_MMIO config SND_SOC_PCM1681 tristate "Texas Instruments PCM1681 CODEC" -- 2.17.1

3 2

[alsa-devel] [PATCH] ASoC: xlnx: parse AES audio parameters
by Maruthi Srinivas Bayyavarapu 15 Jan '19

15 Jan '19

AES channel status carries various audio parameters. If channel status is detected, current patch extracts sample rate and bit depth parameters of the incoming stream during capture. Signed-off-by: Maruthi Srinivas Bayyavarapu <maruthi.srinivas.bayyavarapu(a)xilinx.com> --- sound/soc/xilinx/xlnx_formatter_pcm.c | 143 ++++++++++++++++++++++++++++++++++ 1 file changed, 143 insertions(+) diff --git a/sound/soc/xilinx/xlnx_formatter_pcm.c b/sound/soc/xilinx/xlnx_formatter_pcm.c index d2194da..97177d3 100644 --- a/sound/soc/xilinx/xlnx_formatter_pcm.c +++ b/sound/soc/xilinx/xlnx_formatter_pcm.c @@ -13,6 +13,7 @@ #include <linux/of_irq.h> #include <linux/sizes.h> +#include <sound/asoundef.h> #include <sound/soc.h> #include <sound/pcm_params.h> @@ -63,6 +64,7 @@ #define PERIODS_MAX 6 #define PERIOD_BYTES_MIN 192 #define PERIOD_BYTES_MAX (50 * 1024) +#define XLNX_PARAM_UNKNOWN 0 enum bit_depth { BIT_DEPTH_8, @@ -117,6 +119,129 @@ static const struct snd_pcm_hardware xlnx_pcm_hardware = { .periods_max = PERIODS_MAX, }; +enum { + AES_TO_AES, + AES_TO_PCM, + PCM_TO_PCM, + PCM_TO_AES +}; + +static void xlnx_parse_aes_params(u32 chsts_reg1_val, u32 chsts_reg2_val, + struct device *dev) +{ + u32 padded, srate, bit_depth, status[2]; + + if (chsts_reg1_val & IEC958_AES0_PROFESSIONAL) { + status[0] = chsts_reg1_val & 0xff; + status[1] = (chsts_reg1_val >> 16) & 0xff; + + switch (status[0] & IEC958_AES0_PRO_FS) { + case IEC958_AES0_PRO_FS_44100: + srate = 44100; + break; + case IEC958_AES0_PRO_FS_48000: + srate = 48000; + break; + case IEC958_AES0_PRO_FS_32000: + srate = 32000; + break; + case IEC958_AES0_PRO_FS_NOTID: + default: + srate = XLNX_PARAM_UNKNOWN; + break; + } + + switch (status[1] & IEC958_AES2_PRO_SBITS) { + case IEC958_AES2_PRO_WORDLEN_NOTID: + case IEC958_AES2_PRO_SBITS_20: + padded = 0; + break; + case IEC958_AES2_PRO_SBITS_24: + padded = 4; + break; + default: + bit_depth = XLNX_PARAM_UNKNOWN; + goto log_params; + } + + switch (status[1] & IEC958_AES2_PRO_WORDLEN) { + case IEC958_AES2_PRO_WORDLEN_20_16: + bit_depth = 16 + padded; + break; + case IEC958_AES2_PRO_WORDLEN_22_18: + bit_depth = 18 + padded; + break; + case IEC958_AES2_PRO_WORDLEN_23_19: + bit_depth = 19 + padded; + break; + case IEC958_AES2_PRO_WORDLEN_24_20: + bit_depth = 20 + padded; + break; + case IEC958_AES2_PRO_WORDLEN_NOTID: + default: + bit_depth = XLNX_PARAM_UNKNOWN; + break; + } + + } else { + status[0] = (chsts_reg1_val >> 24) & 0xff; + status[1] = chsts_reg2_val & 0xff; + + switch (status[0] & IEC958_AES3_CON_FS) { + case IEC958_AES3_CON_FS_44100: + srate = 44100; + break; + case IEC958_AES3_CON_FS_48000: + srate = 48000; + break; + case IEC958_AES3_CON_FS_32000: + srate = 32000; + break; + default: + srate = XLNX_PARAM_UNKNOWN; + break; + } + + if (status[1] & IEC958_AES4_CON_MAX_WORDLEN_24) + padded = 4; + else + padded = 0; + + switch (status[1] & IEC958_AES4_CON_WORDLEN) { + case IEC958_AES4_CON_WORDLEN_20_16: + bit_depth = 16 + padded; + break; + case IEC958_AES4_CON_WORDLEN_22_18: + bit_depth = 18 + padded; + break; + case IEC958_AES4_CON_WORDLEN_23_19: + bit_depth = 19 + padded; + break; + case IEC958_AES4_CON_WORDLEN_24_20: + bit_depth = 20 + padded; + break; + case IEC958_AES4_CON_WORDLEN_21_17: + bit_depth = 17 + padded; + break; + case IEC958_AES4_CON_WORDLEN_NOTID: + default: + bit_depth = XLNX_PARAM_UNKNOWN; + break; + } + } + +log_params: + if (srate != XLNX_PARAM_UNKNOWN) + dev_info(dev, "sample rate = %d\n", srate); + else + dev_info(dev, "sample rate = unknown\n"); + + if (bit_depth != XLNX_PARAM_UNKNOWN) + dev_info(dev, "bit_depth = %d\n", bit_depth); + else + dev_info(dev, "bit_depth = unknown\n"); +} + static int xlnx_formatter_pcm_reset(void __iomem *mmio_base) { u32 val, retries = 0; @@ -302,8 +427,12 @@ static int xlnx_formatter_pcm_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { u32 low, high, active_ch, val, bytes_per_ch, bits_per_sample; + u32 aes_reg1_val, aes_reg2_val; int status; u64 size; + struct snd_soc_pcm_runtime *prtd = substream->private_data; + struct snd_soc_component *component = snd_soc_rtdcom_lookup(prtd, + DRV_NAME); struct snd_pcm_runtime *runtime = substream->runtime; struct xlnx_pcm_stream_param *stream_data = runtime->private_data; @@ -311,6 +440,20 @@ static int xlnx_formatter_pcm_hw_params(struct snd_pcm_substream *substream, if (active_ch > stream_data->ch_limit) return -EINVAL; + if (substream->stream == SNDRV_PCM_STREAM_CAPTURE && + stream_data->xfer_mode == AES_TO_PCM) { + val = readl(stream_data->mmio + XLNX_AUD_STS); + if (val & AUD_STS_CH_STS_MASK) { + aes_reg1_val = readl(stream_data->mmio + + XLNX_AUD_CH_STS_START); + aes_reg2_val = readl(stream_data->mmio + + XLNX_AUD_CH_STS_START + 0x4); + + xlnx_parse_aes_params(aes_reg1_val, aes_reg2_val, + component->dev); + } + } + size = params_buffer_bytes(params); status = snd_pcm_lib_malloc_pages(substream, size); if (status < 0) -- 2.7.4

2 1

[alsa-devel] Applied "ASoC: soc-core: fix init platform memory handling" to the asoc tree
by Mark Brown 15 Jan '19

15 Jan '19

The patch ASoC: soc-core: fix init platform memory handling has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 09ac6a817bd687e7f5dac00470262efdd72f9319 Mon Sep 17 00:00:00 2001 From: Curtis Malainey <cujomalainey(a)chromium.org> Date: Thu, 10 Jan 2019 16:21:04 -0800 Subject: [PATCH] ASoC: soc-core: fix init platform memory handling snd_soc_init_platform initializes pointers to snd_soc_dai_link which is statically allocated and it does this by devm_kzalloc. In the event of an EPROBE_DEFER the memory will be freed and the pointers are left dangling. snd_soc_init_platform sees the dangling pointers and assumes they are pointing to initialized memory and does not reallocate them on the second probe attempt which results in a use after free bug since devm has freed the memory from the first probe attempt. Since the intention for snd_soc_dai_link->platform is that it can be set statically by the machine driver we need to respect the pointer in the event we did not set it but still catch dangling pointers. The solution is to add a flag to track whether the pointer was dynamically allocated or not. Signed-off-by: Curtis Malainey <cujomalainey(a)chromium.org> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- include/sound/soc.h | 6 ++++++ sound/soc/soc-core.c | 11 ++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 8ec1de856ee7..e665f111b0d2 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -985,6 +985,12 @@ struct snd_soc_dai_link { /* Do not create a PCM for this DAI link (Backend link) */ unsigned int ignore:1; + /* + * This driver uses legacy platform naming. Set by the core, machine + * drivers should not modify this value. + */ + unsigned int legacy_platform:1; + struct list_head list; /* DAI link list of the soc card */ struct snd_soc_dobj dobj; /* For topology */ }; diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 0934b36645b3..cdcc417c94ca 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1034,17 +1034,18 @@ static int snd_soc_init_platform(struct snd_soc_card *card, * this function should be removed in the future */ /* convert Legacy platform link */ - if (!platform) { + if (!platform || dai_link->legacy_platform) { platform = devm_kzalloc(card->dev, sizeof(struct snd_soc_dai_link_component), GFP_KERNEL); if (!platform) return -ENOMEM; - dai_link->platform = platform; - platform->name = dai_link->platform_name; - platform->of_node = dai_link->platform_of_node; - platform->dai_name = NULL; + dai_link->platform = platform; + dai_link->legacy_platform = 1; + platform->name = dai_link->platform_name; + platform->of_node = dai_link->platform_of_node; + platform->dai_name = NULL; } /* if there's no platform we match on the empty platform */ -- 2.20.1

1 0

[alsa-devel] [PATCH] make huawei matebook X right speaker work
by Tomas Espeleta 14 Jan '19

14 Jan '19

Hard coded coefficients to make Huawuei Matebook X right speaker work. The Matebook X has a ALC298, please refer to bug 197801 on how these numbers were reverse engineered from the Windows driver The reversed engineered sequence represents a repeating pattern of verbs, and the only values that are changing periodically are written on indexes 0x23 and 0x25: 0x500, 0x23 0x400, VALUE1 0x500, 0x25 0x400, VALUE2 * fixes bug 197801 * skipped reading sequences (0x500 - 0xc00 sequences are ignored) * static values from reverse engineering are used Signed-off-by: Tomas Espeleta <tomas.espeleta(a)gmail.com> --- sound/pci/hda/patch_realtek.c | 70 +++++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 3 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 0b3e7a18ca78..ec3972d9e30d 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -3628,6 +3628,64 @@ static void alc269_x101_hp_automute_hook(struct hda_codec *codec, vref); } +struct hda_alc298_mbxinit { + unsigned char value_0x23; + unsigned char value_0x25; +}; + +void alc298_stereo_seq(struct hda_codec *codec, + struct hda_alc298_mbxinit *initval, int first) +{ + snd_hda_codec_write(codec, 0x6, 0, 0x73e, 0x0); + alc_write_coef_idx(codec, 0x26, 0xb000); + + if (first) + snd_hda_codec_write(codec, 0x21, 0, 0xf09, 0x0); + + snd_hda_codec_write(codec, 0x6, 0, 0x73e, 0x80); + alc_write_coef_idx(codec, 0x26, 0xf000); + alc_write_coef_idx(codec, 0x23, initval->value_0x23); + + if (initval->value_0x23 != 0x1e) + alc_write_coef_idx(codec, 0x25, initval->value_0x25); + + snd_hda_codec_write(codec, 0x20, 0, AC_VERB_SET_COEF_INDEX, 0x26); + snd_hda_codec_write(codec, 0x20, 0, 0x4b0, 0x10); +} + +void alc298_fixup_huawei_mbx_stereo(struct hda_codec *codec, + const struct hda_fixup *fix, int action) +{ + // Initialization magic + static struct hda_alc298_mbxinit dac_init[] = { + {0xc, 0x0}, {0xd, 0x0}, {0xe, 0x0}, {0xf, 0x0}, + {0x10, 0x0}, {0x1a, 0x40}, {0x1b, 0x82}, {0x1c, 0x0}, + {0x1d, 0x0}, {0x1e, 0x0}, {0x1f, 0x0}, + {0x20, 0xc2}, {0x21, 0xc8}, {0x22, 0x26}, {0x23, 0x24}, + {0x27, 0xff}, {0x28, 0xff}, {0x29, 0xff}, {0x2a, 0x8f}, + {0x2b, 0x2}, {0x2c, 0x48}, {0x2d, 0x34}, {0x2e, 0x0}, + {0x2f, 0x0}, + {0x30, 0x0}, {0x31, 0x0}, {0x32, 0x0}, {0x33, 0x0}, + {0x34, 0x0}, {0x35, 0x1}, {0x36, 0x93}, {0x37, 0xc}, + {0x38, 0x0}, {0x39, 0x0}, {0x3a, 0xf8}, {0x38, 0x80}, + {} + }; + struct hda_alc298_mbxinit *seq = dac_init; + + // Start + snd_hda_codec_write(codec, 0x6, 0, 0x73e, 0x0); + snd_hda_codec_write(codec, 0x6, 0, 0x73e, 0x80); + alc_write_coef_idx(codec, 0x26, 0xf000); + alc_write_coef_idx(codec, 0x22, 0x31); + alc_write_coef_idx(codec, 0x23, 0xb); + alc_write_coef_idx(codec, 0x25, 0x0); + snd_hda_codec_write(codec, 0x20, 0, AC_VERB_SET_COEF_INDEX, 0x26); + snd_hda_codec_write(codec, 0x20, 0, 0x4b0, 0x10); + + for (; seq->value_0x23; seq++) + alc298_stereo_seq(codec, seq, seq == dac_init); +} + static void alc269_fixup_x101_headset_mic(struct hda_codec *codec, const struct hda_fixup *fix, int action) { @@ -3638,7 +3696,6 @@ static void alc269_fixup_x101_headset_mic(struct hda_codec *codec, } } - /* update mute-LED according to the speaker mute state via mic VREF pin */ static void alc269_fixup_mic_mute_hook(void *private_data, int enabled) { @@ -5582,6 +5639,7 @@ enum { ALC255_FIXUP_DUMMY_LINEOUT_VERB, ALC255_FIXUP_DELL_HEADSET_MIC, ALC256_FIXUP_HUAWEI_MBXP_PINS, + ALC298_FIXUP_HUAWEI_MBX_STEREO, ALC295_FIXUP_HP_X360, ALC221_FIXUP_HP_HEADSET_MIC, ALC285_FIXUP_LENOVO_HEADPHONE_NOISE, @@ -5880,6 +5938,12 @@ static const struct hda_fixup alc269_fixups[] = { .chained = true, .chain_id = ALC255_FIXUP_MIC_MUTE_LED }, + [ALC298_FIXUP_HUAWEI_MBX_STEREO] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc298_fixup_huawei_mbx_stereo, + .chained = true, + .chain_id = ALC255_FIXUP_MIC_MUTE_LED + }, [ALC269_FIXUP_ASUS_X101_FUNC] = { .type = HDA_FIXUP_FUNC, .v.func = alc269_fixup_x101_headset_mic, @@ -6778,8 +6842,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x511f, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_PCM_44K), SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD), - SND_PCI_QUIRK(0x19e5, 0x3200, "Huawei MBX", ALC255_FIXUP_MIC_MUTE_LED), - SND_PCI_QUIRK(0x19e5, 0x3201, "Huawei MBX", ALC255_FIXUP_MIC_MUTE_LED), + SND_PCI_QUIRK(0x19e5, 0x3200, "Huawei MBX", ALC298_FIXUP_HUAWEI_MBX_STEREO), + SND_PCI_QUIRK(0x19e5, 0x3201, "Huawei MBX", ALC298_FIXUP_HUAWEI_MBX_STEREO), SND_PCI_QUIRK(0x19e5, 0x3204, "Huawei MBXP", ALC256_FIXUP_HUAWEI_MBXP_PINS), SND_PCI_QUIRK(0x1b7d, 0xa831, "Ordissimo EVE2 ", ALC269VB_FIXUP_ORDISSIMO_EVE2), /* Also known as Malata PC-B1303 */ -- 2.20.1

1 0