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

[alsa-devel] [PATCH] ASoC: uniphier: Fix double reset assersion when transitioning to suspend state
by Kunihiko Hayashi 20 Aug '19

20 Aug '19

When transitioning to supend state, uniphier_aio_dai_suspend() is called and asserts reset lines and disables clocks. However, if there are two or more DAIs, uniphier_aio_dai_suspend() are called multiple times, and double reset assersion will cause. This patch defines the counter that has the number of DAIs at first, and whenever uniphier_aio_dai_suspend() are called, it decrements the counter. And only if the counter is zero, it asserts reset lines and disables clocks. In the same way, uniphier_aio_dai_resume() are called, it increments the counter after deasserting reset lines and enabling clocks. Fixes: 139a34200233 ("ASoC: uniphier: add support for UniPhier AIO CPU DAI driver") Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko(a)socionext.com> --- sound/soc/uniphier/aio-cpu.c | 31 +++++++++++++++++++++---------- sound/soc/uniphier/aio.h | 1 + 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/sound/soc/uniphier/aio-cpu.c b/sound/soc/uniphier/aio-cpu.c index ee90e6c..2ae582a 100644 --- a/sound/soc/uniphier/aio-cpu.c +++ b/sound/soc/uniphier/aio-cpu.c @@ -424,8 +424,11 @@ int uniphier_aio_dai_suspend(struct snd_soc_dai *dai) { struct uniphier_aio *aio = uniphier_priv(dai); - reset_control_assert(aio->chip->rst); - clk_disable_unprepare(aio->chip->clk); + aio->chip->num_wup_aios--; + if (!aio->chip->num_wup_aios) { + reset_control_assert(aio->chip->rst); + clk_disable_unprepare(aio->chip->clk); + } return 0; } @@ -439,13 +442,15 @@ int uniphier_aio_dai_resume(struct snd_soc_dai *dai) if (!aio->chip->active) return 0; - ret = clk_prepare_enable(aio->chip->clk); - if (ret) - return ret; + if (!aio->chip->num_wup_aios) { + ret = clk_prepare_enable(aio->chip->clk); + if (ret) + return ret; - ret = reset_control_deassert(aio->chip->rst); - if (ret) - goto err_out_clock; + ret = reset_control_deassert(aio->chip->rst); + if (ret) + goto err_out_clock; + } aio_iecout_set_enable(aio->chip, true); aio_chip_init(aio->chip); @@ -458,7 +463,7 @@ int uniphier_aio_dai_resume(struct snd_soc_dai *dai) ret = aio_init(sub); if (ret) - goto err_out_clock; + goto err_out_reset; if (!sub->setting) continue; @@ -466,11 +471,16 @@ int uniphier_aio_dai_resume(struct snd_soc_dai *dai) aio_port_reset(sub); aio_src_reset(sub); } + aio->chip->num_wup_aios++; return 0; +err_out_reset: + if (!aio->chip->num_wup_aios) + reset_control_assert(aio->chip->rst); err_out_clock: - clk_disable_unprepare(aio->chip->clk); + if (!aio->chip->num_wup_aios) + clk_disable_unprepare(aio->chip->clk); return ret; } @@ -619,6 +629,7 @@ int uniphier_aio_probe(struct platform_device *pdev) return PTR_ERR(chip->rst); chip->num_aios = chip->chip_spec->num_dais; + chip->num_wup_aios = chip->num_aios; chip->aios = devm_kcalloc(dev, chip->num_aios, sizeof(struct uniphier_aio), GFP_KERNEL); diff --git a/sound/soc/uniphier/aio.h b/sound/soc/uniphier/aio.h index ca6ccba..a7ff7e5 100644 --- a/sound/soc/uniphier/aio.h +++ b/sound/soc/uniphier/aio.h @@ -285,6 +285,7 @@ struct uniphier_aio_chip { struct uniphier_aio *aios; int num_aios; + int num_wup_aios; struct uniphier_aio_pll *plls; int num_plls; -- 2.7.4

3 2

[alsa-devel] [PATCH v2 1/2] ASoC: wm8904: fix typo in DAPM kcontrol name
by Michał Mirosław 20 Aug '19

20 Aug '19

Trivial fix for typo in "Capture Inverting Mux"es' name. Signed-off-by: Michał Mirosław <mirq-linux(a)rere.qmqm.pl> Acked-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- v2: no changes --- sound/soc/codecs/wm8904.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c index 5ebdd1d9afde..525e4ef654a1 100644 --- a/sound/soc/codecs/wm8904.c +++ b/sound/soc/codecs/wm8904.c @@ -866,7 +866,7 @@ static SOC_ENUM_SINGLE_DECL(lin_inv_enum, WM8904_ANALOGUE_LEFT_INPUT_1, 4, lin_text); static const struct snd_kcontrol_new lin_inv_mux = - SOC_DAPM_ENUM("Left Capture Inveting Mux", lin_inv_enum); + SOC_DAPM_ENUM("Left Capture Inverting Mux", lin_inv_enum); static const char *rin_text[] = { "IN1R", "IN2R", "IN3R" @@ -882,7 +882,7 @@ static SOC_ENUM_SINGLE_DECL(rin_inv_enum, WM8904_ANALOGUE_RIGHT_INPUT_1, 4, rin_text); static const struct snd_kcontrol_new rin_inv_mux = - SOC_DAPM_ENUM("Right Capture Inveting Mux", rin_inv_enum); + SOC_DAPM_ENUM("Right Capture Inverting Mux", rin_inv_enum); static const char *aif_text[] = { "Left", "Right" -- 2.20.1

1 1

[alsa-devel] [PATCH] fix odd_ptr_err.cocci warnings
by Julia Lawall 20 Aug '19

20 Aug '19

From: kbuild test robot <lkp(a)intel.com> PTR_ERR should normally access the value just tested by IS_ERR Generated by: scripts/coccinelle/tests/odd_ptr_err.cocci Fixes: 62c9c1442c8f ("j721e new machine driver wip") Signed-off-by: kbuild test robot <lkp(a)intel.com> Signed-off-by: Julia Lawall <julia.lawall(a)lip6.fr> --- tree: https://github.com/omap-audio/linux-audio peter/ti-linux-4.19.y/wip head: 62c9c1442c8f61ca93e62e1a9d8318be0abd9d9a commit: 62c9c1442c8f61ca93e62e1a9d8318be0abd9d9a [34/34] j721e new machine driver wip :::::: branch date: 20 hours ago :::::: commit date: 20 hours ago j721e-evm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/sound/soc/ti/j721e-evm.c +++ b/sound/soc/ti/j721e-evm.c @@ -283,7 +283,7 @@ static int j721e_get_clocks(struct platf parent = devm_clk_get(&pdev->dev, clk_name); kfree(clk_name); if (IS_ERR(parent)) { - ret = PTR_ERR(clocks->parent); + ret = PTR_ERR(parent); if (ret != -EPROBE_DEFER) dev_err(&pdev->dev, "failed to acquire %s': %d\n", prefix, ret); @@ -299,7 +299,7 @@ static int j721e_get_clocks(struct platf parent = devm_clk_get(&pdev->dev, clk_name); kfree(clk_name); if (IS_ERR(parent)) { - ret = PTR_ERR(clocks->parent); + ret = PTR_ERR(parent); if (ret != -EPROBE_DEFER) dev_err(&pdev->dev, "failed to acquire %s': %d\n", prefix, ret);

4 5

[alsa-devel] [PATCH 1/2] ASoC: wm8904: fix typo in DAPM kcontrol name
by Michał Mirosław 20 Aug '19

20 Aug '19

Trivial fix for typo in "Capture Inverting Mux"es' name. Signed-off-by: Michał Mirosław <mirq-linux(a)rere.qmqm.pl> --- sound/soc/codecs/wm8904.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c index 5ebdd1d9afde..525e4ef654a1 100644 --- a/sound/soc/codecs/wm8904.c +++ b/sound/soc/codecs/wm8904.c @@ -866,7 +866,7 @@ static SOC_ENUM_SINGLE_DECL(lin_inv_enum, WM8904_ANALOGUE_LEFT_INPUT_1, 4, lin_text); static const struct snd_kcontrol_new lin_inv_mux = - SOC_DAPM_ENUM("Left Capture Inveting Mux", lin_inv_enum); + SOC_DAPM_ENUM("Left Capture Inverting Mux", lin_inv_enum); static const char *rin_text[] = { "IN1R", "IN2R", "IN3R" @@ -882,7 +882,7 @@ static SOC_ENUM_SINGLE_DECL(rin_inv_enum, WM8904_ANALOGUE_RIGHT_INPUT_1, 4, rin_text); static const struct snd_kcontrol_new rin_inv_mux = - SOC_DAPM_ENUM("Right Capture Inveting Mux", rin_inv_enum); + SOC_DAPM_ENUM("Right Capture Inverting Mux", rin_inv_enum); static const char *aif_text[] = { "Left", "Right" -- 2.20.1

2 3

[alsa-devel] [PATCH v2] ALSA: hda/ca0132 - Add new SBZ quirk
by Paweł Rekowski 20 Aug '19

20 Aug '19

This patch adds a new PCI subsys ID for the SBZ, as found and tested by me and some reddit users. Signed-off-by: Paweł Rekowski <p.rekowski(a)gmail.com> --- sound/pci/hda/patch_ca0132.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c index c3096796ee05..c41865e1222c 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -1175,6 +1175,7 @@ static const struct snd_pci_quirk ca0132_quirks[] = { SND_PCI_QUIRK(0x1028, 0x0708, "Alienware 15 R2 2016", QUIRK_ALIENWARE), SND_PCI_QUIRK(0x1102, 0x0010, "Sound Blaster Z", QUIRK_SBZ), SND_PCI_QUIRK(0x1102, 0x0023, "Sound Blaster Z", QUIRK_SBZ), + SND_PCI_QUIRK(0x1102, 0x0027, "Sound Blaster Z", QUIRK_SBZ), SND_PCI_QUIRK(0x1102, 0x0033, "Sound Blaster ZxR", QUIRK_SBZ), SND_PCI_QUIRK(0x1458, 0xA016, "Recon3Di", QUIRK_R3DI), SND_PCI_QUIRK(0x1458, 0xA026, "Gigabyte G1.Sniper Z97", QUIRK_R3DI), -- 2.23.0

2 1

[alsa-devel] [PATCH] ALSA: usb-audio: Add implicit fb quirk for Behringer UFX1604
by Takashi Iwai 20 Aug '19

20 Aug '19

Behringer UFX1604 requires the similar quirk to apply implicit fb like another Behringer model UFX1204 in order to fix the noisy playback. BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=204631 Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/usb/pcm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index 75b96929f76c..e4bbf79de956 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -339,6 +339,7 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs, ep = 0x81; ifnum = 2; goto add_sync_ep_from_ifnum; + case USB_ID(0x1397, 0x0001): /* Behringer UFX1604 */ case USB_ID(0x1397, 0x0002): /* Behringer UFX1204 */ ep = 0x81; ifnum = 1; -- 2.16.4

1 0

[alsa-devel] [PATCH 00/15] ASoC: use modern style for aux_dev
by Kuninori Morimoto 20 Aug '19

20 Aug '19

Hi Mark, aux_dev users I'm sorry to bother you. I know I'm posting soc-core.c cleanup patches, and these are still under reviewing, but I want to post next patches before my summer vacation. These patches support modern style for aux_dev. I think it should work, but I can't test, because my platform doesn't use aux_dev. Please test and review these. These exchange aux_dev "style" only, do nothing from "technical" point of view. Kuninori Morimoto (15): ASoC: soc-core: support snd_soc_dai_link_component for aux_dev ASoC: simple-card: use snd_soc_dai_link_component for aux_dev ASoC: intel: cht_bsw_max98090_ti: use snd_soc_dai_link_component for aux_dev ASoC: mediatek: mt8183-da7219-max98357: use snd_soc_dai_link_component for aux_dev ASoC: mediatek: mt8183-mt6358-ts3a227-max98357: use snd_soc_dai_link_component for aux_dev ASoC: meson: axg-card: use snd_soc_dai_link_component for aux_dev ASoC: rockchip: rockchip_max98090: use snd_soc_dai_link_component for aux_dev ASoC: samsung: neo1973_wm8753: use snd_soc_dai_link_component for aux_dev ASoC: samsung: speyside: use snd_soc_dai_link_component for aux_dev ASoC: samsung: tm2_wm5110: use snd_soc_dai_link_component for aux_dev ASoC: sunxi: sun4i-codec: use snd_soc_dai_link_component for aux_dev ASoC: ti: rx51: use snd_soc_dai_link_component for aux_dev ASoC: soc-core: remove legacy style of aux_dev ASoC: soc-core: add for_each_xxx macro for aux_dev ASoC: soc-core: add soc_unbind_aux_dev() include/sound/soc.h | 16 +++++-- sound/soc/generic/simple-card.c | 2 +- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 3 +- sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 6 +-- .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 6 +-- sound/soc/meson/axg-card.c | 11 ++--- sound/soc/rockchip/rockchip_max98090.c | 6 +-- sound/soc/samsung/neo1973_wm8753.c | 3 +- sound/soc/samsung/speyside.c | 3 +- sound/soc/samsung/tm2_wm5110.c | 10 ++--- sound/soc/soc-core.c | 52 ++++++++-------------- sound/soc/sunxi/sun4i-codec.c | 14 +++--- sound/soc/ti/rx51.c | 14 +++--- 13 files changed, 66 insertions(+), 80 deletions(-) -- 2.7.4

7 41

[alsa-devel] [PATCH] Fix an OOB bug in uac_mixer_unit_bmControls
by Hui Peng 20 Aug '19

20 Aug '19

`uac_mixer_unit_get_channels` calls `uac_mixer_unit_bmControls` to get pointer to bmControls field. The current implementation of `uac_mixer_unit_get_channels` does properly check the size of uac_mixer_unit_descriptor descriptor and may allow OOB access in `uac_mixer_unit_bmControls`. Reported-by: Hui Peng <benquike(a)gmail.com> Reported-by: Mathias Payer <mathias.payer(a)nebelwelt.net> Signed-off-by: Hui Peng <benquike(a)gmail.com> --- sound/usb/mixer.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index b5927c3d5bc0..00e6274a63c3 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -738,28 +738,39 @@ static int get_cluster_channels_v3(struct mixer_build *state, unsigned int clust static int uac_mixer_unit_get_channels(struct mixer_build *state, struct uac_mixer_unit_descriptor *desc) { - int mu_channels; + int mu_channels = 0; void *c; - if (desc->bLength < sizeof(*desc)) - return -EINVAL; if (!desc->bNrInPins) return -EINVAL; - if (desc->bLength < sizeof(*desc) + desc->bNrInPins) - return -EINVAL; switch (state->mixer->protocol) { case UAC_VERSION_1: + // limit derived from uac_mixer_unit_bmControls + if (desc->bLength < sizeof(*desc) + desc->bNrInPins + 4) + return 0; + + mu_channels = uac_mixer_unit_bNrChannels(desc); + break; + case UAC_VERSION_2: - default: - if (desc->bLength < sizeof(*desc) + desc->bNrInPins + 1) + // limit derived from uac_mixer_unit_bmControls + if (desc->bLength < sizeof(*desc) + desc->bNrInPins + 6) return 0; /* no bmControls -> skip */ + mu_channels = uac_mixer_unit_bNrChannels(desc); break; case UAC_VERSION_3: + // limit derived from uac_mixer_unit_bmControls + if (desc->bLength < sizeof(*desc) + desc->bNrInPins + 2) + return 0; /* no bmControls -> skip */ + mu_channels = get_cluster_channels_v3(state, uac3_mixer_unit_wClusterDescrID(desc)); break; + + default: + break; } if (!mu_channels) -- 2.22.1

1 1

[alsa-devel] [PATCH 0/3] ASoC: SOF: initial support for i.MX8
by Pierre-Louis Bossart 19 Aug '19

19 Aug '19

The reviews for these patches took place already on mailing lists and GitHub, and the code is already integrated in the SOF tree (along with dependencies already accepted in the i.MX tree) As agreed with Daniel, I am sending these patches as part of my weekly updates so that we avoid conflicts with other contributions (the next series adds Intel ALH/SoundWire suport which changes the same files) Daniel Baluta (3): ASoC: SOF: Add OF DSP device support ASoC: SOF: imx: Add i.MX8 HW support ASoC: SOF: topology: Add dummy support for i.MX8 DAIs include/sound/sof/dai.h | 2 + include/uapi/sound/sof/tokens.h | 8 + sound/soc/sof/Kconfig | 11 + sound/soc/sof/Makefile | 4 + sound/soc/sof/imx/Kconfig | 22 ++ sound/soc/sof/imx/Makefile | 4 + sound/soc/sof/imx/imx8.c | 394 ++++++++++++++++++++++++++++++++ sound/soc/sof/sof-of-dev.c | 143 ++++++++++++ sound/soc/sof/topology.c | 30 +++ 9 files changed, 618 insertions(+) create mode 100644 sound/soc/sof/imx/Kconfig create mode 100644 sound/soc/sof/imx/Makefile create mode 100644 sound/soc/sof/imx/imx8.c create mode 100644 sound/soc/sof/sof-of-dev.c -- 2.20.1

5 13

[alsa-devel] [PATCH] ALSA: hda - Fixes inverted Conexant GPIO mic mute led
by jeronimo＠borque.com.ar 19 Aug '19

19 Aug '19

From: Jeronimo Borque <jeronimo(a)borque.com.ar> "enabled" parameter historically referred to the device input or output, not to the led indicator. After the changes added with the led helper functions the mic mute led logic refers to the led and not to the mic input which caused led indicator to be negated (Mic mute led was on when the input enabled) Fixing it in the call to cxt_update_gpio_led at the cxt_gpio_micmute_update hook. Maybe more changes are required to be consistent everywhere. Signed-off-by: Jeronimo Borque <jeronimo(a)borque.com.ar> --- sound/pci/hda/patch_conexant.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index f299f137eaea..8edf0d1290b5 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -636,6 +636,10 @@ static void cxt_update_gpio_led(struct hda_codec *codec, unsigned int mask, spec->gpio_led &= ~mask; else spec->gpio_led |= mask; + + codec_dbg(codec, "mask:%d enabled:%d gpio_led:%d\n", + mask, enabled, spec->gpio_led); + if (spec->gpio_led != oldval) snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA, spec->gpio_led); @@ -656,7 +660,7 @@ static void cxt_gpio_micmute_update(struct hda_codec *codec) struct conexant_spec *spec = codec->spec; cxt_update_gpio_led(codec, spec->gpio_mic_led_mask, - spec->gen.micmute_led.led_value); + !spec->gen.micmute_led.led_value); } @@ -669,7 +673,6 @@ static void cxt_fixup_mute_led_gpio(struct hda_codec *codec, { 0x01, AC_VERB_SET_GPIO_DIRECTION, 0x03 }, {} }; - codec_info(codec, "action: %d gpio_led: %d\n", action, spec->gpio_led); if (action == HDA_FIXUP_ACT_PRE_PROBE) { spec->gen.vmaster_mute.hook = cxt_fixup_gpio_mute_hook; -- 2.21.0

3 9