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

[alsa-devel] [PATCH V3] ASoC: fsl_asrc: refine the setting of internal clock divider
by Shengjiu Wang 28 Oct '19

28 Oct '19

The output divider should align with the output sample rate, if use ideal sample rate, there will be a lot of overload, which would cause underrun. The maximum divider of asrc clock is 1024, but there is no judgement for this limitation in driver, which may cause the divider setting not correct. For non-ideal ratio mode, the clock rate should divide the sample rate with no remainder, and the quotient should be less than 1024. Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> Acked-by: Nicolin Chen <nicoleotsuka(a)gmail.com> --- Change in v3 - refine comments Change in v2 - remove p2p/m2m word - use use_ideal_rate sound/soc/fsl/fsl_asrc.c | 45 ++++++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 11 deletions(-) diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c index 0bf91a6f54b9..a3cfceea7d2f 100644 --- a/sound/soc/fsl/fsl_asrc.c +++ b/sound/soc/fsl/fsl_asrc.c @@ -259,8 +259,15 @@ static int fsl_asrc_set_ideal_ratio(struct fsl_asrc_pair *pair, * It configures those ASRC registers according to a configuration instance * of struct asrc_config which includes in/output sample rate, width, channel * and clock settings. + * + * Note: + * The ideal ratio configuration can work with a flexible clock rate setting. + * Using IDEAL_RATIO_RATE gives a faster converting speed but overloads ASRC. + * For a regular audio playback, the clock rate should not be slower than an + * clock rate aligning with the output sample rate; For a use case requiring + * faster conversion, set use_ideal_rate to have the faster speed. */ -static int fsl_asrc_config_pair(struct fsl_asrc_pair *pair) +static int fsl_asrc_config_pair(struct fsl_asrc_pair *pair, bool use_ideal_rate) { struct asrc_config *config = pair->config; struct fsl_asrc *asrc_priv = pair->asrc_priv; @@ -268,7 +275,8 @@ static int fsl_asrc_config_pair(struct fsl_asrc_pair *pair) enum asrc_word_width input_word_width; enum asrc_word_width output_word_width; u32 inrate, outrate, indiv, outdiv; - u32 clk_index[2], div[2]; + u32 clk_index[2], div[2], rem[2]; + u64 clk_rate; int in, out, channels; int pre_proc, post_proc; struct clk *clk; @@ -351,27 +359,42 @@ static int fsl_asrc_config_pair(struct fsl_asrc_pair *pair) /* We only have output clock for ideal ratio mode */ clk = asrc_priv->asrck_clk[clk_index[ideal ? OUT : IN]]; - div[IN] = clk_get_rate(clk) / inrate; - if (div[IN] == 0) { + clk_rate = clk_get_rate(clk); + rem[IN] = do_div(clk_rate, inrate); + div[IN] = (u32)clk_rate; + + /* + * The divider range is [1, 1024], defined by the hardware. For non- + * ideal ratio configuration, clock rate has to be strictly aligned + * with the sample rate. For ideal ratio configuration, clock rates + * only result in different converting speeds. So remainder does not + * matter, as long as we keep the divider within its valid range. + */ + if (div[IN] == 0 || (!ideal && (div[IN] > 1024 || rem[IN] != 0))) { pair_err("failed to support input sample rate %dHz by asrck_%x\n", inrate, clk_index[ideal ? OUT : IN]); return -EINVAL; } + div[IN] = min_t(u32, 1024, div[IN]); + clk = asrc_priv->asrck_clk[clk_index[OUT]]; - - /* Use fixed output rate for Ideal Ratio mode (INCLK_NONE) */ - if (ideal) - div[OUT] = clk_get_rate(clk) / IDEAL_RATIO_RATE; + clk_rate = clk_get_rate(clk); + if (ideal && use_ideal_rate) + rem[OUT] = do_div(clk_rate, IDEAL_RATIO_RATE); else - div[OUT] = clk_get_rate(clk) / outrate; + rem[OUT] = do_div(clk_rate, outrate); + div[OUT] = clk_rate; - if (div[OUT] == 0) { + /* Output divider has the same limitation as the input one */ + if (div[OUT] == 0 || (!ideal && (div[OUT] > 1024 || rem[OUT] != 0))) { pair_err("failed to support output sample rate %dHz by asrck_%x\n", outrate, clk_index[OUT]); return -EINVAL; } + div[OUT] = min_t(u32, 1024, div[OUT]); + /* Set the channel number */ channels = config->channel_num; @@ -560,7 +583,7 @@ static int fsl_asrc_dai_hw_params(struct snd_pcm_substream *substream, config.output_sample_rate = rate; } - ret = fsl_asrc_config_pair(pair); + ret = fsl_asrc_config_pair(pair, false); if (ret) { dev_err(dai->dev, "fail to config asrc pair\n"); return ret; -- 2.21.0

2 1

[alsa-devel] [PATCH] ASoC: rsnd: core.c: add WARN_ON() on rsnd_channel_normalization()
by Kuninori Morimoto 28 Oct '19

28 Oct '19

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> chan > 8 or chan < 0 shouldn't happen. This patch uses WARN_ON() for such case. Reported-by: Pavel Machek <pavel(a)denx.de> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/sh/rcar/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index e9242a0..295faad 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -302,7 +302,7 @@ int rsnd_runtime_channel_after_ctu_with_params(struct rsnd_dai_stream *io, int rsnd_channel_normalization(int chan) { - if ((chan > 8) || (chan < 0)) + if (WARN_ON((chan > 8) || (chan < 0))) return 0; /* TDM Extend Mode needs 8ch */ -- 2.7.4

2 1

[alsa-devel] [PATCH] ALSA: pci: Fix memory leak in snd_korg1212_create
by Navid Emamdoost 28 Oct '19

28 Oct '19

In the implementation of snd_korg1212_create() the allocated memory for korg1212 is leaked in cases of error. Release korg1212 via snd_korg1212_free() if either of these calls fail: snd_korg1212_downloadDSPCode(), snd_pcm_new(), or snd_ctl_add(). Signed-off-by: Navid Emamdoost <navid.emamdoost(a)gmail.com> --- sound/pci/korg1212/korg1212.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c index 0d81eac0a478..e976e857d915 100644 --- a/sound/pci/korg1212/korg1212.c +++ b/sound/pci/korg1212/korg1212.c @@ -2367,8 +2367,10 @@ static int snd_korg1212_create(struct snd_card *card, struct pci_dev *pci, mdelay(CARD_BOOT_DELAY_IN_MS); - if (snd_korg1212_downloadDSPCode(korg1212)) + if (snd_korg1212_downloadDSPCode(korg1212)) { + snd_korg1212_free(korg1212); return -EBUSY; + } K1212_DEBUG_PRINTK("korg1212: dspMemPhy = %08x U[%08x], " "PlayDataPhy = %08x L[%08x]\n" @@ -2383,8 +2385,11 @@ static int snd_korg1212_create(struct snd_card *card, struct pci_dev *pci, korg1212->RoutingTablePhy, LowerWordSwap(korg1212->RoutingTablePhy), korg1212->AdatTimeCodePhy, LowerWordSwap(korg1212->AdatTimeCodePhy)); - if ((err = snd_pcm_new(korg1212->card, "korg1212", 0, 1, 1, &korg1212->pcm)) < 0) + err = snd_pcm_new(korg1212->card, "korg1212", 0, 1, 1, &korg1212->pcm); + if (err < 0) { + snd_korg1212_free(korg1212); return err; + } korg1212->pcm->private_data = korg1212; korg1212->pcm->private_free = snd_korg1212_free_pcm; @@ -2398,8 +2403,10 @@ static int snd_korg1212_create(struct snd_card *card, struct pci_dev *pci, for (i = 0; i < ARRAY_SIZE(snd_korg1212_controls); i++) { err = snd_ctl_add(korg1212->card, snd_ctl_new1(&snd_korg1212_controls[i], korg1212)); - if (err < 0) + if (err < 0) { + snd_korg1212_free(korg1212); return err; + } } snd_korg1212_proc_init(korg1212); -- 2.17.1

3 7

[alsa-devel] KASAN: slab-out-of-bounds Read in build_audio_procunit
by syzbot 28 Oct '19

28 Oct '19

Hello, syzbot found the following crash on: HEAD commit: 22be26f7 usb-fuzzer: main usb gadget fuzzer driver git tree: https://github.com/google/kasan.git usb-fuzzer console output: https://syzkaller.appspot.com/x/log.txt?x=103893cf600000 kernel config: https://syzkaller.appspot.com/x/.config?x=387eccb7ac68ec5 dashboard link: https://syzkaller.appspot.com/bug?extid=0620f79a1978b1133fd7 compiler: gcc (GCC) 9.0.0 20181231 (experimental) syz repro: https://syzkaller.appspot.com/x/repro.syz?x=16fd6a40e00000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=1033215f600000 IMPORTANT: if you fix the bug, please add the following tag to the commit: Reported-by: syzbot+0620f79a1978b1133fd7(a)syzkaller.appspotmail.com usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3 usb 1-1: Product: syz usb 1-1: Manufacturer: syz usb 1-1: SerialNumber: syz ================================================================== BUG: KASAN: slab-out-of-bounds in uac_processing_unit_iProcessing include/uapi/linux/usb/audio.h:429 [inline] BUG: KASAN: slab-out-of-bounds in build_audio_procunit+0x1306/0x13f0 sound/usb/mixer.c:2436 Read of size 1 at addr ffff8881d537c7b7 by task kworker/0:2/101 CPU: 0 PID: 101 Comm: kworker/0:2 Not tainted 5.4.0-rc3+ #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Workqueue: usb_hub_wq hub_event Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0xca/0x13e lib/dump_stack.c:113 print_address_description.constprop.0+0x36/0x50 mm/kasan/report.c:374 __kasan_report.cold+0x1a/0x33 mm/kasan/report.c:506 kasan_report+0xe/0x20 mm/kasan/common.c:634 uac_processing_unit_iProcessing include/uapi/linux/usb/audio.h:429 [inline] build_audio_procunit+0x1306/0x13f0 sound/usb/mixer.c:2436 parse_audio_processing_unit sound/usb/mixer.c:2468 [inline] parse_audio_unit+0x17e9/0x36f0 sound/usb/mixer.c:2757 snd_usb_mixer_controls+0x715/0xb90 sound/usb/mixer.c:3095 snd_usb_create_mixer+0x2b5/0x1890 sound/usb/mixer.c:3445 usb_audio_probe+0xc76/0x2010 sound/usb/card.c:653 usb_probe_interface+0x305/0x7a0 drivers/usb/core/driver.c:361 really_probe+0x281/0x6d0 drivers/base/dd.c:548 driver_probe_device+0x104/0x210 drivers/base/dd.c:721 __device_attach_driver+0x1c2/0x220 drivers/base/dd.c:828 bus_for_each_drv+0x162/0x1e0 drivers/base/bus.c:430 __device_attach+0x217/0x360 drivers/base/dd.c:894 bus_probe_device+0x1e4/0x290 drivers/base/bus.c:490 device_add+0xae6/0x16f0 drivers/base/core.c:2201 usb_set_configuration+0xdf6/0x1670 drivers/usb/core/message.c:2023 generic_probe+0x9d/0xd5 drivers/usb/core/generic.c:210 usb_probe_device+0x99/0x100 drivers/usb/core/driver.c:266 really_probe+0x281/0x6d0 drivers/base/dd.c:548 driver_probe_device+0x104/0x210 drivers/base/dd.c:721 __device_attach_driver+0x1c2/0x220 drivers/base/dd.c:828 bus_for_each_drv+0x162/0x1e0 drivers/base/bus.c:430 __device_attach+0x217/0x360 drivers/base/dd.c:894 bus_probe_device+0x1e4/0x290 drivers/base/bus.c:490 device_add+0xae6/0x16f0 drivers/base/core.c:2201 usb_new_device.cold+0x6a4/0xe79 drivers/usb/core/hub.c:2536 hub_port_connect drivers/usb/core/hub.c:5183 [inline] hub_port_connect_change drivers/usb/core/hub.c:5323 [inline] port_event drivers/usb/core/hub.c:5469 [inline] hub_event+0x1dd0/0x37e0 drivers/usb/core/hub.c:5551 process_one_work+0x92b/0x1530 kernel/workqueue.c:2269 worker_thread+0x96/0xe20 kernel/workqueue.c:2415 kthread+0x318/0x420 kernel/kthread.c:255 ret_from_fork+0x24/0x30 arch/x86/entry/entry_64.S:352 Allocated by task 101: save_stack+0x1b/0x80 mm/kasan/common.c:69 set_track mm/kasan/common.c:77 [inline] __kasan_kmalloc mm/kasan/common.c:510 [inline] __kasan_kmalloc.constprop.0+0xbf/0xd0 mm/kasan/common.c:483 kmalloc include/linux/slab.h:561 [inline] usb_get_configuration+0x314/0x3050 drivers/usb/core/config.c:857 usb_enumerate_device drivers/usb/core/hub.c:2369 [inline] usb_new_device+0xd3/0x160 drivers/usb/core/hub.c:2505 hub_port_connect drivers/usb/core/hub.c:5183 [inline] hub_port_connect_change drivers/usb/core/hub.c:5323 [inline] port_event drivers/usb/core/hub.c:5469 [inline] hub_event+0x1dd0/0x37e0 drivers/usb/core/hub.c:5551 process_one_work+0x92b/0x1530 kernel/workqueue.c:2269 worker_thread+0x96/0xe20 kernel/workqueue.c:2415 kthread+0x318/0x420 kernel/kthread.c:255 ret_from_fork+0x24/0x30 arch/x86/entry/entry_64.S:352 Freed by task 17: save_stack+0x1b/0x80 mm/kasan/common.c:69 set_track mm/kasan/common.c:77 [inline] kasan_set_free_info mm/kasan/common.c:332 [inline] __kasan_slab_free+0x130/0x180 mm/kasan/common.c:471 slab_free_hook mm/slub.c:1424 [inline] slab_free_freelist_hook mm/slub.c:1475 [inline] slab_free mm/slub.c:3018 [inline] kfree+0xe4/0x320 mm/slub.c:3967 urb_destroy drivers/usb/core/urb.c:26 [inline] kref_put include/linux/kref.h:65 [inline] usb_free_urb.part.0+0x7a/0xc0 drivers/usb/core/urb.c:95 usb_free_urb+0x1b/0x30 drivers/usb/core/urb.c:94 usb_start_wait_urb+0x1e5/0x2b0 drivers/usb/core/message.c:79 usb_internal_control_msg drivers/usb/core/message.c:101 [inline] usb_control_msg+0x31c/0x4a0 drivers/usb/core/message.c:152 get_port_status drivers/usb/core/hub.c:569 [inline] hub_ext_port_status+0x125/0x460 drivers/usb/core/hub.c:586 hub_port_status drivers/usb/core/hub.c:608 [inline] hub_activate+0x497/0x1570 drivers/usb/core/hub.c:1111 process_one_work+0x92b/0x1530 kernel/workqueue.c:2269 worker_thread+0x96/0xe20 kernel/workqueue.c:2415 kthread+0x318/0x420 kernel/kthread.c:255 ret_from_fork+0x24/0x30 arch/x86/entry/entry_64.S:352 The buggy address belongs to the object at ffff8881d537c700 which belongs to the cache kmalloc-192 of size 192 The buggy address is located 183 bytes inside of 192-byte region [ffff8881d537c700, ffff8881d537c7c0) The buggy address belongs to the page: page:ffffea000754df00 refcount:1 mapcount:0 mapping:ffff8881da002a00 index:0x0 flags: 0x200000000000200(slab) raw: 0200000000000200 ffffea000754d680 0000000600000006 ffff8881da002a00 raw: 0000000000000000 0000000000100010 00000001ffffffff 0000000000000000 page dumped because: kasan: bad access detected Memory state around the buggy address: ffff8881d537c680: fb fb fb fb fb fb fb fb fc fc fc fc fc fc fc fc ffff8881d537c700: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 > ffff8881d537c780: 00 00 00 02 fc fc fc fc fc fc fc fc fc fc fc fc ^ ffff8881d537c800: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ffff8881d537c880: fb fb fb fb fb fb fb fb fc fc fc fc fc fc fc fc ================================================================== --- This bug is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syzkaller(a)googlegroups.com. syzbot will keep track of this bug report. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot. syzbot can test patches for this bug, for details see: https://goo.gl/tpsmEJ#testing-patches

3 3

[alsa-devel] [PATCH] ASoC: change 'HDMI/DP, pcm=' to 'HDMI/DP, pcm=' Jack control names
by Jaroslav Kysela 28 Oct '19

28 Oct '19

There is an inconsistency in the names for the HDMI/DP Jack control names between some ASoC drivers and the HDA HDMI driver which introduced this naming in 2011. There might be an impact for the user space (UCM). I will fix the UCM configurations when this patch is applied. Signed-off-by: Jaroslav Kysela <perex(a)perex.cz> Cc: Mark Brown <broonie(a)kernel.org> Cc: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- Documentation/sound/designs/control-names.rst | 5 +++-- sound/soc/intel/boards/bxt_da7219_max98357a.c | 2 +- sound/soc/intel/boards/bxt_rt298.c | 2 +- sound/soc/intel/boards/glk_rt5682_max98357a.c | 2 +- sound/soc/intel/boards/kbl_da7219_max98357a.c | 2 +- sound/soc/intel/boards/kbl_da7219_max98927.c | 2 +- sound/soc/intel/boards/kbl_rt5660.c | 2 +- sound/soc/intel/boards/kbl_rt5663_max98927.c | 2 +- sound/soc/intel/boards/skl_hda_dsp_common.c | 2 +- sound/soc/intel/boards/skl_nau88l25_max98357a.c | 2 +- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 2 +- sound/soc/intel/boards/skl_rt286.c | 2 +- sound/soc/intel/boards/sof_rt5682.c | 2 +- 13 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Documentation/sound/designs/control-names.rst b/Documentation/sound/designs/control-names.rst index 7fedd0f33cd9..a5f6e3842df8 100644 --- a/Documentation/sound/designs/control-names.rst +++ b/Documentation/sound/designs/control-names.rst @@ -50,7 +50,7 @@ Internal internal SOURCE ~~~~~~ -=================== ================================================= +=================== =================================================== Master Master Mono Hardware Master @@ -92,7 +92,8 @@ SPDIF output only SPDIF In Digital In HDMI/DP either HDMI or DisplayPort -=================== ================================================= +HDMI/DP,pcm=<num> either HDMI or DisplayPort with the PCM device link +=================== =================================================== Exceptions (deprecated) ----------------------- diff --git a/sound/soc/intel/boards/bxt_da7219_max98357a.c b/sound/soc/intel/boards/bxt_da7219_max98357a.c index ac1dea5f9d11..b49028c6fd10 100644 --- a/sound/soc/intel/boards/bxt_da7219_max98357a.c +++ b/sound/soc/intel/boards/bxt_da7219_max98357a.c @@ -618,7 +618,7 @@ static int bxt_card_late_probe(struct snd_soc_card *card) list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) { component = pcm->codec_dai->component; snprintf(jack_name, sizeof(jack_name), - "HDMI/DP, pcm=%d Jack", pcm->device); + "HDMI/DP,pcm=%d Jack", pcm->device); err = snd_soc_card_jack_new(card, jack_name, SND_JACK_AVOUT, &broxton_hdmi[i], NULL, 0); diff --git a/sound/soc/intel/boards/bxt_rt298.c b/sound/soc/intel/boards/bxt_rt298.c index adf416a49b48..caaf2f2af287 100644 --- a/sound/soc/intel/boards/bxt_rt298.c +++ b/sound/soc/intel/boards/bxt_rt298.c @@ -530,7 +530,7 @@ static int bxt_card_late_probe(struct snd_soc_card *card) list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) { component = pcm->codec_dai->component; snprintf(jack_name, sizeof(jack_name), - "HDMI/DP, pcm=%d Jack", pcm->device); + "HDMI/DP,pcm=%d Jack", pcm->device); err = snd_soc_card_jack_new(card, jack_name, SND_JACK_AVOUT, &broxton_hdmi[i], NULL, 0); diff --git a/sound/soc/intel/boards/glk_rt5682_max98357a.c b/sound/soc/intel/boards/glk_rt5682_max98357a.c index bd2d371f2acd..5474f28e0c31 100644 --- a/sound/soc/intel/boards/glk_rt5682_max98357a.c +++ b/sound/soc/intel/boards/glk_rt5682_max98357a.c @@ -548,7 +548,7 @@ static int glk_card_late_probe(struct snd_soc_card *card) list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) { component = pcm->codec_dai->component; snprintf(jack_name, sizeof(jack_name), - "HDMI/DP, pcm=%d Jack", pcm->device); + "HDMI/DP,pcm=%d Jack", pcm->device); err = snd_soc_card_jack_new(card, jack_name, SND_JACK_AVOUT, &geminilake_hdmi[i], NULL, 0); diff --git a/sound/soc/intel/boards/kbl_da7219_max98357a.c b/sound/soc/intel/boards/kbl_da7219_max98357a.c index 537a88932bb6..367415efed9b 100644 --- a/sound/soc/intel/boards/kbl_da7219_max98357a.c +++ b/sound/soc/intel/boards/kbl_da7219_max98357a.c @@ -548,7 +548,7 @@ static int kabylake_card_late_probe(struct snd_soc_card *card) list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) { component = pcm->codec_dai->component; snprintf(jack_name, sizeof(jack_name), - "HDMI/DP, pcm=%d Jack", pcm->device); + "HDMI/DP,pcm=%d Jack", pcm->device); err = snd_soc_card_jack_new(card, jack_name, SND_JACK_AVOUT, &skylake_hdmi[i], NULL, 0); diff --git a/sound/soc/intel/boards/kbl_da7219_max98927.c b/sound/soc/intel/boards/kbl_da7219_max98927.c index 829f95fc4179..b30c2148d1f4 100644 --- a/sound/soc/intel/boards/kbl_da7219_max98927.c +++ b/sound/soc/intel/boards/kbl_da7219_max98927.c @@ -977,7 +977,7 @@ static int kabylake_card_late_probe(struct snd_soc_card *card) list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) { component = pcm->codec_dai->component; snprintf(jack_name, sizeof(jack_name), - "HDMI/DP, pcm=%d Jack", pcm->device); + "HDMI/DP,pcm=%d Jack", pcm->device); err = snd_soc_card_jack_new(card, jack_name, SND_JACK_AVOUT, &kabylake_hdmi[i], NULL, 0); diff --git a/sound/soc/intel/boards/kbl_rt5660.c b/sound/soc/intel/boards/kbl_rt5660.c index 74fe1f3a5479..0965d1f02b2c 100644 --- a/sound/soc/intel/boards/kbl_rt5660.c +++ b/sound/soc/intel/boards/kbl_rt5660.c @@ -470,7 +470,7 @@ static int kabylake_card_late_probe(struct snd_soc_card *card) list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) { component = pcm->codec_dai->component; snprintf(jack_name, sizeof(jack_name), - "HDMI/DP, pcm=%d Jack", pcm->device); + "HDMI/DP,pcm=%d Jack", pcm->device); err = snd_soc_card_jack_new(card, jack_name, SND_JACK_AVOUT, &skylake_hdmi[i], NULL, 0); diff --git a/sound/soc/intel/boards/kbl_rt5663_max98927.c b/sound/soc/intel/boards/kbl_rt5663_max98927.c index 7cefda341fbf..9f420e978459 100644 --- a/sound/soc/intel/boards/kbl_rt5663_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_max98927.c @@ -888,7 +888,7 @@ static int kabylake_card_late_probe(struct snd_soc_card *card) list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) { component = pcm->codec_dai->component; snprintf(jack_name, sizeof(jack_name), - "HDMI/DP, pcm=%d Jack", pcm->device); + "HDMI/DP,pcm=%d Jack", pcm->device); err = snd_soc_card_jack_new(card, jack_name, SND_JACK_AVOUT, &skylake_hdmi[i], NULL, 0); diff --git a/sound/soc/intel/boards/skl_hda_dsp_common.c b/sound/soc/intel/boards/skl_hda_dsp_common.c index 58409b6e476e..f717b1d179bd 100644 --- a/sound/soc/intel/boards/skl_hda_dsp_common.c +++ b/sound/soc/intel/boards/skl_hda_dsp_common.c @@ -139,7 +139,7 @@ int skl_hda_hdmi_jack_init(struct snd_soc_card *card) list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) { component = pcm->codec_dai->component; snprintf(jack_name, sizeof(jack_name), - "HDMI/DP, pcm=%d Jack", pcm->device); + "HDMI/DP,pcm=%d Jack", pcm->device); err = snd_soc_card_jack_new(card, jack_name, SND_JACK_AVOUT, &pcm->hdmi_jack, NULL, 0); diff --git a/sound/soc/intel/boards/skl_nau88l25_max98357a.c b/sound/soc/intel/boards/skl_nau88l25_max98357a.c index 3ce8efbeed12..b009e2df25d3 100644 --- a/sound/soc/intel/boards/skl_nau88l25_max98357a.c +++ b/sound/soc/intel/boards/skl_nau88l25_max98357a.c @@ -607,7 +607,7 @@ static int skylake_card_late_probe(struct snd_soc_card *card) list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) { component = pcm->codec_dai->component; snprintf(jack_name, sizeof(jack_name), - "HDMI/DP, pcm=%d Jack", pcm->device); + "HDMI/DP,pcm=%d Jack", pcm->device); err = snd_soc_card_jack_new(card, jack_name, SND_JACK_AVOUT, &skylake_hdmi[i], diff --git a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c index 1a7ac8bdf543..0a6e650dc698 100644 --- a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c +++ b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c @@ -648,7 +648,7 @@ static int skylake_card_late_probe(struct snd_soc_card *card) list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) { component = pcm->codec_dai->component; snprintf(jack_name, sizeof(jack_name), - "HDMI/DP, pcm=%d Jack", pcm->device); + "HDMI/DP,pcm=%d Jack", pcm->device); err = snd_soc_card_jack_new(card, jack_name, SND_JACK_AVOUT, &skylake_hdmi[i], diff --git a/sound/soc/intel/boards/skl_rt286.c b/sound/soc/intel/boards/skl_rt286.c index 231349a47cc9..56ee4b55dce9 100644 --- a/sound/soc/intel/boards/skl_rt286.c +++ b/sound/soc/intel/boards/skl_rt286.c @@ -489,7 +489,7 @@ static int skylake_card_late_probe(struct snd_soc_card *card) list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) { component = pcm->codec_dai->component; snprintf(jack_name, sizeof(jack_name), - "HDMI/DP, pcm=%d Jack", pcm->device); + "HDMI/DP,pcm=%d Jack", pcm->device); err = snd_soc_card_jack_new(card, jack_name, SND_JACK_AVOUT, &skylake_hdmi[i], NULL, 0); diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c index 4f6e58c3954a..862a7e35cb5c 100644 --- a/sound/soc/intel/boards/sof_rt5682.c +++ b/sound/soc/intel/boards/sof_rt5682.c @@ -277,7 +277,7 @@ static int sof_card_late_probe(struct snd_soc_card *card) list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) { component = pcm->codec_dai->component; snprintf(jack_name, sizeof(jack_name), - "HDMI/DP, pcm=%d Jack", pcm->device); + "HDMI/DP,pcm=%d Jack", pcm->device); err = snd_soc_card_jack_new(card, jack_name, SND_JACK_AVOUT, &sof_hdmi[i], NULL, 0); -- 2.20.1

6 20

[alsa-devel] [PATCH] ALSA: hda: Allow non-Intel device probe gracefully
by Takashi Iwai 28 Oct '19

28 Oct '19

The recent addition of snd_intel_dsp_driver_probe() check caused a spurious kernel warning when the driver is loaded for a non-Intel hardware due to snd_BUG_ON(). Moreover, for such a hardware, we should always return SND_INTEL_DSP_DRIVER_ANY, not check the dsp_driver option at all. This patch fixes these issues for non-Intel devices. Fixes: 82d9d54a6c0e ("ALSA: hda: add Intel DSP configuration / probe code") Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/hda/intel-dsp-config.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c index 0b2a7201a46a..be1df80ed013 100644 --- a/sound/hda/intel-dsp-config.c +++ b/sound/hda/intel-dsp-config.c @@ -307,13 +307,13 @@ int snd_intel_dsp_driver_probe(struct pci_dev *pci) { const struct config_entry *cfg; - if (dsp_driver > 0 && dsp_driver <= SND_INTEL_DSP_DRIVER_LAST) - return dsp_driver; - /* Intel vendor only */ - if (snd_BUG_ON(pci->vendor != 0x8086)) + if (pci->vendor != 0x8086) return SND_INTEL_DSP_DRIVER_ANY; + if (dsp_driver > 0 && dsp_driver <= SND_INTEL_DSP_DRIVER_LAST) + return dsp_driver; + /* * detect DSP by checking class/subclass/prog-id information * class=04 subclass 03 prog-if 00: no DSP, use legacy driver -- 2.16.4

1 0

[alsa-devel] Questions about max98090 codec driver
by Tzung-Bi Shih 28 Oct '19

28 Oct '19

Hi, I am studying an odd issue of max98090 codec on Baytrail-based chromebook. The issue is: when user playback and capture simultaneously, it seems the PLL never get locked if msleep(10) between the SHDN off and on (https://elixir.bootlin.com/linux/v5.4-rc2/source/sound/soc/codecs/max98090.…). The playback stream becomes silent and the console keeps printing "PLL unlocked". But, if comment out the msleep(10) between the SHDN off and on, the issue fixed. I am trying to find the reason but facing further more questions and may need your inputs. 1. The commit b8a3ee820f7b ("ASoC: max98090: Add recovery for PLL lock failure") enables ULK interrupts (https://elixir.bootlin.com/linux/v5.4-rc2/source/sound/soc/codecs/max98090.…) when PCM stream starting. If max98090 claims its PLL is unlocked, max98090_pll_work() get scheduled to workaround it by SHDN off and on (https://elixir.bootlin.com/linux/v5.4-rc2/source/sound/soc/codecs/max98090.…). I feel it is weird to sleep in max98090_pll_work(). Especially, at this line https://elixir.bootlin.com/linux/v5.4-rc2/source/sound/soc/codecs/max98090.… (it makes less sense to "wait" in another thread). Note that, the threaded IRQF_ONESHOT handler and max98090_pll_work() are in 2 different threads. I guess the original intention is: - disable ULK interrupt in IRQ handler (https://elixir.bootlin.com/linux/v5.4-rc2/source/sound/soc/codecs/max98090.…) - schedule max98090_pll_work() to workaround it - wait 10ms to give PLL chance to lock - enable ULK interrupt again If max98090 claims its PLL is unlocked again, repeat the above by receiving another ULK interrupt. Unfortunately, the odd issue seems not be fixed by my rough implementation of these. 2. According to the datasheet page 164 table 90 (https://datasheets.maximintegrated.com/en/ds/MAX98090.pdf), there are some registers should only be adjusted when SHDN==0. But I fail to find max98090.c tries to set SHDN to 0 and restore it afterwards when writing to these registers. For example, https://elixir.bootlin.com/linux/v5.4-rc2/source/sound/soc/codecs/max98090.…. I am wondering if it would bring any side effects because the datasheet states "Changing these settings during normal operation (SHDN=1) can compromise device stability and performance specifications." 3. By searching some history data, I found a previous version did not have the msleep(10) between the SHDN off and on (https://crrev.com/c/191740, click the file name in the middle of the window to see the diff. Pardon me, I do not find another public repository for this). I am curious if anyone of you still remember why the upstream version contains the msleep(10). I am also curious if anyone of your environment works well with the upstream version max98090.c.

4 5

Re: [alsa-devel] [PATCH V2] ASoC: fsl_esai: Add spin lock to protect reset, stop and start
by S.j. Wang 28 Oct '19

28 Oct '19

Hi > > On Fri, Oct 25, 2019 at 03:13:53PM +0800, Shengjiu Wang wrote: > > xrun may happen at the end of stream, the > > trigger->fsl_esai_trigger_stop maybe called in the middle of > > fsl_esai_hw_reset, this may cause esai in wrong state after stop, and > > there may be endless xrun interrupt. > > > > This issue may also happen with trigger->fsl_esai_trigger_start. > > > > So Add spin lock to lock those functions. > > > > Fixes: 7ccafa2b3879 ("ASoC: fsl_esai: recover the channel swap after > > xrun") > > Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> > > Some small comments inline. Once they are addressed, please add: > > Acked-by: Nicolin Chen <nicoleotsuka(a)gmail.com> > > Thanks > > > --- > > Change in v2 > > -add lock for fsl_esai_trigger_start. > > > > sound/soc/fsl/fsl_esai.c | 12 ++++++++++++ > > 1 file changed, 12 insertions(+) > > > > diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c index > > 37b14c48b537..9b28e2af26e4 100644 > > --- a/sound/soc/fsl/fsl_esai.c > > +++ b/sound/soc/fsl/fsl_esai.c > > @@ -33,6 +33,7 @@ > > * @fsysclk: system clock source to derive HCK, SCK and FS > > * @spbaclk: SPBA clock (optional, depending on SoC design) > > * @task: tasklet to handle the reset operation > > + * @lock: spin lock to handle reset and stop behavior > > Should be "between hw_reset() and trigger()" now. > > > * @fifo_depth: depth of tx/rx FIFO > > * @slot_width: width of each DAI slot > > * @slots: number of slots > > @@ -56,6 +57,7 @@ struct fsl_esai { > > struct clk *fsysclk; > > struct clk *spbaclk; > > struct tasklet_struct task; > > + spinlock_t lock; /* Protect reset and stop */ > > We can drop the comments here since you add it to the top. Here is required by the checkpatch.pl, so still is needed. Best regards Wang shengjiu

1 0

[alsa-devel] [PATCH] ALSA: pci: Fix memory leak in snd_ali_create
by Navid Emamdoost 28 Oct '19

28 Oct '19

In the implementation of snd_ali_create() the memory allocated for codec is leaked in case of an error. Release codec if snd_ali_chip_init() fails. Fixes: f9ab2b1c3ab5 ("[ALSA] ali5451 - Code clean up, irq handler fix") Signed-off-by: Navid Emamdoost <navid.emamdoost(a)gmail.com> --- sound/pci/ali5451/ali5451.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c index 6e28e381c21a..3ed07a18be4d 100644 --- a/sound/pci/ali5451/ali5451.c +++ b/sound/pci/ali5451/ali5451.c @@ -2179,6 +2179,7 @@ static int snd_ali_create(struct snd_card *card, err = snd_ali_chip_init(codec); if (err < 0) { dev_err(card->dev, "ali create: chip init error.\n"); + snd_ali_free(codec); return err; } -- 2.17.1

2 1

[alsa-devel] [PATCH] ALSA: lx6464es: Fix memory leaks in snd_lx6464es_create
by Navid Emamdoost 28 Oct '19

28 Oct '19

In the implementation of snd_lx6464es_create() it there are memory leaks when error happens. Go to error path if any of these calls fail: lx_init_dsp(), lx_pcm_create(), lx_proc_create(), snd_ctl_add(). Fixes: 02bec4904508 ("ALSA: lx6464es - driver for the digigram lx6464es interface") Signed-off-by: Navid Emamdoost <navid.emamdoost(a)gmail.com> --- sound/pci/lx6464es/lx6464es.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sound/pci/lx6464es/lx6464es.c b/sound/pci/lx6464es/lx6464es.c index fe10714380f2..7c6e8f4ef826 100644 --- a/sound/pci/lx6464es/lx6464es.c +++ b/sound/pci/lx6464es/lx6464es.c @@ -1020,25 +1020,26 @@ static int snd_lx6464es_create(struct snd_card *card, err = lx_init_dsp(chip); if (err < 0) { dev_err(card->dev, "error during DSP initialization\n"); - return err; + goto cleanup; } err = lx_pcm_create(chip); if (err < 0) - return err; + goto cleanup; err = lx_proc_create(card, chip); if (err < 0) - return err; + goto cleanup; err = snd_ctl_add(card, snd_ctl_new1(&lx_control_playback_switch, chip)); if (err < 0) - return err; + goto cleanup; *rchip = chip; return 0; +cleanup: device_new_failed: free_irq(pci->irq, chip); -- 2.17.1

3 2