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

[PATCH] ALSA: cs46xx: Fix missing snd_card_free() call at probe error
by Takashi Iwai 05 Jul '22

05 Jul '22

The previous cleanup with devres may lead to the incorrect release orders at the probe error handling due to the devres's nature. Until we register the card, snd_card_free() has to be called at first for releasing the stuff properly when the driver tries to manage and release the stuff via card->private_free(). This patch fixes it by calling snd_card_free() manually on the error from the probe callback. Fixes: 5bff69b3645d ("ALSA: cs46xx: Allocate resources with device-managed APIs") Cc: <stable(a)vger.kernel.org> Reported-and-tested-by: Jan Engelhardt <jengelh(a)inai.de> Link: https://lore.kernel.org/r/p2p1s96o-746-74p4-s95-61qo1p7782pn@vanv.qr Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/cs46xx/cs46xx.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/sound/pci/cs46xx/cs46xx.c b/sound/pci/cs46xx/cs46xx.c index bd60308769ff..8634004a606b 100644 --- a/sound/pci/cs46xx/cs46xx.c +++ b/sound/pci/cs46xx/cs46xx.c @@ -74,36 +74,36 @@ static int snd_card_cs46xx_probe(struct pci_dev *pci, err = snd_cs46xx_create(card, pci, external_amp[dev], thinkpad[dev]); if (err < 0) - return err; + goto error; card->private_data = chip; chip->accept_valid = mmap_valid[dev]; err = snd_cs46xx_pcm(chip, 0); if (err < 0) - return err; + goto error; #ifdef CONFIG_SND_CS46XX_NEW_DSP err = snd_cs46xx_pcm_rear(chip, 1); if (err < 0) - return err; + goto error; err = snd_cs46xx_pcm_iec958(chip, 2); if (err < 0) - return err; + goto error; #endif err = snd_cs46xx_mixer(chip, 2); if (err < 0) - return err; + goto error; #ifdef CONFIG_SND_CS46XX_NEW_DSP if (chip->nr_ac97_codecs ==2) { err = snd_cs46xx_pcm_center_lfe(chip, 3); if (err < 0) - return err; + goto error; } #endif err = snd_cs46xx_midi(chip, 0); if (err < 0) - return err; + goto error; err = snd_cs46xx_start_dsp(chip); if (err < 0) - return err; + goto error; snd_cs46xx_gameport(chip); @@ -117,11 +117,15 @@ static int snd_card_cs46xx_probe(struct pci_dev *pci, err = snd_card_register(card); if (err < 0) - return err; + goto error; pci_set_drvdata(pci, card); dev++; return 0; + + error: + snd_card_free(card); + return err; } static struct pci_driver cs46xx_driver = { -- 2.35.3

1 0

snd_cs46xx regression, producing Oops
by Jan Engelhardt 05 Jul '22

05 Jul '22

Commit v5.14-rc1-39-g5bff69b3645d introduced a breakage into snd_cs46xx. When loading the module, an Oops is thrown. The system works fine afterwards, but the final reboot/poweroff message to ACPI has no effect after such Oops occurred. (Blacklisting snd_cs46xx works around the reboot problem.) bisected to: commit 5bff69b3645db7b3018ecbc26218d8866aeaf214 Author: Takashi Iwai <tiwai(a)suse.de> Date: Thu Jul 15 09:58:52 2021 +0200 ALSA: cs46xx: Allocate resources with device-managed APIs This patch converts the resource management in PCI cs46xx driver with devres as a clean up. Each manual resource management is converted with the corresponding devres helper, and the card object release is managed now via card->private_free instead of a lowlevel snd_device. trace log from modern kernel: [ 0.000000] Linux version 5.18.9 (jengelh@f3) (gcc (SUSE Linux) 12.1.0, GNU ld (GNU Binutils; openSUSE Tumbleweed) 2.38.20220525-6) #3 PREEMPT_DYNAMIC Tue Jul 5 10:43:37 CEST 2022 ... [ 32.475313] snd_intel8x0 0000:00:02.7: intel8x0_measure_ac97_clock: measured 59821 usecs (2877 samples) [ 32.475410] snd_intel8x0 0000:00:02.7: clocking to 48000 [ 33.683930] snd_cs46xx 0000:00:0d.0: Direct firmware load for cs46xx/cwc4630 failed with error -2 [ 33.684035] snd_cs46xx 0000:00:0d.0: firmware load error [cwc4630] [ 33.684092] snd_cs46xx: probe of 0000:00:0d.0 failed with error -2 [ 33.684772] BUG: unable to handle page fault for address: f7cd846c [ 33.684833] #PF: supervisor write access in kernel mode [ 33.684886] #PF: error_code(0x0002) - not-present page [ 33.684936] *pde = 010e9067 *pte = 00000000 [ 33.684992] Oops: 0002 [#1] PREEMPT [ 33.685045] CPU: 0 PID: 413 Comm: systemd-udevd Tainted: G E 5.18.9 #3 aa51fdb6e59156e58028f32c0abfef9c9b603d9b [ 33.685119] Hardware name: ECS L7S7A2/L7S7A2, BIOS 07.00T 04/02/01 [ 33.685172] EIP: snd_cs46xx_codec_write+0x3b/0xe0 [snd_cs46xx] [ 33.685265] Code: ec 18 83 7d 08 01 89 45 f0 0f 8f b0 00 00 00 89 f0 0f b7 f9 8b 8e 58 01 00 00 ba 01 00 00 00 e8 cb 83 af da 8b 46 28 8b 4d f0 <89> 88 6c 04 00 00 8b 46 28 89 b8 70 04 00 00 8b 46 28 05 60 04 00 [ 33.685356] EAX: f7cd8000 EBX: c232c548 ECX: 00000002 EDX: 00000001 [ 33.685410] ESI: c232c548 EDI: 00009f9f EBP: c1fd5b08 ESP: c1fd5ae4 [ 33.685463] DS: 007b ES: 007b FS: 0000 GS: 0033 SS: 0068 EFLAGS: 00210297 [ 33.685528] CR0: 80050033 CR2: f7cd846c CR3: 0335d000 CR4: 00000690 [ 33.685581] Call Trace: [ 33.685637] ? snd_cs46xx_codec_write+0xe0/0xe0 [snd_cs46xx 58d1cdc18910e2717003e6be0e13f1fe4cf1ef4e] [ 33.685721] snd_cs46xx_ac97_write+0x2a/0x50 [snd_cs46xx 58d1cdc18910e2717003e6be0e13f1fe4cf1ef4e] [ 33.685804] snd_ac97_write+0x51/0x80 [snd_ac97_codec 9efa9e43a5e3a59d5b4ae0b33ee748e5f4f27a3a] [ 33.685908] snd_ac97_powerdown+0xc9/0x120 [snd_ac97_codec 9efa9e43a5e3a59d5b4ae0b33ee748e5f4f27a3a] [ 33.685990] snd_ac97_dev_free+0x13/0x30 [snd_ac97_codec 9efa9e43a5e3a59d5b4ae0b33ee748e5f4f27a3a] [ 33.686072] __snd_device_free+0x3d/0x80 [snd 6a4ed59569dfc8ba5a4beabb0b5a692067dfc833] [ 33.686178] snd_device_free_all+0x43/0x80 [snd 6a4ed59569dfc8ba5a4beabb0b5a692067dfc833] [ 33.686260] release_card_device+0x23/0x90 [snd 6a4ed59569dfc8ba5a4beabb0b5a692067dfc833] [ 33.686340] device_release+0x37/0xa0 [ 33.686399] kobject_put+0xb1/0x230 [ 33.686454] ? snd_card_disconnect+0x134/0x230 [snd 6a4ed59569dfc8ba5a4beabb0b5a692067dfc833] [ 33.686536] put_device+0x11/0x20 [ 33.686587] __snd_card_release+0x69/0x80 [snd 6a4ed59569dfc8ba5a4beabb0b5a692067dfc833] [ 33.686668] release_nodes+0x3d/0xb0 [ 33.686726] devres_release_all+0x77/0xd0 [ 33.686780] device_unbind_cleanup+0x10/0x60 [ 33.686833] really_probe+0x1ee/0x370 [ 33.686885] ? pm_runtime_barrier+0x44/0x90 [ 33.686945] __driver_probe_device+0x111/0x200 [ 33.686998] ? kernfs_create_dir_ns+0x79/0xc0 [ 33.687053] driver_probe_device+0x27/0xa0 [ 33.687106] __driver_attach+0xb7/0x1b0 [ 33.687158] ? __device_attach_driver+0x100/0x100 [ 33.687211] bus_for_each_dev+0x5a/0x90 [ 33.687263] driver_attach+0x1e/0x30 [ 33.687314] ? __device_attach_driver+0x100/0x100 [ 33.687366] bus_add_driver+0x14f/0x200 [ 33.687419] driver_register+0x7c/0xd0 [ 33.687469] ? sysfs_add_bin_file_mode_ns+0x67/0xd0 [ 33.687524] ? 0xf7f10000 [ 33.687574] __pci_register_driver+0x3c/0x40 [ 33.687628] cs46xx_driver_init+0x1c/0x1000 [snd_cs46xx 58d1cdc18910e2717003e6be0e13f1fe4cf1ef4e] [ 33.687710] do_one_initcall+0x3f/0x1a0 [ 33.687764] ? kmem_cache_alloc_trace+0x13f/0x2f0 [ 33.687822] ? do_init_module+0x24/0x240 [ 33.687882] do_init_module+0x46/0x240 [ 33.687935] ? __vfree+0x20/0x50 [ 33.687992] load_module+0x2393/0x2540 [ 33.691234] ? try_module_get+0xb0/0xb0 [ 33.691293] __ia32_sys_finit_module+0xb4/0x130 [ 33.691351] __do_fast_syscall_32+0x67/0xb0 [ 33.691411] ? syscall_exit_to_user_mode+0x1a/0x40 [ 33.691466] ? __do_fast_syscall_32+0x71/0xb0 [ 33.691519] ? irqentry_exit_to_user_mode+0x8/0x20 [ 33.691571] do_fast_syscall_32+0x31/0x70 [ 33.691624] do_SYSENTER_32+0x15/0x20 [ 33.691676] entry_SYSENTER_32+0x98/0xf0 [ 33.691732] EIP: 0xb7f27549 [ 33.691782] Code: 03 74 c0 01 10 05 03 74 b8 01 10 06 03 74 b4 01 10 07 03 74 b0 01 10 08 03 74 d8 01 00 00 00 00 00 51 52 55 89 e5 0f 34 cd 80 <5d> 5a 59 c3 90 90 90 90 8d 76 00 58 b8 77 00 00 00 cd 80 90 8d 76 [ 33.691873] EAX: ffffffda EBX: 00000012 ECX: b7bbe036 EDX: 00000000 [ 33.691926] ESI: b7bc5dd8 EDI: 01add640 EBP: ffffff08 ESP: bfee05ac [ 33.691979] DS: 007b ES: 007b FS: 0000 GS: 0033 SS: 007b EFLAGS: 00200246 [ 33.692046] Modules linked in: drm_ttm_helper(E) snd_cs46xx(E+) ttm(E) snd_rawmidi(E) mxm_wmi(E) snd_intel8x0(E) wmi(E) pcspkr(E) snd_ac97_codec(E) video(E) ac97_bus(E) 8139too(E) snd_pcm(E) drm_dp_helper(E) 8139cp(E) sis900(E) snd_timer(E) parport_pc(E) mii(E) tiny_power_button(E) snd(E) soundcore(E) i2c_sis96x(E) button(E) parport(E) ext4(E) mbcache(E) jbd2(E) fuse(E) configfs(E) ip_tables(E) x_tables(E) xfs(E) libcrc32c(E) hid_generic(E) usbhid(E) sr_mod(E) cdrom(E) ata_generic(E) ohci_pci(E) serio_raw(E) sata_sil(E) ohci_hcd(E) ehci_pci(E) ehci_hcd(E) pata_sis(E) usbcore(E) libata(E) floppy(E) sg(E) [ 33.692314] CR2: 00000000f7cd846c [ 33.692365] ---[ end trace 0000000000000000 ]--- [ 33.692414] EIP: snd_cs46xx_codec_write+0x3b/0xe0 [snd_cs46xx] [ 33.692483] Code: ec 18 83 7d 08 01 89 45 f0 0f 8f b0 00 00 00 89 f0 0f b7 f9 8b 8e 58 01 00 00 ba 01 00 00 00 e8 cb 83 af da 8b 46 28 8b 4d f0 <89> 88 6c 04 00 00 8b 46 28 89 b8 70 04 00 00 8b 46 28 05 60 04 00 [ 33.692572] EAX: f7cd8000 EBX: c232c548 ECX: 00000002 EDX: 00000001 [ 33.692626] ESI: c232c548 EDI: 00009f9f EBP: c1fd5b08 ESP: c1fd5ae4 [ 33.692679] DS: 007b ES: 007b FS: 0000 GS: 0033 SS: 0068 EFLAGS: 00210297 [ 33.692742] CR0: 80050033 CR2: f7cd846c CR3: 0335d000 CR4: 00000690 On a 5.14, it's just the three lines snd_cs46xx 0000:00:0d.0: Direct firmware load for cs46xx/cwc4630 failed with error -2 snd_cs46xx 0000:00:0d.0: firmware load error [cwc4630] snd_cs46xx: probe of 0000:00:0d.0 failed with error -2 and life goes on.

2 3

Scarlett 18i20 USB, USB Audio
by GitHub issues - edited 05 Jul '22

05 Jul '22

alsa-project/alsa-topology-conf issue #2 was edited from juanpc2018: Problems: $ alsamixer does Not allow to change SampleRate, only clock source. Focusrite Scarlett 18i20mk2 USB, USB Audio has a Control Software only for OSX and Windows. works in Wine/PlayOnMac, but does Not detect the USB device. sometimes even the Control Software also does Not detect the USB in OSX or Windows. anyway... i go to OSX, change the Sample Rate. 96khz, reboot and go back to Kubuntu 21.10, Kubuntu changes the SR to 44.1Khz at boot, problem #2. SampleRateConverter does Not work well Down, if i play a 48khz file in VLC, does Not play in 44.1Khz SR. jackd2 can change SampleRate No problems. VLC has jack output, but Firefox does Not, unless compied from source with the option in config anyway.. need to create: /etc/asound.conf $ aplay -L hw:CARD=USB,DEV=0 Scarlett 18i20 USB, USB Audio Direct hardware device without any conversions plughw:CARD=USB,DEV=0 Scarlett 18i20 USB, USB Audio Hardware device with all software conversions sysdefault:CARD=USB Scarlett 18i20 USB, USB Audio Default Audio Device front:CARD=USB,DEV=0 Scarlett 18i20 USB, USB Audio Front output / input surround21:CARD=USB,DEV=0 Scarlett 18i20 USB, USB Audio 2.1 Surround output to Front and Subwoofer speakers surround40:CARD=USB,DEV=0 Scarlett 18i20 USB, USB Audio 4.0 Surround output to Front and Rear speakers surround41:CARD=USB,DEV=0 Scarlett 18i20 USB, USB Audio 4.1 Surround output to Front, Rear and Subwoofer speakers surround50:CARD=USB,DEV=0 Scarlett 18i20 USB, USB Audio 5.0 Surround output to Front, Center and Rear speakers surround51:CARD=USB,DEV=0 Scarlett 18i20 USB, USB Audio 5.1 Surround output to Front, Center, Rear and Subwoofer speakers surround71:CARD=USB,DEV=0 Scarlett 18i20 USB, USB Audio 7.1 Surround output to Front, Center, Side, Rear and Woofer speakers iec958:CARD=USB,DEV=0 Scarlett 18i20 USB, USB Audio IEC958 (S/PDIF) Digital Audio Output dmix:CARD=USB,DEV=0 Scarlett 18i20 USB, USB Audio Direct sample mixing device usbstream:CARD=USB Scarlett 18i20 USB USB Stream Output Issue URL : https://github.com/alsa-project/alsa-topology-conf/issues/2 Repository URL: https://github.com/alsa-project/alsa-topology-conf

1 0

Scarlett 18i20 USB, USB Audio
by GitHub issues - opened 05 Jul '22

05 Jul '22

alsa-project/alsa-topology-conf issue #2 was opened from juanpc2018: Problems: $ alsamixer does Not allow to change SampleRate, only clock source. Focusrite Scarlett 18i20mk2 USB, USB Audio has a Control Software only for OSX and Windows. works in Wine/PlayOnMac, but does Not detect the USB device. sometimes even the Control Software also does Not detect the USB in OSX or Windows. anyway... i go to OSX, change the Sample Rate. 96khz, reboot and go back to Kubuntu 21.10, Kubuntu changes the SR to 44.1Khz at boot, problems #2. SampleRateConverter does Not work well, if i play a 48khz file in VLC, does Not play in 44.1Khz SR. jackd2 can change SampleRate No problems. VLC has jack output, but Firefox does Not, unless compied from source with the option in config anyway.. need to create: /etc/asound.conf $ aplay -L hw:CARD=USB,DEV=0 Scarlett 18i20 USB, USB Audio Direct hardware device without any conversions plughw:CARD=USB,DEV=0 Scarlett 18i20 USB, USB Audio Hardware device with all software conversions sysdefault:CARD=USB Scarlett 18i20 USB, USB Audio Default Audio Device front:CARD=USB,DEV=0 Scarlett 18i20 USB, USB Audio Front output / input surround21:CARD=USB,DEV=0 Scarlett 18i20 USB, USB Audio 2.1 Surround output to Front and Subwoofer speakers surround40:CARD=USB,DEV=0 Scarlett 18i20 USB, USB Audio 4.0 Surround output to Front and Rear speakers surround41:CARD=USB,DEV=0 Scarlett 18i20 USB, USB Audio 4.1 Surround output to Front, Rear and Subwoofer speakers surround50:CARD=USB,DEV=0 Scarlett 18i20 USB, USB Audio 5.0 Surround output to Front, Center and Rear speakers surround51:CARD=USB,DEV=0 Scarlett 18i20 USB, USB Audio 5.1 Surround output to Front, Center, Rear and Subwoofer speakers surround71:CARD=USB,DEV=0 Scarlett 18i20 USB, USB Audio 7.1 Surround output to Front, Center, Side, Rear and Woofer speakers iec958:CARD=USB,DEV=0 Scarlett 18i20 USB, USB Audio IEC958 (S/PDIF) Digital Audio Output dmix:CARD=USB,DEV=0 Scarlett 18i20 USB, USB Audio Direct sample mixing device usbstream:CARD=USB Scarlett 18i20 USB USB Stream Output Issue URL : https://github.com/alsa-project/alsa-topology-conf/issues/2 Repository URL: https://github.com/alsa-project/alsa-topology-conf

1 0

[PATCH] ALSA: usb-audio: Add endianness annotations
by Jan Schär 05 Jul '22

05 Jul '22

Fixes: 4b8ea38fabab ("ALSA: usb-audio: Support jack detection on Dell dock") Reported-by: kernel test robot <lkp(a)intel.com> Link: https://lore.kernel.org/r/202207051932.qUilU0am-lkp@intel.com Signed-off-by: Jan Schär <jan(a)jschaer.ch> --- sound/usb/mixer_quirks.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c index 5a45822e60e7..c06d6dfa8139 100644 --- a/sound/usb/mixer_quirks.c +++ b/sound/usb/mixer_quirks.c @@ -1967,7 +1967,7 @@ static int snd_soundblaster_e1_switch_create(struct usb_mixer_interface *mixer) static int realtek_hda_set(struct snd_usb_audio *chip, u32 cmd) { struct usb_device *dev = chip->dev; - u32 buf = cpu_to_be32(cmd); + __be32 buf = cpu_to_be32(cmd); return snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), REALTEK_HDA_SET, USB_RECIP_DEVICE | USB_TYPE_VENDOR | USB_DIR_OUT, @@ -1978,7 +1978,7 @@ static int realtek_hda_get(struct snd_usb_audio *chip, u32 cmd, u32 *value) { struct usb_device *dev = chip->dev; int err; - u32 buf = cpu_to_be32(cmd); + __be32 buf = cpu_to_be32(cmd); err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), REALTEK_HDA_GET_OUT, USB_RECIP_DEVICE | USB_TYPE_VENDOR | USB_DIR_OUT, base-commit: 2ef9868fff184a6246d2f71190be108a71aa2faa -- 2.32.0

2 1

[PATCH 1/2] ASoC: rt5640: Fix the wrong state of JD1 and JD2
by Oder Chiou 05 Jul '22

05 Jul '22

The patch fixes the wrong state of JD1 and JD2 while the bst1 or bst2 is power on in the HDA JD using. Signed-off-by: Oder Chiou <oder_chiou(a)realtek.com> Reported-by: Sameer Pujar <spujar(a)nvidia.com> --- sound/soc/codecs/rt5640.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index 56008e4518f3..19bdb6d0f5a9 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -1984,7 +1984,12 @@ static int rt5640_set_bias_level(struct snd_soc_component *component, snd_soc_component_write(component, RT5640_PWR_DIG2, 0x0000); snd_soc_component_write(component, RT5640_PWR_VOL, 0x0000); snd_soc_component_write(component, RT5640_PWR_MIXER, 0x0000); - snd_soc_component_write(component, RT5640_PWR_ANLG1, 0x0000); + if (rt5640->jd_src == RT5640_JD_SRC_HDA_HEADER) + snd_soc_component_write(component, RT5640_PWR_ANLG1, + 0x0018); + else + snd_soc_component_write(component, RT5640_PWR_ANLG1, + 0x0000); snd_soc_component_write(component, RT5640_PWR_ANLG2, 0x0000); break; @@ -2393,9 +2398,15 @@ static void rt5640_jack_work(struct work_struct *work) static irqreturn_t rt5640_irq(int irq, void *data) { struct rt5640_priv *rt5640 = data; + int delay = 0; + + if (rt5640->jd_src == RT5640_JD_SRC_HDA_HEADER) { + cancel_delayed_work_sync(&rt5640->jack_work); + delay = 100; + } if (rt5640->jack) - queue_delayed_work(system_long_wq, &rt5640->jack_work, 0); + queue_delayed_work(system_long_wq, &rt5640->jack_work, delay); return IRQ_HANDLED; } @@ -2580,6 +2591,12 @@ static void rt5640_enable_hda_jack_detect( snd_soc_component_update_bits(component, RT5640_DUMMY1, 0x400, 0x0); + snd_soc_component_update_bits(component, RT5640_PWR_ANLG1, + RT5640_PWR_VREF2, RT5640_PWR_VREF2); + usleep_range(10000, 15000); + snd_soc_component_update_bits(component, RT5640_PWR_ANLG1, + RT5640_PWR_FV2, RT5640_PWR_FV2); + rt5640->jack = jack; ret = request_irq(rt5640->irq, rt5640_irq, @@ -2696,16 +2713,13 @@ static int rt5640_probe(struct snd_soc_component *component) if (device_property_read_u32(component->dev, "realtek,jack-detect-source", &val) == 0) { - if (val <= RT5640_JD_SRC_GPIO4) { + if (val <= RT5640_JD_SRC_GPIO4) rt5640->jd_src = val << RT5640_JD_SFT; - } else if (val == RT5640_JD_SRC_HDA_HEADER) { + else if (val == RT5640_JD_SRC_HDA_HEADER) rt5640->jd_src = RT5640_JD_SRC_HDA_HEADER; - snd_soc_component_update_bits(component, RT5640_DUMMY1, - 0x0300, 0x0); - } else { + else dev_warn(component->dev, "Warning: Invalid jack-detect-source value: %d, leaving jack-detect disabled\n", val); - } } if (!device_property_read_bool(component->dev, "realtek,jack-detect-not-inverted")) -- 2.37.0

2 2

[PATCH v2 1/1] ASoC: Intel: catpt: remove duplicating driver data retrieval
by Andy Shevchenko 05 Jul '22

05 Jul '22

device_get_match_data() in ACPI case calls similar to acpi_match_device(). Hence there is no need to duplicate the call. Just assign what is in the id->driver_data. Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- v2: dropped device_get_match_data() and rewrote commit message sound/soc/intel/catpt/device.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sound/soc/intel/catpt/device.c b/sound/soc/intel/catpt/device.c index 85a34e37316d..2eeaeb962532 100644 --- a/sound/soc/intel/catpt/device.c +++ b/sound/soc/intel/catpt/device.c @@ -247,6 +247,7 @@ static int catpt_acpi_probe(struct platform_device *pdev) id = acpi_match_device(dev->driver->acpi_match_table, dev); if (!id) return -ENODEV; + spec = (const struct catpt_spec *)id->driver_data; ret = snd_intel_acpi_dsp_driver_probe(dev, id->id); if (ret != SND_INTEL_DSP_DRIVER_ANY && ret != SND_INTEL_DSP_DRIVER_SST) { @@ -254,10 +255,6 @@ static int catpt_acpi_probe(struct platform_device *pdev) return -ENODEV; } - spec = device_get_match_data(dev); - if (!spec) - return -ENODEV; - cdev = devm_kzalloc(dev, sizeof(*cdev), GFP_KERNEL); if (!cdev) return -ENOMEM; -- 2.35.1

3 3

[PATCH v2 00/14] ASoC: Intel: avs: Machine boards and HDA codec support
by Cezary Rojewski 05 Jul '22

05 Jul '22

This series focuses on populating boards/ subdirectory with supported configurations by the avs-driver. Note: it is independent of recently provided "Driver code and PCM operations" series [1], that is, code found here should not collide with it. Series starts with a small change that adds a helper to sound pcm header, allowing for retrieving string naming a direction without the need of substream pointer. Said helper is used by codec driver code that follows it but I believe it's generic and helpful enough that it can be called an independent addition to the sound core. Code for generic HD-Audio codec driver follows. It is a ASoC wrapper for existing HD-Audio codec code found in sound/pci/hda/. There is basically no custom logic involved up to the point that driver follows HDA_DEV_LEGACY convention, rather than the HDA_DEV_ASOC one. Commit message for the given patch iterates on this and explains crucial parts of the implementation. >From there on is a range of boards appended. All of them follow the same scheme: - define avs_create_dai_link() so DAI-LINKs can be created dynamically, based on the link_mask (I2S) or the number of entries in the ->pcm_list_head list (HDA) - define avs_create_dapm_routes() so DAPM routes can be created dynamically, same rules as above apply - define probe() function that creates new ASoC card, assign all required operations and resources along with calling the two above Changes in v2: - 'link_mask' usage replaced with 'i2s_link_mask' as requested by Pierre - 'ssp_test' board renamed to 'i2s_test' to match naming convention used for other i2s machine boards - enriched commit message and Kconfig for the 'HD-Audio codec driver' patch as requested by Kai [1]: https://lore.kernel.org/all/20220426172346.3508411-1-cezary.rojewski@intel.… Amadeusz Sławiński (1): ASoC: Intel: avs: Add max98373 machine board Cezary Rojewski (13): ALSA: Add snd_pcm_direction_name() helper ASoC: codecs: Add HD-Audio codec driver ASoC: Intel: avs: Add HDAudio machine board ASoC: Intel: avs: Add DMIC machine board ASoC: Intel: avs: Add I2S-test machine board ASoC: Intel: avs: Add rt274 machine board ASoC: Intel: avs: Add rt286 machine board ASoC: Intel: avs: Add rt298 machine board ASoC: Intel: avs: Add rt5682 machine board ASoC: Intel: avs: Add nau8825 machine board ASoC: Intel: avs: Add ssm4567 machine board ASoC: Intel: avs: Add max98357a machine board ASoC: Intel: avs: Add da7219 machine board include/sound/pcm.h | 19 +- sound/soc/codecs/Kconfig | 10 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/hda-dai.c | 102 +++++++ sound/soc/codecs/hda.c | 395 +++++++++++++++++++++++++ sound/soc/codecs/hda.h | 19 ++ sound/soc/intel/Kconfig | 3 + sound/soc/intel/avs/Makefile | 3 + sound/soc/intel/avs/boards/Kconfig | 121 ++++++++ sound/soc/intel/avs/boards/Makefile | 27 ++ sound/soc/intel/avs/boards/da7219.c | 282 ++++++++++++++++++ sound/soc/intel/avs/boards/dmic.c | 93 ++++++ sound/soc/intel/avs/boards/hdaudio.c | 294 ++++++++++++++++++ sound/soc/intel/avs/boards/i2s_test.c | 180 +++++++++++ sound/soc/intel/avs/boards/max98357a.c | 154 ++++++++++ sound/soc/intel/avs/boards/max98373.c | 239 +++++++++++++++ sound/soc/intel/avs/boards/nau8825.c | 353 ++++++++++++++++++++++ sound/soc/intel/avs/boards/rt274.c | 310 +++++++++++++++++++ sound/soc/intel/avs/boards/rt286.c | 281 ++++++++++++++++++ sound/soc/intel/avs/boards/rt298.c | 281 ++++++++++++++++++ sound/soc/intel/avs/boards/rt5682.c | 340 +++++++++++++++++++++ sound/soc/intel/avs/boards/ssm4567.c | 271 +++++++++++++++++ 22 files changed, 3775 insertions(+), 4 deletions(-) create mode 100644 sound/soc/codecs/hda-dai.c create mode 100644 sound/soc/codecs/hda.c create mode 100644 sound/soc/codecs/hda.h create mode 100644 sound/soc/intel/avs/boards/Kconfig create mode 100644 sound/soc/intel/avs/boards/Makefile create mode 100644 sound/soc/intel/avs/boards/da7219.c create mode 100644 sound/soc/intel/avs/boards/dmic.c create mode 100644 sound/soc/intel/avs/boards/hdaudio.c create mode 100644 sound/soc/intel/avs/boards/i2s_test.c create mode 100644 sound/soc/intel/avs/boards/max98357a.c create mode 100644 sound/soc/intel/avs/boards/max98373.c create mode 100644 sound/soc/intel/avs/boards/nau8825.c create mode 100644 sound/soc/intel/avs/boards/rt274.c create mode 100644 sound/soc/intel/avs/boards/rt286.c create mode 100644 sound/soc/intel/avs/boards/rt298.c create mode 100644 sound/soc/intel/avs/boards/rt5682.c create mode 100644 sound/soc/intel/avs/boards/ssm4567.c -- 2.25.1

3 19

Re: [PATCH 6/6] i2c: Make remove callback return void
by Jean Delvare 05 Jul '22

05 Jul '22

On Tue, 28 Jun 2022 16:03:12 +0200, Uwe Kleine-König wrote: > From: Uwe Kleine-König <uwe(a)kleine-koenig.org> > > The value returned by an i2c driver's remove function is mostly ignored. > (Only an error message is printed if the value is non-zero that the > error is ignored.) > > So change the prototype of the remove function to return no value. This > way driver authors are not tempted to assume that passing an error to > the upper layer is a good idea. All drivers are adapted accordingly. > There is no intended change of behaviour, all callbacks were prepared to > return 0 before. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> > --- That's a huge change for a relatively small benefit, but if this is approved by the I2C core maintainer then fine with me. For: > drivers/hwmon/adc128d818.c | 4 +--- > drivers/hwmon/adt7470.c | 3 +-- > drivers/hwmon/asb100.c | 6 ++---- > drivers/hwmon/asc7621.c | 4 +--- > drivers/hwmon/dme1737.c | 4 +--- > drivers/hwmon/f75375s.c | 5 ++--- > drivers/hwmon/fschmd.c | 6 ++---- > drivers/hwmon/ftsteutates.c | 3 +-- > drivers/hwmon/ina209.c | 4 +--- > drivers/hwmon/ina3221.c | 4 +--- > drivers/hwmon/jc42.c | 3 +-- > drivers/hwmon/mcp3021.c | 4 +--- > drivers/hwmon/occ/p8_i2c.c | 4 +--- > drivers/hwmon/pcf8591.c | 3 +-- > drivers/hwmon/smm665.c | 3 +-- > drivers/hwmon/tps23861.c | 4 +--- > drivers/hwmon/w83781d.c | 4 +--- > drivers/hwmon/w83791d.c | 6 ++---- > drivers/hwmon/w83792d.c | 6 ++---- > drivers/hwmon/w83793.c | 6 ++---- > drivers/hwmon/w83795.c | 4 +--- > drivers/hwmon/w83l785ts.c | 6 ++---- > drivers/i2c/i2c-core-base.c | 6 +----- > drivers/i2c/i2c-slave-eeprom.c | 4 +--- > drivers/i2c/i2c-slave-testunit.c | 3 +-- > drivers/i2c/i2c-smbus.c | 3 +-- > drivers/i2c/muxes/i2c-mux-ltc4306.c | 4 +--- > drivers/i2c/muxes/i2c-mux-pca9541.c | 3 +-- > drivers/i2c/muxes/i2c-mux-pca954x.c | 3 +-- Reviewed-by: Jean Delvare <jdelvare(a)suse.de> -- Jean Delvare SUSE L3 Support

2 1

[PATCH] ALSA: hda/cs8409: change cs8409_fixups v.pins initializers to static
by Tom Rix 05 Jul '22

05 Jul '22

sparse reports sound/pci/hda/patch_cs8409-tables.c:79:25: warning: symbol 'cs8409_cs42l42_pincfgs_no_dmic' was not declared. Should it be static? cs8409_cs42l42_pincfgs_no_dmic is only used by cs8409_fixups table as an initializer for the hda_fixup element v.pins. Both are defined in the patch_cs8408-table.c file but only cs8409_fixups is used externally in patch_cs8409.c. So cs8409_cs42l42_pincfgs_no_dmic should have a static storage class specifier. The other v.pins initializers in cs8409_fixups table, though declared extern in patch_cs8409.h are also only used in patch_cs8409-tables.c. So change all the v.pins initializers to static. Fixes: 9e7647b5070f ("ALSA: hda/cs8409: Move arrays of configuration to a new file") Signed-off-by: Tom Rix <trix(a)redhat.com> --- sound/pci/hda/patch_cs8409-tables.c | 6 +++--- sound/pci/hda/patch_cs8409.h | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/sound/pci/hda/patch_cs8409-tables.c b/sound/pci/hda/patch_cs8409-tables.c index 4f4cc8215917..e0d3a8be2e38 100644 --- a/sound/pci/hda/patch_cs8409-tables.c +++ b/sound/pci/hda/patch_cs8409-tables.c @@ -68,7 +68,7 @@ const struct hda_verb cs8409_cs42l42_init_verbs[] = { {} /* terminator */ }; -const struct hda_pintbl cs8409_cs42l42_pincfgs[] = { +static const struct hda_pintbl cs8409_cs42l42_pincfgs[] = { { CS8409_PIN_ASP1_TRANSMITTER_A, 0x042120f0 }, /* ASP-1-TX */ { CS8409_PIN_ASP1_RECEIVER_A, 0x04a12050 }, /* ASP-1-RX */ { CS8409_PIN_ASP2_TRANSMITTER_A, 0x901000f0 }, /* ASP-2-TX */ @@ -76,7 +76,7 @@ const struct hda_pintbl cs8409_cs42l42_pincfgs[] = { {} /* terminator */ }; -const struct hda_pintbl cs8409_cs42l42_pincfgs_no_dmic[] = { +static const struct hda_pintbl cs8409_cs42l42_pincfgs_no_dmic[] = { { CS8409_PIN_ASP1_TRANSMITTER_A, 0x042120f0 }, /* ASP-1-TX */ { CS8409_PIN_ASP1_RECEIVER_A, 0x04a12050 }, /* ASP-1-RX */ { CS8409_PIN_ASP2_TRANSMITTER_A, 0x901000f0 }, /* ASP-2-TX */ @@ -279,7 +279,7 @@ const struct hda_verb dolphin_init_verbs[] = { {} /* terminator */ }; -const struct hda_pintbl dolphin_pincfgs[] = { +static const struct hda_pintbl dolphin_pincfgs[] = { { 0x24, 0x022210f0 }, /* ASP-1-TX-A */ { 0x25, 0x010240f0 }, /* ASP-1-TX-B */ { 0x34, 0x02a21050 }, /* ASP-1-RX */ diff --git a/sound/pci/hda/patch_cs8409.h b/sound/pci/hda/patch_cs8409.h index 260388a6256c..2a8dfb4ff046 100644 --- a/sound/pci/hda/patch_cs8409.h +++ b/sound/pci/hda/patch_cs8409.h @@ -358,13 +358,11 @@ extern const struct snd_pci_quirk cs8409_fixup_tbl[]; extern const struct hda_model_fixup cs8409_models[]; extern const struct hda_fixup cs8409_fixups[]; extern const struct hda_verb cs8409_cs42l42_init_verbs[]; -extern const struct hda_pintbl cs8409_cs42l42_pincfgs[]; extern const struct cs8409_cir_param cs8409_cs42l42_hw_cfg[]; extern const struct cs8409_cir_param cs8409_cs42l42_bullseye_atn[]; extern struct sub_codec cs8409_cs42l42_codec; extern const struct hda_verb dolphin_init_verbs[]; -extern const struct hda_pintbl dolphin_pincfgs[]; extern const struct cs8409_cir_param dolphin_hw_cfg[]; extern struct sub_codec dolphin_cs42l42_0; extern struct sub_codec dolphin_cs42l42_1; -- 2.27.0

2 1