September 2022 - Alsa-devel - mailman.alsa-project.org

[PATCH] ASoC: SOF: ipc4-topology: Free the ida when IPC fails in sof_ipc4_widget_setup()
by Peter Ujfalusi 21 Sep '22

21 Sep '22

The allocated ida needs to be freed up if the IPC message fails since next time when we try again to set up the widget we are going to try to allocate another ID and given enough tries, we are going to run out of unique IDs. Fixes: 711d0427c713 ("ASoC: SOF: ipc4-topology: move ida allocate/free to widget_setup/free") Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/sof/ipc4-topology.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sound/soc/sof/ipc4-topology.c b/sound/soc/sof/ipc4-topology.c index 64929dc9af39..340d92452d7c 100644 --- a/sound/soc/sof/ipc4-topology.c +++ b/sound/soc/sof/ipc4-topology.c @@ -1544,9 +1544,16 @@ static int sof_ipc4_widget_setup(struct snd_sof_dev *sdev, struct snd_sof_widget msg->data_ptr = ipc_data; ret = sof_ipc_tx_message(sdev->ipc, msg, ipc_size, NULL, 0); - if (ret < 0) + if (ret < 0) { dev_err(sdev->dev, "failed to create module %s\n", swidget->widget->name); + if (swidget->id != snd_soc_dapm_scheduler) { + struct sof_ipc4_fw_module *fw_module = swidget->module_info; + + ida_free(&fw_module->m_ida, swidget->instance_id); + } + } + return ret; } -- 2.37.3

2 1

[PATCH v4 0/3] ASoC: ts3a227e control debounce times
by Astrid Rost 21 Sep '22

21 Sep '22

From: Astrid Rost <astridr(a)axis.com> PATCH 1 - convert ts3a227e bindings to yaml. PATCH 2 - add ts3a227e bindings to support debounce times. PATCH 3 - add ts3a227e driver to support debounce times. v3 -> v4 Removed the comments on enums in Patch2. Signed-off-by: Astrid Rost <astrid.rost(a)axis.com> Astrid Rost (3): dt-bindings: sound: ti,ts3a227e: convert to yaml dt-bindings: sound: ti,ts3a227e: add control of debounce ASoC: ts3a227e: add parameters to control debounce times .../bindings/sound/ti,ts3a227e.yaml | 94 +++++++++++++++++++ .../devicetree/bindings/sound/ts3a227e.txt | 30 ------ sound/soc/codecs/ts3a227e.c | 61 ++++++++++-- 3 files changed, 149 insertions(+), 36 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/ti,ts3a227e.yaml delete mode 100644 Documentation/devicetree/bindings/sound/ts3a227e.txt -- 2.20.1

3 7

possible deadlock in snd_rawmidi_free
by Rondreis 21 Sep '22

21 Sep '22

Hello, When fuzzing the Linux kernel driver v6.0-rc4, the following crash was triggered. HEAD commit: 7e18e42e4b280c85b76967a9106a13ca61c16179 git tree: upstream kernel config: https://pastebin.com/raw/xtrgsXP3 console output: https://pastebin.com/raw/9tabWDtu Sorry for failing to extract the reproducer, and the crash occurred at the moment of disconnecting the midi device. On other versions of Linux, I also triggered this crash. I would appreciate it if you have any idea how to solve this bug. The crash report is as follows: ====================================================== WARNING: possible circular locking dependency detected 6.0.0-rc4+ #20 Not tainted ------------------------------------------------------ kworker/1:7/10868 is trying to acquire lock: ffffffff8e289108 (register_mutex#5){+.+.}-{3:3}, at: snd_rawmidi_free+0x7a/0x190 sound/core/rawmidi.c:1902 but task is already holding lock: ffffffff8e274048 (sound_oss_mutex){+.+.}-{3:3}, at: snd_unregister_oss_device+0x97/0x290 sound/core/sound_oss.c:159 which lock already depends on the new lock. the existing dependency chain (in reverse order) is: -> #2 (sound_oss_mutex){+.+.}-{3:3}: lock_acquire kernel/locking/lockdep.c:5666 [inline] lock_acquire+0x1ab/0x580 kernel/locking/lockdep.c:5631 __mutex_lock_common kernel/locking/mutex.c:603 [inline] __mutex_lock+0x14f/0x1f50 kernel/locking/mutex.c:747 snd_unregister_oss_device+0x97/0x290 sound/core/sound_oss.c:159 snd_rawmidi_dev_disconnect+0x418/0x650 sound/core/rawmidi.c:2043 __snd_device_disconnect.part.0+0x5b/0xc0 sound/core/device.c:63 __snd_device_disconnect sound/core/device.c:61 [inline] snd_device_disconnect_all+0x9b/0xf0 sound/core/device.c:215 snd_card_disconnect+0x306/0x740 sound/core/init.c:530 snd_card_free_when_closed+0x13/0x50 sound/core/init.c:622 f_midi_unbind+0x60/0x120 drivers/usb/gadget/function/f_midi.c:1335 purge_configs_funcs+0x281/0x4e0 drivers/usb/gadget/configfs.c:1274 configfs_composite_bind+0xbd3/0x11c0 drivers/usb/gadget/configfs.c:1426 gadget_bind_driver+0x285/0x860 drivers/usb/gadget/udc/core.c:1495 call_driver_probe drivers/base/dd.c:560 [inline] really_probe+0x249/0xa90 drivers/base/dd.c:639 __driver_probe_device+0x1df/0x4d0 drivers/base/dd.c:778 driver_probe_device+0x4c/0x1a0 drivers/base/dd.c:808 __driver_attach+0x1e6/0x420 drivers/base/dd.c:1190 bus_for_each_dev+0x147/0x1d0 drivers/base/bus.c:301 bus_add_driver+0x4c9/0x640 drivers/base/bus.c:618 driver_register+0x1c4/0x330 drivers/base/driver.c:240 usb_gadget_register_driver_owner+0xfb/0x1e0 drivers/usb/gadget/udc/core.c:1560 gadget_dev_desc_UDC_store+0x184/0x220 drivers/usb/gadget/configfs.c:299 flush_write_buffer fs/configfs/file.c:207 [inline] configfs_write_iter+0x2ea/0x480 fs/configfs/file.c:229 call_write_iter include/linux/fs.h:2187 [inline] new_sync_write fs/read_write.c:491 [inline] vfs_write+0x9ca/0xd90 fs/read_write.c:578 ksys_write+0x127/0x250 fs/read_write.c:631 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0x80 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd -> #1 (&rmidi->open_mutex){+.+.}-{3:3}: lock_acquire kernel/locking/lockdep.c:5666 [inline] lock_acquire+0x1ab/0x580 kernel/locking/lockdep.c:5631 __mutex_lock_common kernel/locking/mutex.c:603 [inline] __mutex_lock+0x14f/0x1f50 kernel/locking/mutex.c:747 snd_rawmidi_dev_disconnect+0x60/0x650 sound/core/rawmidi.c:2028 __snd_device_disconnect.part.0+0x5b/0xc0 sound/core/device.c:63 __snd_device_disconnect sound/core/device.c:61 [inline] snd_device_disconnect_all+0x9b/0xf0 sound/core/device.c:215 snd_card_disconnect+0x306/0x740 sound/core/init.c:530 snd_card_free_when_closed+0x13/0x50 sound/core/init.c:622 f_midi_unbind+0x60/0x120 drivers/usb/gadget/function/f_midi.c:1335 purge_configs_funcs+0x281/0x4e0 drivers/usb/gadget/configfs.c:1274 configfs_composite_bind+0xbd3/0x11c0 drivers/usb/gadget/configfs.c:1426 gadget_bind_driver+0x285/0x860 drivers/usb/gadget/udc/core.c:1495 call_driver_probe drivers/base/dd.c:560 [inline] really_probe+0x249/0xa90 drivers/base/dd.c:639 __driver_probe_device+0x1df/0x4d0 drivers/base/dd.c:778 driver_probe_device+0x4c/0x1a0 drivers/base/dd.c:808 __driver_attach+0x1e6/0x420 drivers/base/dd.c:1190 bus_for_each_dev+0x147/0x1d0 drivers/base/bus.c:301 bus_add_driver+0x4c9/0x640 drivers/base/bus.c:618 driver_register+0x1c4/0x330 drivers/base/driver.c:240 usb_gadget_register_driver_owner+0xfb/0x1e0 drivers/usb/gadget/udc/core.c:1560 gadget_dev_desc_UDC_store+0x184/0x220 drivers/usb/gadget/configfs.c:299 flush_write_buffer fs/configfs/file.c:207 [inline] configfs_write_iter+0x2ea/0x480 fs/configfs/file.c:229 call_write_iter include/linux/fs.h:2187 [inline] new_sync_write fs/read_write.c:491 [inline] vfs_write+0x9ca/0xd90 fs/read_write.c:578 ksys_write+0x127/0x250 fs/read_write.c:631 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0x80 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd -> #0 (register_mutex#5){+.+.}-{3:3}: check_prev_add+0x165/0x2520 kernel/locking/lockdep.c:3095 check_prevs_add kernel/locking/lockdep.c:3214 [inline] validate_chain kernel/locking/lockdep.c:3829 [inline] __lock_acquire+0x2df7/0x5830 kernel/locking/lockdep.c:5053 lock_acquire kernel/locking/lockdep.c:5666 [inline] lock_acquire+0x1ab/0x580 kernel/locking/lockdep.c:5631 __mutex_lock_common kernel/locking/mutex.c:603 [inline] __mutex_lock+0x14f/0x1f50 kernel/locking/mutex.c:747 snd_rawmidi_free+0x7a/0x190 sound/core/rawmidi.c:1902 __snd_device_free+0x19f/0x230 sound/core/device.c:76 snd_device_free_all+0xef/0x210 sound/core/device.c:233 snd_card_do_free sound/core/init.c:591 [inline] release_card_device+0x70/0x200 sound/core/init.c:145 device_release+0x9f/0x240 drivers/base/core.c:2330 kobject_cleanup lib/kobject.c:673 [inline] kobject_release lib/kobject.c:704 [inline] kref_put include/linux/kref.h:65 [inline] kobject_put+0x1be/0x4c0 lib/kobject.c:721 put_device+0x1b/0x30 drivers/base/core.c:3624 klist_next+0x254/0x4a0 lib/klist.c:404 class_dev_iter_next+0x83/0xc0 drivers/base/class.c:311 class_find_device+0x144/0x220 drivers/base/class.c:415 class_find_device_by_devt include/linux/device/class.h:167 [inline] device_destroy+0x79/0xd0 drivers/base/core.c:4299 sound_remove_unit+0x13f/0x1f0 sound/sound_core.c:305 snd_unregister_oss_device+0xe8/0x290 sound/core/sound_oss.c:165 snd_mixer_oss_notify_handler+0x282/0x360 sound/core/oss/mixer_oss.c:1417 snd_card_disconnect+0x2f9/0x740 sound/core/init.c:526 usb_audio_disconnect+0x335/0x800 sound/usb/card.c:930 usb_unbind_interface+0x1bd/0x890 drivers/usb/core/driver.c:458 device_remove drivers/base/dd.c:550 [inline] device_remove+0x11f/0x170 drivers/base/dd.c:542 __device_release_driver drivers/base/dd.c:1249 [inline] device_release_driver_internal+0x1a7/0x360 drivers/base/dd.c:1275 bus_remove_device+0x2e3/0x590 drivers/base/bus.c:529 device_del+0x5d2/0xe80 drivers/base/core.c:3704 usb_disable_device+0x214/0x600 drivers/usb/core/message.c:1419 usb_disconnect+0x285/0x860 drivers/usb/core/hub.c:2235 hub_port_connect drivers/usb/core/hub.c:5197 [inline] hub_port_connect_change drivers/usb/core/hub.c:5497 [inline] port_event drivers/usb/core/hub.c:5653 [inline] hub_event+0x1c1b/0x4260 drivers/usb/core/hub.c:5735 process_one_work+0x9c7/0x1650 kernel/workqueue.c:2289 worker_thread+0x623/0x1070 kernel/workqueue.c:2436 kthread+0x2e9/0x3a0 kernel/kthread.c:376 ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:306 other info that might help us debug this: Chain exists of: register_mutex#5 --> &rmidi->open_mutex --> sound_oss_mutex Possible unsafe locking scenario: CPU0 CPU1 ---- ---- lock(sound_oss_mutex); lock(&rmidi->open_mutex); lock(sound_oss_mutex); lock(register_mutex#5); *** DEADLOCK *** 7 locks held by kworker/1:7/10868: #0: ffff88801452b938 ((wq_completion)usb_hub_wq){+.+.}-{0:0}, at: arch_atomic64_set arch/x86/include/asm/atomic64_64.h:34 [inline] #0: ffff88801452b938 ((wq_completion)usb_hub_wq){+.+.}-{0:0}, at: arch_atomic_long_set include/linux/atomic/atomic-long.h:41 [inline] #0: ffff88801452b938 ((wq_completion)usb_hub_wq){+.+.}-{0:0}, at: atomic_long_set include/linux/atomic/atomic-instrumented.h:1280 [inline] #0: ffff88801452b938 ((wq_completion)usb_hub_wq){+.+.}-{0:0}, at: set_work_data kernel/workqueue.c:636 [inline] #0: ffff88801452b938 ((wq_completion)usb_hub_wq){+.+.}-{0:0}, at: set_work_pool_and_clear_pending kernel/workqueue.c:663 [inline] #0: ffff88801452b938 ((wq_completion)usb_hub_wq){+.+.}-{0:0}, at: process_one_work+0x8b0/0x1650 kernel/workqueue.c:2260 #1: ffffc90018367db0 ((work_completion)(&hub->events)){+.+.}-{0:0}, at: process_one_work+0x8e4/0x1650 kernel/workqueue.c:2264 #2: ffff8880164d2190 (&dev->mutex){....}-{3:3}, at: device_lock include/linux/device.h:835 [inline] #2: ffff8880164d2190 (&dev->mutex){....}-{3:3}, at: hub_event+0x1bc/0x4260 drivers/usb/core/hub.c:5681 #3: ffff888047497190 (&dev->mutex){....}-{3:3}, at: device_lock include/linux/device.h:835 [inline] #3: ffff888047497190 (&dev->mutex){....}-{3:3}, at: usb_disconnect+0x95/0x860 drivers/usb/core/hub.c:2226 #4: ffff888047493118 (&dev->mutex){....}-{3:3}, at: device_release_driver_internal+0x23/0x360 drivers/base/dd.c:1272 #5: ffffffff8e2e7f68 (register_mutex#7){+.+.}-{3:3}, at: usb_audio_disconnect+0xe3/0x800 sound/usb/card.c:919 #6: ffffffff8e274048 (sound_oss_mutex){+.+.}-{3:3}, at: snd_unregister_oss_device+0x97/0x290 sound/core/sound_oss.c:159 stack backtrace: CPU: 1 PID: 10868 Comm: kworker/1:7 Not tainted 6.0.0-rc4+ #20 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.13.0-1ubuntu1.1 04/01/2014 Workqueue: usb_hub_wq hub_event Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0xcd/0x134 lib/dump_stack.c:106 check_noncircular+0x26b/0x310 kernel/locking/lockdep.c:2175 check_prev_add+0x165/0x2520 kernel/locking/lockdep.c:3095 check_prevs_add kernel/locking/lockdep.c:3214 [inline] validate_chain kernel/locking/lockdep.c:3829 [inline] __lock_acquire+0x2df7/0x5830 kernel/locking/lockdep.c:5053 lock_acquire kernel/locking/lockdep.c:5666 [inline] lock_acquire+0x1ab/0x580 kernel/locking/lockdep.c:5631 __mutex_lock_common kernel/locking/mutex.c:603 [inline] __mutex_lock+0x14f/0x1f50 kernel/locking/mutex.c:747 snd_rawmidi_free+0x7a/0x190 sound/core/rawmidi.c:1902 __snd_device_free+0x19f/0x230 sound/core/device.c:76 snd_device_free_all+0xef/0x210 sound/core/device.c:233 snd_card_do_free sound/core/init.c:591 [inline] release_card_device+0x70/0x200 sound/core/init.c:145 device_release+0x9f/0x240 drivers/base/core.c:2330 kobject_cleanup lib/kobject.c:673 [inline] kobject_release lib/kobject.c:704 [inline] kref_put include/linux/kref.h:65 [inline] kobject_put+0x1be/0x4c0 lib/kobject.c:721 put_device+0x1b/0x30 drivers/base/core.c:3624 klist_next+0x254/0x4a0 lib/klist.c:404 class_dev_iter_next+0x83/0xc0 drivers/base/class.c:311 class_find_device+0x144/0x220 drivers/base/class.c:415 class_find_device_by_devt include/linux/device/class.h:167 [inline] device_destroy+0x79/0xd0 drivers/base/core.c:4299 sound_remove_unit+0x13f/0x1f0 sound/sound_core.c:305 snd_unregister_oss_device+0xe8/0x290 sound/core/sound_oss.c:165 snd_mixer_oss_notify_handler+0x282/0x360 sound/core/oss/mixer_oss.c:1417 snd_card_disconnect+0x2f9/0x740 sound/core/init.c:526 usb_audio_disconnect+0x335/0x800 sound/usb/card.c:930 usb_unbind_interface+0x1bd/0x890 drivers/usb/core/driver.c:458 device_remove drivers/base/dd.c:550 [inline] device_remove+0x11f/0x170 drivers/base/dd.c:542 __device_release_driver drivers/base/dd.c:1249 [inline] device_release_driver_internal+0x1a7/0x360 drivers/base/dd.c:1275 bus_remove_device+0x2e3/0x590 drivers/base/bus.c:529 device_del+0x5d2/0xe80 drivers/base/core.c:3704 usb_disable_device+0x214/0x600 drivers/usb/core/message.c:1419 usb_disconnect+0x285/0x860 drivers/usb/core/hub.c:2235 hub_port_connect drivers/usb/core/hub.c:5197 [inline] hub_port_connect_change drivers/usb/core/hub.c:5497 [inline] port_event drivers/usb/core/hub.c:5653 [inline] hub_event+0x1c1b/0x4260 drivers/usb/core/hub.c:5735 process_one_work+0x9c7/0x1650 kernel/workqueue.c:2289 worker_thread+0x623/0x1070 kernel/workqueue.c:2436 kthread+0x2e9/0x3a0 kernel/kthread.c:376 ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:306 </TASK>

2 3

[PATCH -next] sound: sunxi: fix declaration compile error
by Zeng Heng 21 Sep '22

21 Sep '22

Just fix compile error without any logic changes. sound/soc/sunxi/sun50i-dmic.c:62:1: error: ‘static’ is not at beginning of declaration [-Werror=old-style-declaration] 62 | const static struct dmic_rate dmic_rate_s[] = { | ^~~~~ Signed-off-by: Zeng Heng <zengheng4(a)huawei.com> --- sound/soc/sunxi/sun50i-dmic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sunxi/sun50i-dmic.c b/sound/soc/sunxi/sun50i-dmic.c index cd3c07f2070f..86cff5a5b1bd 100644 --- a/sound/soc/sunxi/sun50i-dmic.c +++ b/sound/soc/sunxi/sun50i-dmic.c @@ -59,7 +59,7 @@ struct dmic_rate { unsigned int rate_bit; }; -const static struct dmic_rate dmic_rate_s[] = { +static const struct dmic_rate dmic_rate_s[] = { {48000, 0x0}, {44100, 0x0}, {32000, 0x1}, -- 2.25.1

2 2

[PATCH] ALSA: hda/hdmi: ELD procfs - print the codec NIDs
by Jaroslav Kysela 21 Sep '22

21 Sep '22

It is useful for the debugging to print also the used HDA codec NIDs used for the given HDMI device. With the dynamic converter assignment the converter NID is changed dynamically. Signed-off-by: Jaroslav Kysela <perex(a)perex.cz> --- sound/pci/hda/hda_eld.c | 6 +++++- sound/pci/hda/hda_local.h | 3 ++- sound/pci/hda/patch_hdmi.c | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sound/pci/hda/hda_eld.c b/sound/pci/hda/hda_eld.c index 9e97443795f8..1d108ed5c6f2 100644 --- a/sound/pci/hda/hda_eld.c +++ b/sound/pci/hda/hda_eld.c @@ -440,7 +440,8 @@ static void hdmi_print_sad_info(int i, struct cea_sad *a, } void snd_hdmi_print_eld_info(struct hdmi_eld *eld, - struct snd_info_buffer *buffer) + struct snd_info_buffer *buffer, + hda_nid_t pin_nid, int dev_id, hda_nid_t cvt_nid) { struct parsed_hdmi_eld *e = &eld->info; char buf[SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE]; @@ -462,6 +463,9 @@ void snd_hdmi_print_eld_info(struct hdmi_eld *eld, snd_iprintf(buffer, "monitor_present\t\t%d\n", eld->monitor_present); snd_iprintf(buffer, "eld_valid\t\t%d\n", eld->eld_valid); + snd_iprintf(buffer, "codec_pin_nid\t\t0x%x\n", pin_nid); + snd_iprintf(buffer, "codec_dev_id\t\t0x%x\n", dev_id); + snd_iprintf(buffer, "codec_cvt_nid\t\t0x%x\n", cvt_nid); if (!eld->eld_valid) return; snd_iprintf(buffer, "monitor_name\t\t%s\n", e->monitor_name); diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h index 682dca2057db..53a5a62b78fa 100644 --- a/sound/pci/hda/hda_local.h +++ b/sound/pci/hda/hda_local.h @@ -712,7 +712,8 @@ int snd_hdmi_get_eld_ati(struct hda_codec *codec, hda_nid_t nid, #ifdef CONFIG_SND_PROC_FS void snd_hdmi_print_eld_info(struct hdmi_eld *eld, - struct snd_info_buffer *buffer); + struct snd_info_buffer *buffer, + hda_nid_t pin_nid, int dev_id, hda_nid_t cvt_nid); void snd_hdmi_write_eld_info(struct hdmi_eld *eld, struct snd_info_buffer *buffer); #endif diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index e20e0ed759f6..f27a4ee810e3 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -494,7 +494,8 @@ static void print_eld_info(struct snd_info_entry *entry, struct hdmi_spec_per_pin *per_pin = entry->private_data; mutex_lock(&per_pin->lock); - snd_hdmi_print_eld_info(&per_pin->sink_eld, buffer); + snd_hdmi_print_eld_info(&per_pin->sink_eld, buffer, per_pin->pin_nid, + per_pin->dev_id, per_pin->cvt_nid); mutex_unlock(&per_pin->lock); } -- 2.35.3

2 1

[PATCH] ALSA: hda/hdmi: Simplify the pcm_idx condition in hdmi_pcm_setup_pin()
by Jaroslav Kysela 21 Sep '22

21 Sep '22

Make the code more readable. Signed-off-by: Jaroslav Kysela <perex(a)perex.cz> --- sound/pci/hda/patch_hdmi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index dc36af2928b7..e20e0ed759f6 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1461,10 +1461,9 @@ static void hdmi_pcm_setup_pin(struct hdmi_spec *spec, int mux_idx; bool non_pcm; - if (per_pin->pcm_idx >= 0 && per_pin->pcm_idx < spec->pcm_used) - pcm = get_pcm_rec(spec, per_pin->pcm_idx); - else + if (per_pin->pcm_idx < 0 || per_pin->pcm_idx >= spec->pcm_used) return; + pcm = get_pcm_rec(spec, per_pin->pcm_idx); if (!pcm->pcm) return; if (!test_bit(per_pin->pcm_idx, &spec->pcm_in_use)) -- 2.35.3

2 1

[PATCH v3 0/2] Add some models into acp6x quirk list
by Mario Limonciello 21 Sep '22

21 Sep '22

Another model from ASUS and Lenovo have been identified that don't include anything in ACPI tables to indicate they require the ACP6x DMIC driver to be loaded. This series adds them both to the quirk list. changes from v1->v2: * Both models were independently sent in v1 but touch the same code, so v2 collates them together. v2->v3: * Add my missing S-o-B for 1/2 Mario Limonciello (1): ASoC: amd: yc: Add Lenovo Yoga Slim 7 Pro X to quirks table Xiaoyan Li (1): ASoC: amd: yc: Add ASUS UM5302TA into DMI table sound/soc/amd/yc/acp6x-mach.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) -- 2.34.1

2 3

[PATCH v2 0/2] Add some models into acp6x quirk list
by Mario Limonciello 21 Sep '22

21 Sep '22

Another model from ASUS and Lenovo have been identified that don't include anything in ACPI tables to indicate they require the ACP6x DMIC driver to be loaded. This series adds them both to the quirk list. changes from v1->v2: * Both models were independently sent in v1 but touch the same code, so v2 collates them together. Mario Limonciello (1): ASoC: amd: yc: Add Lenovo Yoga Slim 7 Pro X to quirks table Xiaoyan Li (1): ASoC: amd: yc: Add ASUS UM5302TA into DMI table sound/soc/amd/yc/acp6x-mach.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) -- 2.34.1

2 4

[PATCH -next] ASoC: rt5682s: simplify the return of rt5682s_probe()
by Yang Yingliang 21 Sep '22

21 Sep '22

After commit bfc5e8b860ad ("ASoC: rt5682s: Reduce coupling of Micbias and Vref2 settings"), the return of rt5682s_probe() can be simplified. No functional changed. Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- sound/soc/codecs/rt5682s.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sound/soc/codecs/rt5682s.c b/sound/soc/codecs/rt5682s.c index 9d7a70753c6f..466a37f3500c 100644 --- a/sound/soc/codecs/rt5682s.c +++ b/sound/soc/codecs/rt5682s.c @@ -2864,15 +2864,10 @@ static inline int rt5682s_dai_probe_clks(struct snd_soc_component *component) static int rt5682s_probe(struct snd_soc_component *component) { struct rt5682s_priv *rt5682s = snd_soc_component_get_drvdata(component); - int ret; rt5682s->component = component; - ret = rt5682s_dai_probe_clks(component); - if (ret) - return ret; - - return 0; + return rt5682s_dai_probe_clks(component); } static void rt5682s_remove(struct snd_soc_component *component) -- 2.25.1

2 1

[PATCH] ASoC: amd: yc: Add Lenovo Yoga Slim 7 Pro X to quirks table
by Mario Limonciello 21 Sep '22

21 Sep '22

Lenovo Yoga Slim 7 Pro X has an ACP DMIC that isn't specified in the ASL or existing quirk list. Add it to the quirk table to let DMIC work on these systems. Link: https://bugzilla.kernel.org/show_bug.cgi?id=216299 Tested-by: Sebastian S <iam(a)decentr.al> Reporetd-and-tested-by: Travis Glenn Hansen <travisghansen(a)yahoo.com> Signed-off-by: Mario Limonciello <mario.limonciello(a)amd.com> --- This patch applies on top of the other patch introducing a quirk: https://lore.kernel.org/alsa-devel/20220917070847.14346-1-lxy.lixiaoyan@gma… If either of them need to change, we should roll both into a series. sound/soc/amd/yc/acp6x-mach.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c index 5eab3baf3573..2cb50d5cf1a9 100644 --- a/sound/soc/amd/yc/acp6x-mach.c +++ b/sound/soc/amd/yc/acp6x-mach.c @@ -171,6 +171,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "21J6"), } }, + { + .driver_data = &acp6x_card, + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "82"), + } + }, { .driver_data = &acp6x_card, .matches = { -- 2.34.1

3 6