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

[PATCH] ALSA: hda/realtek: add mic quirk for Acer SF314-42
by Alexander Monakov 03 Aug '21

03 Aug '21

The Acer Swift SF314-42 laptop is using Realtek ALC255 codec. Add a quirk so microphone in a headset connected via the right-hand side jack is usable. Signed-off-by: Alexander Monakov <amonakov(a)ispras.ru> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Hui Wang <hui.wang(a)canonical.com> Cc: Kailang Yang <kailang(a)realtek.com> Cc: Jeremy Szu <jeremy.szu(a)canonical.com> Cc: Jian-Hong Pan <jhp(a)endlessos.org> Cc: Chris Chiu <chris.chiu(a)canonical.com> Cc: PeiSen Hou <pshou(a)realtek.com> Cc: alsa-devel(a)alsa-project.org --- Hello, Acer Swift SF314-42 laptop is using AMD Ryzen SoC audio with Realtek ALC255 codec. The are three ALSA cards: HDMI audio, AMD ACP card, and AMD HDA card. There is an internal stereo microphone connected to the ACP card, and a mini-jack connected to the Realtek codec. There are no LEDs. I'd like to be able to use a mic+headphones headset. Unfortunately, out of the box ALSA does not correctly detect the microphone input of the Realtek codec. The suggested patch fixes that, though I cannot be sure it's 100% correct. With the patch, the experience is unfortunately still not ideal. I have noticed a couple of issues: 1) at high enough gain, recording the microphone is picking up what is being played via the headphones; maybe it's supposed to be like that, but it surprised me; 2) there is a very noticeable "pop" when plugging the headset in/out, accompanied by pcieport 0000:00:08.1: PME: Spurious native interrupt! pcieport 0000:00:08.1: PME: Spurious native interrupt! in dmesg. I'd appreciate info and any help about this issue. Thanks. Alexander sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index ab5113cccffa..87ad8469dbc5 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -8191,6 +8191,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1025, 0x1308, "Acer Aspire Z24-890", ALC286_FIXUP_ACER_AIO_HEADSET_MIC), SND_PCI_QUIRK(0x1025, 0x132a, "Acer TravelMate B114-21", ALC233_FIXUP_ACER_HEADSET_MIC), SND_PCI_QUIRK(0x1025, 0x1330, "Acer TravelMate X514-51T", ALC255_FIXUP_ACER_HEADSET_MIC), + SND_PCI_QUIRK(0x1025, 0x142b, "Acer Swift SF314-42", ALC255_FIXUP_ACER_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1025, 0x1430, "Acer TravelMate B311R-31", ALC256_FIXUP_ACER_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1025, 0x1466, "Acer Aspire A515-56", ALC255_FIXUP_ACER_HEADPHONE_AND_MIC), SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z), base-commit: 62fb9874f5da54fdb243003b386128037319b219 -- 2.31.1

3 7

[PATCH] ALSA: seq: Fix racy deletion of subscriber
by Takashi Iwai 03 Aug '21

03 Aug '21

It turned out that the current implementation of the port subscription is racy. The subscription contains two linked lists, and we have to add to or delete from both lists. Since both connection and disconnection procedures perform the same order for those two lists (i.e. src list, then dest list), when a deletion happens during a connection procedure, the src list may be deleted before the dest list addition completes, and this may lead to a use-after-free or an Oops, even though the access to both lists are protected via mutex. The simple workaround for this race is to change the access order for the disconnection, namely, dest list, then src list. This assures that the connection has been established when disconnecting, and also the concurrent deletion can be avoided. Reported-and-tested-by: folkert <folkert(a)vanheusden.com> Cc: <stable(a)vger.kernel.org> Link: https://lore.kernel.org/r/20210801182754.GP890690@belle.intranet.vanheusden… Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/seq/seq_ports.c | 39 ++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/sound/core/seq/seq_ports.c b/sound/core/seq/seq_ports.c index b9c2ce2b8d5a..84d78630463e 100644 --- a/sound/core/seq/seq_ports.c +++ b/sound/core/seq/seq_ports.c @@ -514,10 +514,11 @@ static int check_and_subscribe_port(struct snd_seq_client *client, return err; } -static void delete_and_unsubscribe_port(struct snd_seq_client *client, - struct snd_seq_client_port *port, - struct snd_seq_subscribers *subs, - bool is_src, bool ack) +/* called with grp->list_mutex held */ +static void __delete_and_unsubscribe_port(struct snd_seq_client *client, + struct snd_seq_client_port *port, + struct snd_seq_subscribers *subs, + bool is_src, bool ack) { struct snd_seq_port_subs_info *grp; struct list_head *list; @@ -525,7 +526,6 @@ static void delete_and_unsubscribe_port(struct snd_seq_client *client, grp = is_src ? &port->c_src : &port->c_dest; list = is_src ? &subs->src_list : &subs->dest_list; - down_write(&grp->list_mutex); write_lock_irq(&grp->list_lock); empty = list_empty(list); if (!empty) @@ -535,6 +535,18 @@ static void delete_and_unsubscribe_port(struct snd_seq_client *client, if (!empty) unsubscribe_port(client, port, grp, &subs->info, ack); +} + +static void delete_and_unsubscribe_port(struct snd_seq_client *client, + struct snd_seq_client_port *port, + struct snd_seq_subscribers *subs, + bool is_src, bool ack) +{ + struct snd_seq_port_subs_info *grp; + + grp = is_src ? &port->c_src : &port->c_dest; + down_write(&grp->list_mutex); + __delete_and_unsubscribe_port(client, port, subs, is_src, ack); up_write(&grp->list_mutex); } @@ -590,27 +602,30 @@ int snd_seq_port_disconnect(struct snd_seq_client *connector, struct snd_seq_client_port *dest_port, struct snd_seq_port_subscribe *info) { - struct snd_seq_port_subs_info *src = &src_port->c_src; + struct snd_seq_port_subs_info *dest = &dest_port->c_dest; struct snd_seq_subscribers *subs; int err = -ENOENT; - down_write(&src->list_mutex); + /* always start from deleting the dest port for avoiding concurrent + * deletions + */ + down_write(&dest->list_mutex); /* look for the connection */ - list_for_each_entry(subs, &src->list_head, src_list) { + list_for_each_entry(subs, &dest->list_head, dest_list) { if (match_subs_info(info, &subs->info)) { - atomic_dec(&subs->ref_count); /* mark as not ready */ + __delete_and_unsubscribe_port(dest_client, dest_port, + subs, false, + connector->number != dest_client->number); err = 0; break; } } - up_write(&src->list_mutex); + up_write(&dest->list_mutex); if (err < 0) return err; delete_and_unsubscribe_port(src_client, src_port, subs, true, connector->number != src_client->number); - delete_and_unsubscribe_port(dest_client, dest_port, subs, false, - connector->number != dest_client->number); kfree(subs); return 0; } -- 2.26.2

1 0

aconnect occasionally causes kernel oopses
by folkert 03 Aug '21

03 Aug '21

[zo aug 1 20:24:51 2021] BUG: unable to handle page fault for address: 00003c366982f750 [zo aug 1 20:24:51 2021] #PF: supervisor read access in kernel mode [zo aug 1 20:24:51 2021] #PF: error_code(0x0000) - not-present page [zo aug 1 20:24:51 2021] PGD 0 P4D 0 [zo aug 1 20:24:51 2021] Oops: 0000 [#1] SMP NOPTI [zo aug 1 20:24:51 2021] CPU: 2 PID: 59575 Comm: aconnect Not tainted 5.11.0-25-generic #27-Ubuntu [zo aug 1 20:24:51 2021] Hardware name: HP HP Laptop 17-by2xxx/865A, BIOS F.58 06/16/2020 [zo aug 1 20:24:51 2021] RIP: 0010:check_and_subscribe_port+0x151/0x210 [snd_seq] [zo aug 1 20:24:51 2021] Code: 49 39 c5 0f 84 39 ff ff ff 41 0f b6 3e eb 0c 48 8b 00 49 39 c5 0f 84 27 ff ff ff 48 8d 70 b0 48 8d 48 a0 45 84 c0 48 0f 45 ce <40> 3a 39 75 e0 0f b6 51 01 41 38 56 01 75 d6 0f b6 51 02 41 38 56 [zo aug 1 20:24:51 2021] RSP: 0018:ffffa57dc9e03cf8 EFLAGS: 00010246 [zo aug 1 20:24:51 2021] RAX: 00003c366982f7b0 RBX: 0000000000000000 RCX: 00003c366982f750 [zo aug 1 20:24:51 2021] RDX: 0000000000000089 RSI: 00003c366982f760 RDI: 0000000000000080 [zo aug 1 20:24:51 2021] RBP: ffffa57dc9e03d38 R08: 0000000000000000 R09: ffff8945226312c0 [zo aug 1 20:24:51 2021] R10: ffff89458b7dda00 R11: ffff89460f08d270 R12: ffff894522631200 [zo aug 1 20:24:51 2021] R13: ffff8945226312c0 R14: ffff894506dd2080 R15: ffff8945226312d8 [zo aug 1 20:24:51 2021] FS: 00007f7fd9633480(0000) GS:ffff894756500000(0000) knlGS:0000000000000000 [zo aug 1 20:24:51 2021] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [zo aug 1 20:24:51 2021] CR2: 00003c366982f750 CR3: 00000001d8318006 CR4: 00000000003706e0 [zo aug 1 20:24:51 2021] Call Trace: [zo aug 1 20:24:51 2021] snd_seq_port_connect+0x113/0x180 [snd_seq] [zo aug 1 20:24:51 2021] snd_seq_ioctl_subscribe_port+0xb9/0x180 [snd_seq] [zo aug 1 20:24:51 2021] ? snd_seq_port_get_subscription+0xbb/0xd0 [snd_seq] [zo aug 1 20:24:51 2021] ? __check_object_size.part.0+0x3a/0x150 [zo aug 1 20:24:51 2021] snd_seq_ioctl+0xe8/0x1b0 [snd_seq] [zo aug 1 20:24:51 2021] __x64_sys_ioctl+0x91/0xc0 [zo aug 1 20:24:51 2021] do_syscall_64+0x38/0x90 [zo aug 1 20:24:51 2021] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [zo aug 1 20:24:51 2021] RIP: 0033:0x7f7fd98b8ecb [zo aug 1 20:24:51 2021] Code: ff ff ff 85 c0 79 8b 49 c7 c4 ff ff ff ff 5b 5d 4c 89 e0 41 5c c3 66 0f 1f 84 00 00 00 00 00 f3 0f 1e fa b8 10 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 6d 1f 0d 00 f7 d8 64 89 01 48 [zo aug 1 20:24:51 2021] RSP: 002b:00007ffdc3e3f038 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 [zo aug 1 20:24:51 2021] RAX: ffffffffffffffda RBX: 00007f7fd998b354 RCX: 00007f7fd98b8ecb [zo aug 1 20:24:51 2021] RDX: 00007ffdc3e3f050 RSI: 0000000040505330 RDI: 0000000000000003 [zo aug 1 20:24:51 2021] RBP: 00007ffdc3e3f120 R08: 00000000ffffffff R09: 0000000000000000 [zo aug 1 20:24:51 2021] R10: 00007f7fd993dac0 R11: 0000000000000246 R12: 00007ffdc3e3f050 [zo aug 1 20:24:51 2021] R13: 00007ffdc3e3f0de R14: 0000000000000000 R15: 00007ffdc3e3f0dc [zo aug 1 20:24:51 2021] Modules linked in: snd_hrtimer snd_usb_audio snd_usbmidi_lib snd_seq_dummy ch341 usbserial ccm xt_CHECKSUM xt_MASQUERADE xt_conntrack ipt_REJECT nf_reject_ipv4 xt_tcpudp nft_compat nft_chain_nat nf_nat nf_conntrack nf_defrag_ipv6 nf_defrag_ipv4 nft_counter nf_tables libcrc32c nfnetlink bridge stp llc rfcomm cmac algif_hash algif_skcipher af_alg bnep binfmt_misc nls_iso8859_1 snd_hda_codec_hdmi snd_sof_pci snd_sof_intel_hda_common snd_hda_codec_realtek snd_soc_hdac_hda snd_hda_codec_generic snd_sof_intel_hda snd_sof_intel_byt snd_sof_intel_ipc snd_sof snd_sof_xtensa_dsp snd_hda_ext_core snd_soc_acpi_intel_match snd_soc_acpi ledtrig_audio snd_hda_intel snd_intel_dspcfg soundwire_intel soundwire_generic_allocation soundwire_cadence snd_hda_codec snd_hda_core snd_hwdep soundwire_bus snd_soc_core snd_compress ac97_bus snd_pcm_dmaengine snd_pcm mei_hdcp rtw88_8723de rtw88_8723d snd_seq_midi x86_pkg_temp_thermal intel_powerclamp snd_seq_midi_event coretemp intel_rapl_msr rtw88_pci [zo aug 1 20:24:51 2021] kvm_intel snd_rawmidi rtw88_core kvm uvcvideo videobuf2_vmalloc rapl intel_cstate mac80211 videobuf2_memops snd_seq joydev btusb btrtl videobuf2_v4l2 snd_seq_device snd_timer btbcm input_leds btintel videobuf2_common videodev hp_wmi efi_pstore mc sparse_keymap serio_raw snd wmi_bmof intel_wmi_thunderbolt cfg80211 mei_me bluetooth soundcore ee1004 libarc4 processor_thermal_device processor_thermal_rfim processor_thermal_mbox mei ecdh_generic processor_thermal_rapl intel_rapl_common ecc intel_pch_thermal int340x_thermal_zone intel_soc_dts_iosf acpi_pad hp_wireless int3400_thermal acpi_tad acpi_thermal_rel mac_hid sch_fq_codel msr parport_pc ppdev lp parport sunrpc ip_tables x_tables autofs4 dm_crypt i915 crct10dif_pclmul crc32_pclmul i2c_algo_bit ghash_clmulni_intel aesni_intel drm_kms_helper crypto_simd syscopyarea cryptd sysfillrect glue_helper sysimgblt fb_sys_fops cec psmouse nvme rc_core intel_lpss_pci intel_lpss nvme_core i2c_i801 r8169 idma64 i2c_smbus ahci realtek [zo aug 1 20:24:51 2021] libahci drm virt_dma xhci_pci xhci_pci_renesas wmi pinctrl_cannonlake video [zo aug 1 20:24:51 2021] CR2: 00003c366982f750 [zo aug 1 20:24:51 2021] ---[ end trace 000787e3cd09f39d ]--- [zo aug 1 20:24:52 2021] RIP: 0010:check_and_subscribe_port+0x151/0x210 [snd_seq] [zo aug 1 20:24:52 2021] Code: 49 39 c5 0f 84 39 ff ff ff 41 0f b6 3e eb 0c 48 8b 00 49 39 c5 0f 84 27 ff ff ff 48 8d 70 b0 48 8d 48 a0 45 84 c0 48 0f 45 ce <40> 3a 39 75 e0 0f b6 51 01 41 38 56 01 75 d6 0f b6 51 02 41 38 56 [zo aug 1 20:24:52 2021] RSP: 0018:ffffa57dc9e03cf8 EFLAGS: 00010246 [zo aug 1 20:24:52 2021] RAX: 00003c366982f7b0 RBX: 0000000000000000 RCX: 00003c366982f750 [zo aug 1 20:24:52 2021] RDX: 0000000000000089 RSI: 00003c366982f760 RDI: 0000000000000080 [zo aug 1 20:24:52 2021] RBP: ffffa57dc9e03d38 R08: 0000000000000000 R09: ffff8945226312c0 [zo aug 1 20:24:52 2021] R10: ffff89458b7dda00 R11: ffff89460f08d270 R12: ffff894522631200 [zo aug 1 20:24:52 2021] R13: ffff8945226312c0 R14: ffff894506dd2080 R15: ffff8945226312d8 [zo aug 1 20:24:52 2021] FS: 00007f7fd9633480(0000) GS:ffff894756500000(0000) knlGS:0000000000000000 [zo aug 1 20:24:52 2021] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [zo aug 1 20:24:52 2021] CR2: 00003c366982f750 CR3: 00000001d8318006 CR4: 00000000003706e0

2 16

Re: [PATCH v2 5/8] ASoC: mediatek: mt8195: add platform driver
by Chen-Yu Tsai 03 Aug '21

03 Aug '21

are all internal Hi, On Tue, Jun 29, 2021 at 9:49 AM Trevor Wu <trevor.wu(a)mediatek.com> wrote: > > This patch adds mt8195 platform and affiliated driver. > > Signed-off-by: Trevor Wu <trevor.wu(a)mediatek.com> > --- > sound/soc/mediatek/Kconfig | 9 + > sound/soc/mediatek/Makefile | 1 + > sound/soc/mediatek/mt8195/Makefile | 11 + > sound/soc/mediatek/mt8195/mt8195-afe-clk.c | 899 +++++ > sound/soc/mediatek/mt8195/mt8195-afe-clk.h | 201 + > sound/soc/mediatek/mt8195/mt8195-afe-common.h | 200 + > sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | 3264 +++++++++++++++++ > sound/soc/mediatek/mt8195/mt8195-reg.h | 2793 ++++++++++++++ > 8 files changed, 7378 insertions(+) > create mode 100644 sound/soc/mediatek/mt8195/Makefile > create mode 100644 sound/soc/mediatek/mt8195/mt8195-afe-clk.c > create mode 100644 sound/soc/mediatek/mt8195/mt8195-afe-clk.h > create mode 100644 sound/soc/mediatek/mt8195/mt8195-afe-common.h > create mode 100644 sound/soc/mediatek/mt8195/mt8195-afe-pcm.c > create mode 100644 sound/soc/mediatek/mt8195/mt8195-reg.h > > diff --git a/sound/soc/mediatek/Kconfig b/sound/soc/mediatek/Kconfig > index 74dae4332d17..3389f382be06 100644 > --- a/sound/soc/mediatek/Kconfig > +++ b/sound/soc/mediatek/Kconfig > @@ -184,3 +184,12 @@ config SND_SOC_MT8192_MT6359_RT1015_RT5682 > with the MT6359 RT1015 RT5682 audio codec. > Select Y if you have such device. > If unsure select "N". > + > +config SND_SOC_MT8195 > + tristate "ASoC support for Mediatek MT8195 chip" > + select SND_SOC_MEDIATEK > + help > + This adds ASoC platform driver support for Mediatek MT8195 chip > + that can be used with other codecs. > + Select Y if you have such device. > + If unsure select "N". > diff --git a/sound/soc/mediatek/Makefile b/sound/soc/mediatek/Makefile > index f6cb6b8508e3..34778ca12106 100644 > --- a/sound/soc/mediatek/Makefile > +++ b/sound/soc/mediatek/Makefile > @@ -5,3 +5,4 @@ obj-$(CONFIG_SND_SOC_MT6797) += mt6797/ > obj-$(CONFIG_SND_SOC_MT8173) += mt8173/ > obj-$(CONFIG_SND_SOC_MT8183) += mt8183/ > obj-$(CONFIG_SND_SOC_MT8192) += mt8192/ > +obj-$(CONFIG_SND_SOC_MT8195) += mt8195/ > diff --git a/sound/soc/mediatek/mt8195/Makefile b/sound/soc/mediatek/mt8195/Makefile > new file mode 100644 > index 000000000000..b2c9fd88f39e > --- /dev/null > +++ b/sound/soc/mediatek/mt8195/Makefile > @@ -0,0 +1,11 @@ > +# SPDX-License-Identifier: GPL-2.0 > + > +# platform driver > +snd-soc-mt8195-afe-objs := \ > + mt8195-afe-clk.o \ > + mt8195-afe-pcm.o \ > + mt8195-dai-adda.o \ > + mt8195-dai-etdm.o \ > + mt8195-dai-pcm.o > + > +obj-$(CONFIG_SND_SOC_MT8195) += snd-soc-mt8195-afe.o > diff --git a/sound/soc/mediatek/mt8195/mt8195-afe-clk.c b/sound/soc/mediatek/mt8195/mt8195-afe-clk.c > new file mode 100644 > index 000000000000..57aa799b4f41 > --- /dev/null > +++ b/sound/soc/mediatek/mt8195/mt8195-afe-clk.c > @@ -0,0 +1,899 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * mt8195-afe-clk.c -- Mediatek 8195 afe clock ctrl > + * > + * Copyright (c) 2021 MediaTek Inc. > + * Author: Bicycle Tsai <bicycle.tsai(a)mediatek.com> > + * Trevor Wu <trevor.wu(a)mediatek.com> > + */ > + > +#include <linux/clk.h> > + > +#include "mt8195-afe-common.h" > +#include "mt8195-afe-clk.h" > +#include "mt8195-reg.h" > + > +static const char *aud_clks[MT8195_CLK_NUM] = { Most of these clocks are not described in the device tree binding. If the driver needs to reference them, they should be described. We should not be hard-coding clock names across different drivers. The more important question is, why does the driver need to reference all of them? Maybe we should take a step back and draw out a clock tree diagram for the hardware? > + /* xtal */ > + [MT8195_CLK_XTAL_26M] = "clk26m", > + /* pll */ > + [MT8195_CLK_APMIXED_APLL1] = "apll1", > + [MT8195_CLK_APMIXED_APLL2] = "apll2", > + [MT8195_CLK_APMIXED_APLL3] = "apll3", > + [MT8195_CLK_APMIXED_APLL4] = "apll4", > + [MT8195_CLK_APMIXED_APLL5] = "apll5", > + [MT8195_CLK_APMIXED_HDMIRX_APLL] = "hdmirx_apll", > + /* divider */ > + [MT8195_CLK_TOP_APLL1] = "apll1_ck", > + [MT8195_CLK_TOP_APLL1_D4] = "apll1_d4", > + [MT8195_CLK_TOP_APLL2] = "apll2_ck", > + [MT8195_CLK_TOP_APLL2_D4] = "apll2_d4", > + [MT8195_CLK_TOP_APLL3] = "apll3_ck", > + [MT8195_CLK_TOP_APLL3_D4] = "apll3_d4", > + [MT8195_CLK_TOP_APLL4] = "apll4_ck", > + [MT8195_CLK_TOP_APLL4_D4] = "apll4_d4", > + [MT8195_CLK_TOP_APLL5] = "apll5_ck", > + [MT8195_CLK_TOP_APLL5_D4] = "apll5_d4", > + [MT8195_CLK_TOP_APLL12_DIV0] = "apll12_div0", > + [MT8195_CLK_TOP_APLL12_DIV1] = "apll12_div1", > + [MT8195_CLK_TOP_APLL12_DIV2] = "apll12_div2", > + [MT8195_CLK_TOP_APLL12_DIV3] = "apll12_div3", > + [MT8195_CLK_TOP_APLL12_DIV4] = "apll12_div4", > + [MT8195_CLK_TOP_APLL12_DIV9] = "apll12_div9", > + [MT8195_CLK_TOP_HDMIRX_APLL] = "hdmirx_apll_ck", > + [MT8195_CLK_TOP_MAINPLL_D4_D4] = "mainpll_d4_d4", > + [MT8195_CLK_TOP_MAINPLL_D5_D2] = "mainpll_d5_d2", > + [MT8195_CLK_TOP_MAINPLL_D7_D2] = "mainpll_d7_d2", > + [MT8195_CLK_TOP_UNIVPLL_D4] = "univpll_d4", > + /* mux */ > + [MT8195_CLK_TOP_APLL1_SEL] = "apll1_sel", > + [MT8195_CLK_TOP_APLL2_SEL] = "apll2_sel", > + [MT8195_CLK_TOP_APLL3_SEL] = "apll3_sel", > + [MT8195_CLK_TOP_APLL4_SEL] = "apll4_sel", > + [MT8195_CLK_TOP_APLL5_SEL] = "apll5_sel", > + [MT8195_CLK_TOP_A1SYS_HP_SEL] = "a1sys_hp_sel", > + [MT8195_CLK_TOP_A2SYS_SEL] = "a2sys_sel", > + [MT8195_CLK_TOP_A3SYS_SEL] = "a3sys_sel", > + [MT8195_CLK_TOP_A4SYS_SEL] = "a4sys_sel", > + [MT8195_CLK_TOP_ASM_H_SEL] = "asm_h_sel", > + [MT8195_CLK_TOP_ASM_M_SEL] = "asm_m_sel", > + [MT8195_CLK_TOP_ASM_L_SEL] = "asm_l_sel", > + [MT8195_CLK_TOP_AUD_IEC_SEL] = "aud_iec_sel", > + [MT8195_CLK_TOP_AUD_INTBUS_SEL] = "aud_intbus_sel", > + [MT8195_CLK_TOP_AUDIO_H_SEL] = "audio_h_sel", > + [MT8195_CLK_TOP_AUDIO_LOCAL_BUS_SEL] = "audio_local_bus_sel", > + [MT8195_CLK_TOP_DPTX_M_SEL] = "dptx_m_sel", > + [MT8195_CLK_TOP_INTDIR_SEL] = "intdir_sel", > + [MT8195_CLK_TOP_I2SO1_M_SEL] = "i2so1_m_sel", > + [MT8195_CLK_TOP_I2SO2_M_SEL] = "i2so2_m_sel", > + [MT8195_CLK_TOP_I2SI1_M_SEL] = "i2si1_m_sel", > + [MT8195_CLK_TOP_I2SI2_M_SEL] = "i2si2_m_sel", > + /* clock gate */ > + [MT8195_CLK_TOP_MPHONE_SLAVE_B] = "mphone_slave_b", > + [MT8195_CLK_TOP_CFG_26M_AUD] = "cfg_26m_aud", > + [MT8195_CLK_INFRA_AO_AUDIO] = "infra_ao_audio", > + [MT8195_CLK_INFRA_AO_AUDIO_26M_B] = "infra_ao_audio_26m_b", > + [MT8195_CLK_SCP_ADSP_AUDIODSP] = "scp_adsp_audiodsp", > + [MT8195_CLK_AUD_AFE] = "aud_afe", > + [MT8195_CLK_AUD_LRCK_CNT] = "aud_lrck_cnt", > + [MT8195_CLK_AUD_SPDIFIN_TUNER_APLL] = "aud_spdifin_tuner_apll", > + [MT8195_CLK_AUD_SPDIFIN_TUNER_DBG] = "aud_spdifin_tuner_dbg", > + [MT8195_CLK_AUD_UL_TML] = "aud_ul_tml", > + [MT8195_CLK_AUD_APLL1_TUNER] = "aud_apll1_tuner", > + [MT8195_CLK_AUD_APLL2_TUNER] = "aud_apll2_tuner", > + [MT8195_CLK_AUD_TOP0_SPDF] = "aud_top0_spdf", > + [MT8195_CLK_AUD_APLL] = "aud_apll", > + [MT8195_CLK_AUD_APLL2] = "aud_apll2", > + [MT8195_CLK_AUD_DAC] = "aud_dac", > + [MT8195_CLK_AUD_DAC_PREDIS] = "aud_dac_predis", > + [MT8195_CLK_AUD_TML] = "aud_tml", > + [MT8195_CLK_AUD_ADC] = "aud_adc", > + [MT8195_CLK_AUD_DAC_HIRES] = "aud_dac_hires", > + [MT8195_CLK_AUD_A1SYS_HP] = "aud_a1sys_hp", > + [MT8195_CLK_AUD_AFE_DMIC1] = "aud_afe_dmic1", > + [MT8195_CLK_AUD_AFE_DMIC2] = "aud_afe_dmic2", > + [MT8195_CLK_AUD_AFE_DMIC3] = "aud_afe_dmic3", > + [MT8195_CLK_AUD_AFE_DMIC4] = "aud_afe_dmic4", > + [MT8195_CLK_AUD_AFE_26M_DMIC_TM] = "aud_afe_26m_dmic_tm", > + [MT8195_CLK_AUD_UL_TML_HIRES] = "aud_ul_tml_hires", > + [MT8195_CLK_AUD_ADC_HIRES] = "aud_adc_hires", > + [MT8195_CLK_AUD_ADDA6_ADC] = "aud_adda6_adc", > + [MT8195_CLK_AUD_ADDA6_ADC_HIRES] = "aud_adda6_adc_hires", > + [MT8195_CLK_AUD_LINEIN_TUNER] = "aud_linein_tuner", > + [MT8195_CLK_AUD_EARC_TUNER] = "aud_earc_tuner", > + [MT8195_CLK_AUD_I2SIN] = "aud_i2sin", > + [MT8195_CLK_AUD_TDM_IN] = "aud_tdm_in", > + [MT8195_CLK_AUD_I2S_OUT] = "aud_i2s_out", > + [MT8195_CLK_AUD_TDM_OUT] = "aud_tdm_out", > + [MT8195_CLK_AUD_HDMI_OUT] = "aud_hdmi_out", > + [MT8195_CLK_AUD_ASRC11] = "aud_asrc11", > + [MT8195_CLK_AUD_ASRC12] = "aud_asrc12", > + [MT8195_CLK_AUD_MULTI_IN] = "aud_multi_in", > + [MT8195_CLK_AUD_INTDIR] = "aud_intdir", > + [MT8195_CLK_AUD_A1SYS] = "aud_a1sys", > + [MT8195_CLK_AUD_A2SYS] = "aud_a2sys", > + [MT8195_CLK_AUD_PCMIF] = "aud_pcmif", > + [MT8195_CLK_AUD_A3SYS] = "aud_a3sys", > + [MT8195_CLK_AUD_A4SYS] = "aud_a4sys", > + [MT8195_CLK_AUD_MEMIF_UL1] = "aud_memif_ul1", > + [MT8195_CLK_AUD_MEMIF_UL2] = "aud_memif_ul2", > + [MT8195_CLK_AUD_MEMIF_UL3] = "aud_memif_ul3", > + [MT8195_CLK_AUD_MEMIF_UL4] = "aud_memif_ul4", > + [MT8195_CLK_AUD_MEMIF_UL5] = "aud_memif_ul5", > + [MT8195_CLK_AUD_MEMIF_UL6] = "aud_memif_ul6", > + [MT8195_CLK_AUD_MEMIF_UL8] = "aud_memif_ul8", > + [MT8195_CLK_AUD_MEMIF_UL9] = "aud_memif_ul9", > + [MT8195_CLK_AUD_MEMIF_UL10] = "aud_memif_ul10", > + [MT8195_CLK_AUD_MEMIF_DL2] = "aud_memif_dl2", > + [MT8195_CLK_AUD_MEMIF_DL3] = "aud_memif_dl3", > + [MT8195_CLK_AUD_MEMIF_DL6] = "aud_memif_dl6", > + [MT8195_CLK_AUD_MEMIF_DL7] = "aud_memif_dl7", > + [MT8195_CLK_AUD_MEMIF_DL8] = "aud_memif_dl8", > + [MT8195_CLK_AUD_MEMIF_DL10] = "aud_memif_dl10", > + [MT8195_CLK_AUD_MEMIF_DL11] = "aud_memif_dl11", > + [MT8195_CLK_AUD_GASRC0] = "aud_gasrc0", > + [MT8195_CLK_AUD_GASRC1] = "aud_gasrc1", > + [MT8195_CLK_AUD_GASRC2] = "aud_gasrc2", > + [MT8195_CLK_AUD_GASRC3] = "aud_gasrc3", > + [MT8195_CLK_AUD_GASRC4] = "aud_gasrc4", > + [MT8195_CLK_AUD_GASRC5] = "aud_gasrc5", > + [MT8195_CLK_AUD_GASRC6] = "aud_gasrc6", > + [MT8195_CLK_AUD_GASRC7] = "aud_gasrc7", > + [MT8195_CLK_AUD_GASRC8] = "aud_gasrc8", > + [MT8195_CLK_AUD_GASRC9] = "aud_gasrc9", > + [MT8195_CLK_AUD_GASRC10] = "aud_gasrc10", > + [MT8195_CLK_AUD_GASRC11] = "aud_gasrc11", > + [MT8195_CLK_AUD_GASRC12] = "aud_gasrc12", > + [MT8195_CLK_AUD_GASRC13] = "aud_gasrc13", > + [MT8195_CLK_AUD_GASRC14] = "aud_gasrc14", > + [MT8195_CLK_AUD_GASRC15] = "aud_gasrc15", > + [MT8195_CLK_AUD_GASRC16] = "aud_gasrc16", > + [MT8195_CLK_AUD_GASRC17] = "aud_gasrc17", > + [MT8195_CLK_AUD_GASRC18] = "aud_gasrc18", > + [MT8195_CLK_AUD_GASRC19] = "aud_gasrc19", The MT8195_CLK_AUD_* clocks are all internal to the audio subsystem: the bits that control these clock gates are in the same address space as the audio parts. Would it be possible to model them as internal ASoC SUPPLY widgets? The external ones could be modeled using ASoC CLK_SUPPLY widgets, and the dependencies could be modeled with ASoC routes. The ASoC core could then handle power sequencing, which the driver currently does manually. IMO this is better than having two drivers handling two aspects of the same piece of hardware, while the two aspects are intertwined. Regards ChenYu

2 9

[PATCH] sound: usb: get lock before calling usb_enable_autosuspend()
by Salah Triki 03 Aug '21

03 Aug '21

Based on the documentation of usb_enable_autosuspend(), the caller must hold udev's device lock. Signed-off-by: Salah Triki <salah.triki(a)gmail.com> --- sound/usb/card.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/usb/card.c b/sound/usb/card.c index 2f6a62416c05..9290ba0acd5f 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -907,8 +907,13 @@ static void usb_audio_disconnect(struct usb_interface *intf) } } - if (chip->quirk_type & QUIRK_SETUP_DISABLE_AUTOSUSPEND) - usb_enable_autosuspend(interface_to_usbdev(intf)); + if (chip->quirk_type & QUIRK_SETUP_DISABLE_AUTOSUSPEND) { + struct usb_device *udev = interface_to_usbdev(intf); + + usb_lock_device(udev); + usb_enable_autosuspend(udev); + usb_unlock_device(udev); + } chip->num_interfaces--; if (chip->num_interfaces <= 0) { -- 2.25.1

2 1

dmix optimization
by Giuliano Zannetti - ART S.p.A. 03 Aug '21

03 Aug '21

Hi, I'm trying to optimize the dmix because I'm working with a big number of channels (up to 16) and in this case the dmix has not a negligible impact on performance. I'm working with ALSA 1.1.9. I gave my first look to the generic_mix_areas_16_native function (https://github.com/alsa-project/alsa-lib/blob/v1.1.9/src/pcm/pcm_dmix_gener…). I would ask you if I can avoid to check, for each loop iteration, if the current dst sample is not 0. for (;;) { sample = *src; if (! *dst) { *sum = sample; *dst = *src; } else { sample += *sum; *sum = sample; if (sample > 0x7fff) sample = 0x7fff; else if (sample < -0x8000) sample = -0x8000; *dst = sample; } if (!--size) return; src = (signed short *) ((char *)src + src_step); dst = (signed short *) ((char *)dst + dst_step); sum = (signed int *) ((char *)sum + sum_step); } Could it be possible check for the first sample of the period only, as reported in the code below? My assumption is that if dst[0] is 0 also dst[1] ... dst[period-1] will be 0, and I don't need to check every time. This is already an optimization, but it could be also a starting point for other optimization based on my HW. But, first of all, I would ask to you if my assumption is right. if (! *dst) { for (;;) { sample = *src; *sum = sample; *dst = *src; if (!--size) return; src = (signed short *) ((char *)src + src_step); dst = (signed short *) ((char *)dst + dst_step); sum = (signed int *) ((char *)sum + sum_step); } } else { for (;;) { sample = *src; sample += *sum; *sum = sample; if (sample > 0x7fff) sample = 0x7fff; else if (sample < -0x8000) sample = -0x8000; *dst = sample; if (!--size) return; src = (signed short *) ((char *)src + src_step); dst = (signed short *) ((char *)dst + dst_step); sum = (signed int *) ((char *)sum + sum_step); } } Thank you! Best Regards, Giuliano

3 3

[PATCH v3 0/4] ASoC: codecs: wcd934x: add Headset and button detection support
by Srinivas Kandagatla 03 Aug '21

03 Aug '21

This patchset adds support to MBHC(Multi Button Headset Control) block found in Qualcomm WCD codecs. MBHC support headset type detection, both Mechanical and electrical insert/removal detection along with 8 buttons detection, Over current interrupts on HPHL/R, Impedance Measurements on HPHL/R. Eventhough MBHC block supports things like OverCurrent detection, Currently its reported as a kernel debug message. Should this be reported as an uevent to userspace? like the way USB reports? Any suggestions? First patch adds a common mbhc driver and the second one wcd934x specific driver changes along with sdm845 soundcard related changes. Common wcd-mbhc-v2 driver should be reusable across multiple codecs like WCD9335, WCD934x, WCD937x and WCD938x. Most of the work is derived from downstream Qualcomm kernels. Credits to various Qualcomm authors from Patrick Lai's team who have contributed to this code. Changes since v2: - switched to EXPORT_SYMBOL_GPL from EXPORT_SYMBOL - converted one of the if else to switch case. Srinivas Kandagatla (4): ASoC: dt-bindings: wcd934x: add bindings for Headset Button detection ASoC: codecs: wcd: add multi button Headset detection support ASoC: codecs: wcd934x: add mbhc support ASoC: qcom: sdm845: add jack support for WCD934x .../bindings/sound/qcom,wcd934x.yaml | 30 + include/linux/mfd/wcd934x/registers.h | 57 + sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/wcd-mbhc-v2.c | 1475 +++++++++++++++++ sound/soc/codecs/wcd-mbhc-v2.h | 340 ++++ sound/soc/codecs/wcd934x.c | 884 +++++++++- sound/soc/qcom/sdm845.c | 8 + 8 files changed, 2785 insertions(+), 15 deletions(-) create mode 100644 sound/soc/codecs/wcd-mbhc-v2.c create mode 100644 sound/soc/codecs/wcd-mbhc-v2.h -- 2.21.0

3 6

[PATCH v2 0/6] soundwire/ASoC: abstract platform-dependent bases
by Bard Liao 02 Aug '21

02 Aug '21

shim base and alh base are platform-dependent. This series suggests to use variables for those bases. It allows us to use different bases for new platforms. v2: - Update the commit message of "soundwire: move intel sdw register definitions to sdw_intel.h" Bard Liao (6): soundwire: move intel sdw register definitions to sdw_intel.h ASoC: SOF: intel: add sdw_shim/alh_base to sof_intel_dsp_desc ASoC: SOF: intel: hda: remove HDA_DSP_REG_SNDW_WAKE_STS definition ASoC: SOF: intel: move sof_intel_dsp_desc() forward ASoC: SOF: intel: add snd_sof_dsp_check_sdw_irq ops soundwire: intel: introduce shim and alh base drivers/soundwire/intel.c | 74 ------------------------ drivers/soundwire/intel_init.c | 14 ++--- include/linux/soundwire/sdw_intel.h | 87 +++++++++++++++++++++++++++++ sound/soc/sof/intel/cnl.c | 6 ++ sound/soc/sof/intel/hda.c | 39 ++++++++----- sound/soc/sof/intel/hda.h | 8 ++- sound/soc/sof/intel/icl.c | 3 + sound/soc/sof/intel/shim.h | 3 + sound/soc/sof/intel/tgl.c | 12 ++++ 9 files changed, 149 insertions(+), 97 deletions(-) -- 2.17.1

4 12

[PATCH] ASoC: tlv320aic32x4: make array clocks static, makes object smaller
by Colin King 02 Aug '21

02 Aug '21

From: Colin Ian King <colin.king(a)canonical.com> Don't populate the array clocks on the stack but instead it static. Makes the object code smaller by 316 bytes. Before: text data bss dec hex filename 63668 28264 0 91932 1671c ./sound/soc/codecs/tlv320aic32x4.o After: text data bss dec hex filename 62616 29000 0 91616 165e0 ./sound/soc/codecs/tlv320aic32x4.o (gcc version 10.2.0) Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/soc/codecs/tlv320aic32x4.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c index 254a016cb1f3..d31ffb6d5b4b 100644 --- a/sound/soc/codecs/tlv320aic32x4.c +++ b/sound/soc/codecs/tlv320aic32x4.c @@ -714,7 +714,7 @@ static int aic32x4_setup_clocks(struct snd_soc_component *component, unsigned long adc_clock_rate, dac_clock_rate; int ret; - struct clk_bulk_data clocks[] = { + static struct clk_bulk_data clocks[] = { { .id = "pll" }, { .id = "nadc" }, { .id = "madc" }, @@ -878,7 +878,7 @@ static int aic32x4_set_bias_level(struct snd_soc_component *component, { int ret; - struct clk_bulk_data clocks[] = { + static struct clk_bulk_data clocks[] = { { .id = "madc" }, { .id = "mdac" }, { .id = "bdiv" }, @@ -994,7 +994,7 @@ static int aic32x4_component_probe(struct snd_soc_component *component) u32 tmp_reg; int ret; - struct clk_bulk_data clocks[] = { + static struct clk_bulk_data clocks[] = { { .id = "codec_clkin" }, { .id = "pll" }, { .id = "bdiv" }, @@ -1144,7 +1144,7 @@ static int aic32x4_tas2505_component_probe(struct snd_soc_component *component) u32 tmp_reg; int ret; - struct clk_bulk_data clocks[] = { + static struct clk_bulk_data clocks[] = { { .id = "codec_clkin" }, { .id = "pll" }, { .id = "bdiv" }, -- 2.31.1

3 2

[PATCH v2 0/6] ASoC: Intel: bytcr_rt5640: Fix HP ElitePad 1000 G2 audio routing
by Hans de Goede 02 Aug '21

02 Aug '21

Changes in v2: - Only set lineout_string if BYT_RT5640_LINEOUT is set, since BYT_RT5640_LINEOUT_AS_HP2 only works if the lineout is enabled in the first place Original cover-letter: The HP Elitepad 1000 G2 has 2 headset jacks: 1. on the dock which uses the output of the codecs built-in HP-amp + the standard IN2 input which is always used with the headset-jack. 2. on the tablet itself, this uses the line-out of the codec, combined with an external HP-amp + IN1 for the headset-mic. This series adds support for this, resolving: https://bugzilla.kernel.org/show_bug.cgi?id=213415 Note this series does not add jack-detect support. I plan to add that with a follow-up series when I can make some time to implement that. Regards, Hans Hans de Goede (6): ASoC: Intel: bytcr_rt5640: Move "Platform Clock" routes to the maps for the matching in-/output ASoC: Intel: bytcr_rt5640: Add line-out support ASoC: Intel: bytcr_rt5640: Add a byt_rt5640_get_codec_dai() helper ASoC: Intel: bytcr_rt5640: Add support for a second headphones output ASoC: Intel: bytcr_rt5640: Add support for a second headset mic input ASoC: Intel: bytcr_rt5640: Fix HP ElitePad 1000 G2 quirk sound/soc/intel/boards/bytcr_rt5640.c | 118 ++++++++++++++++++++++---- 1 file changed, 102 insertions(+), 16 deletions(-) -- 2.31.1

3 8