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

[PATCH 1/2] ALSA: emu10k1: clean up driver status comments
by Oswald Buddenhagen 17 Jul '23

17 Jul '23

Empty BUGS and TODO sections don't really help anyone, so remove them. Version information is chronically outdated, and not really useful in a git world anyway, so remove it as well. Also remove duplicated (and outdated, of course) status section from p16v.h (the one in p16v.c is in better shape). Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen(a)gmx.de> --- sound/pci/emu10k1/emu10k1_main.c | 6 ---- sound/pci/emu10k1/emufx.c | 6 ---- sound/pci/emu10k1/emumixer.c | 6 ---- sound/pci/emu10k1/emupcm.c | 6 ---- sound/pci/emu10k1/emuproc.c | 6 ---- sound/pci/emu10k1/io.c | 6 ---- sound/pci/emu10k1/irq.c | 6 ---- sound/pci/emu10k1/p16v.h | 56 -------------------------------- sound/pci/emu10k1/p17v.h | 1 - sound/pci/emu10k1/timer.c | 6 ---- sound/pci/emu10k1/tina2.h | 1 - sound/pci/emu10k1/voice.c | 6 ---- 12 files changed, 112 deletions(-) diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index a11fcba4b9af..529d0bba87da 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c @@ -8,12 +8,6 @@ * Added support for Audigy 2 Value. * Added EMU 1010 support. * General bug fixes and enhancements. - * - * BUGS: - * -- - * - * TODO: - * -- */ #include <linux/sched.h> diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c index 9904bcfee106..e0ad339c5bbf 100644 --- a/sound/pci/emu10k1/emufx.c +++ b/sound/pci/emu10k1/emufx.c @@ -6,12 +6,6 @@ * * Copyright (c) by James Courtier-Dutton <James(a)superbug.co.uk> * Added EMU 1010 support. - * - * BUGS: - * -- - * - * TODO: - * -- */ #include <linux/pci.h> diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c index 9a94f08f2463..6ff59c44da36 100644 --- a/sound/pci/emu10k1/emumixer.c +++ b/sound/pci/emu10k1/emumixer.c @@ -8,12 +8,6 @@ * * Copyright (c) by James Courtier-Dutton <James(a)superbug.co.uk> * Added EMU 1010 support. - * - * BUGS: - * -- - * - * TODO: - * -- */ #include <linux/time.h> diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c index 8b3d1b35d6e7..7a1d448f0656 100644 --- a/sound/pci/emu10k1/emupcm.c +++ b/sound/pci/emu10k1/emupcm.c @@ -4,12 +4,6 @@ * Creative Labs, Inc. * Routines for control of EMU10K1 chips / PCM routines * Multichannel PCM support Copyright (c) Lee Revell <rlrevell(a)joe-job.com> - * - * BUGS: - * -- - * - * TODO: - * -- */ #include <linux/pci.h> diff --git a/sound/pci/emu10k1/emuproc.c b/sound/pci/emu10k1/emuproc.c index 5533277e4d47..39b422297c70 100644 --- a/sound/pci/emu10k1/emuproc.c +++ b/sound/pci/emu10k1/emuproc.c @@ -6,12 +6,6 @@ * * Copyright (c) by James Courtier-Dutton <James(a)superbug.co.uk> * Added EMU 1010 support. - * - * BUGS: - * -- - * - * TODO: - * -- */ #include <linux/slab.h> diff --git a/sound/pci/emu10k1/io.c b/sound/pci/emu10k1/io.c index c695cb863e5e..7e4483c5bd2a 100644 --- a/sound/pci/emu10k1/io.c +++ b/sound/pci/emu10k1/io.c @@ -3,12 +3,6 @@ * Copyright (c) by Jaroslav Kysela <perex(a)perex.cz> * Creative Labs, Inc. * Routines for control of EMU10K1 chips - * - * BUGS: - * -- - * - * TODO: - * -- */ #include <linux/time.h> diff --git a/sound/pci/emu10k1/irq.c b/sound/pci/emu10k1/irq.c index 8573248dd799..71aa90b9cc88 100644 --- a/sound/pci/emu10k1/irq.c +++ b/sound/pci/emu10k1/irq.c @@ -3,12 +3,6 @@ * Copyright (c) by Jaroslav Kysela <perex(a)perex.cz> * Creative Labs, Inc. * Routines for IRQ control of EMU10K1 chips - * - * BUGS: - * -- - * - * TODO: - * -- */ #include <linux/time.h> diff --git a/sound/pci/emu10k1/p16v.h b/sound/pci/emu10k1/p16v.h index 9d429ad1feff..95ab8071751b 100644 --- a/sound/pci/emu10k1/p16v.h +++ b/sound/pci/emu10k1/p16v.h @@ -2,62 +2,6 @@ /* * Copyright (c) by James Courtier-Dutton <James(a)superbug.demon.co.uk> * Driver p16v chips - * Version: 0.21 - * - * FEATURES currently supported: - * Output fixed at S32_LE, 2 channel to hw:0,0 - * Rates: 44.1, 48, 96, 192. - * - * Changelog: - * 0.8 - * Use separate card based buffer for periods table. - * 0.9 - * Use 2 channel output streams instead of 8 channel. - * (8 channel output streams might be good for ASIO type output) - * Corrected speaker output, so Front -> Front etc. - * 0.10 - * Fixed missed interrupts. - * 0.11 - * Add Sound card model number and names. - * Add Analog volume controls. - * 0.12 - * Corrected playback interrupts. Now interrupt per period, instead of half period. - * 0.13 - * Use single trigger for multichannel. - * 0.14 - * Mic capture now works at fixed: S32_LE, 96000Hz, Stereo. - * 0.15 - * Force buffer_size / period_size == INTEGER. - * 0.16 - * Update p16v.c to work with changed alsa api. - * 0.17 - * Update p16v.c to work with changed alsa api. Removed boot_devs. - * 0.18 - * Merging with snd-emu10k1 driver. - * 0.19 - * One stereo channel at 24bit now works. - * 0.20 - * Added better register defines. - * 0.21 - * Split from p16v.c - * - * BUGS: - * Some stability problems when unloading the snd-p16v kernel module. - * -- - * - * TODO: - * SPDIF out. - * Find out how to change capture sample rates. E.g. To record SPDIF at 48000Hz. - * Currently capture fixed at 48000Hz. - * - * -- - * GENERAL INFO: - * Model: SB0240 - * P16V Chip: CA0151-DBS - * Audigy 2 Chip: CA0102-IAT - * AC97 Codec: STAC 9721 - * ADC: Philips 1361T (Stereo 24bit) - * DAC: CS4382-K (8-channel, 24bit, 192Khz) * * This code was initially based on code from ALSA's emu10k1x.c which is: * Copyright (c) by Francisco Moraes <fmoraes(a)nc.rr.com> diff --git a/sound/pci/emu10k1/p17v.h b/sound/pci/emu10k1/p17v.h index d4ada1c430c8..ee4f4ab4b79c 100644 --- a/sound/pci/emu10k1/p17v.h +++ b/sound/pci/emu10k1/p17v.h @@ -2,7 +2,6 @@ /* * Copyright (c) by James Courtier-Dutton <James(a)superbug.demon.co.uk> * Driver p17v chips - * Version: 0.01 */ /******************************************************************************/ diff --git a/sound/pci/emu10k1/timer.c b/sound/pci/emu10k1/timer.c index f3c78adf3248..8798604e7f98 100644 --- a/sound/pci/emu10k1/timer.c +++ b/sound/pci/emu10k1/timer.c @@ -3,12 +3,6 @@ * Copyright (c) by Lee Revell <rlrevell(a)joe-job.com> * Clemens Ladisch <clemens(a)ladisch.de> * Routines for control of EMU10K1 chips - * - * BUGS: - * -- - * - * TODO: - * -- */ #include <linux/time.h> diff --git a/sound/pci/emu10k1/tina2.h b/sound/pci/emu10k1/tina2.h index 7fd235345292..e3fcb290271c 100644 --- a/sound/pci/emu10k1/tina2.h +++ b/sound/pci/emu10k1/tina2.h @@ -2,7 +2,6 @@ /* * Copyright (c) by James Courtier-Dutton <James(a)superbug.demon.co.uk> * Driver tina2 chips - * Version: 0.1 */ /********************************************************************************************************/ diff --git a/sound/pci/emu10k1/voice.c b/sound/pci/emu10k1/voice.c index 6939498e26f0..ffe87f359a0e 100644 --- a/sound/pci/emu10k1/voice.c +++ b/sound/pci/emu10k1/voice.c @@ -6,12 +6,6 @@ * Routines for control of EMU10K1 chips - voice manager * * Rewrote voice allocator for multichannel support - rlrevell 12/2004 - * - * BUGS: - * -- - * - * TODO: - * -- */ #include <linux/time.h> -- 2.40.0.152.g15d061e6df

2 2

[PATCH v3] ALSA: emu10k1: set the "no filtering" bits on PCM voices on Audigy
by Oswald Buddenhagen 17 Jul '23

17 Jul '23

Given that the filter is already set to neutral for PCM voices, the only observable effect is that the Z1/Z2/FXBUS registers don't have a stray bit set for negative numbers anymore. The bit is below the ones significant for output, but it would mess with 32-bit sample recombination, which we intend to add. kX-project does that, but I had to figure out myself why. Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen(a)gmx.de> --- v3: - simplify, as this is actually unrelated to the interpolator --- include/sound/emu10k1.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h index 43c097952c3c..ef948e45b4c6 100644 --- a/include/sound/emu10k1.h +++ b/include/sound/emu10k1.h @@ -902,6 +902,11 @@ SUB_REG_NC(A_EHC, A_I2S_CAPTURE_RATE, 0x00000e00) /* This sets the capture PCM #define A_TTDA 0x7a /* Tank Table DMA Address */ #define A_TTDD 0x7b /* Tank Table DMA Data */ +// In A_FXRT1 & A_FXRT2, the 0x80 bit of each byte completely disables the +// filter (CVCF_CURRENTFILTER) for the corresponding channel. There is no +// effect on the volume (CVCF_CURRENTVOLUME) or the interpolator's filter +// (CCCA_INTERPROM_MASK). + #define A_FXRT2 0x7c #define A_FXRT_CHANNELE 0x0000003f /* Effects send bus number for channel's effects send E */ #define A_FXRT_CHANNELF 0x00003f00 /* Effects send bus number for channel's effects send F */ @@ -914,8 +919,6 @@ SUB_REG_NC(A_EHC, A_I2S_CAPTURE_RATE, 0x00000e00) /* This sets the capture PCM #define A_FXSENDAMOUNT_G_MASK 0x0000FF00 #define A_FXSENDAMOUNT_H_MASK 0x000000FF -/* 0x7c, 0x7e "high bit is used for filtering" */ - /* The send amounts for this one are the same as used with the emu10k1 */ #define A_FXRT1 0x7e #define A_FXRT_CHANNELA 0x0000003f @@ -1523,10 +1526,10 @@ struct snd_emu10k1_pcm_mixer { ((route[0] | (route[1] << 4) | (route[2] << 8) | (route[3] << 12)) << 16) #define snd_emu10k1_compose_audigy_fxrt1(route) \ -((unsigned int)route[0] | ((unsigned int)route[1] << 8) | ((unsigned int)route[2] << 16) | ((unsigned int)route[3] << 24)) +((unsigned int)route[0] | ((unsigned int)route[1] << 8) | ((unsigned int)route[2] << 16) | ((unsigned int)route[3] << 24) | 0x80808080) #define snd_emu10k1_compose_audigy_fxrt2(route) \ -((unsigned int)route[4] | ((unsigned int)route[5] << 8) | ((unsigned int)route[6] << 16) | ((unsigned int)route[7] << 24)) +((unsigned int)route[4] | ((unsigned int)route[5] << 8) | ((unsigned int)route[6] << 16) | ((unsigned int)route[7] << 24) | 0x80808080) #define snd_emu10k1_compose_audigy_sendamounts(vol) \ (((unsigned int)vol[4] << 24) | ((unsigned int)vol[5] << 16) | ((unsigned int)vol[6] << 8) | (unsigned int)vol[7]) -- 2.40.0.152.g15d061e6df

2 1

[PATCH v2] ALSA: emu10k1: track loss of external clock on E-MU cards
by Oswald Buddenhagen 17 Jul '23

17 Jul '23

This uses IRQs to track spontaneous changes to the word clock source register. FWIW, that this can happen in the first place is the reason why it is futile to lock the clock source mixer setting while the device is open - we can't consistently control the rate anyway. Though arguably, we should reset any open streams when that happens, as they become corrupted anyway. Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen(a)gmx.de> --- v2: - use driver-local lock instead of core's control_rwsem --- FIXME? while i'm not sure, i think this won't notice seamless switches between 44.1 and 48 kHz. assuming that's the case, this seems like a minor issue: firstly, just about nothing actually produces such a seamless switch - my only device that can even do that is the e-mu card itself, but the driver disrupts that by temporarily muting the output. secondly, the user is unlikely to select an external source before setting it up properly. and the easy workaround is actually never doing that. regardless, to actually test that i'd need a second e-mu card. --- include/sound/emu10k1.h | 5 +++++ sound/pci/emu10k1/emu10k1.c | 1 + sound/pci/emu10k1/emu10k1_main.c | 30 +++++++++++++++++++++++++++++- sound/pci/emu10k1/emumixer.c | 12 ++++++++---- 4 files changed, 43 insertions(+), 5 deletions(-) diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h index 43c097952c3c..7c55a8244747 100644 --- a/include/sound/emu10k1.h +++ b/include/sound/emu10k1.h @@ -992,6 +992,9 @@ SUB_REG_NC(A_EHC, A_I2S_CAPTURE_RATE, 0x00000e00) /* This sets the capture PCM #define EMU_HANA_WCLOCK_4X 0x10 #define EMU_HANA_WCLOCK_MULT_RESERVED 0x18 +// If the selected external clock source is/becomes invalid or incompatible +// with the clock multiplier, the clock source is reset to this value, and +// a WCLK_CHANGED interrupt is raised. #define EMU_HANA_DEFCLOCK 0x06 /* 000000x 1 bits Default Word Clock */ #define EMU_HANA_DEFCLOCK_48K 0x00 #define EMU_HANA_DEFCLOCK_44_1K 0x01 @@ -1679,6 +1682,7 @@ struct snd_emu1010 { unsigned int optical_in; /* 0:SPDIF, 1:ADAT */ unsigned int optical_out; /* 0:SPDIF, 1:ADAT */ struct work_struct firmware_work; + struct work_struct clock_work; }; struct snd_emu10k1 { @@ -1753,6 +1757,7 @@ struct snd_emu10k1 { struct snd_kcontrol *ctl_efx_send_routing; struct snd_kcontrol *ctl_efx_send_volume; struct snd_kcontrol *ctl_efx_attn; + struct snd_kcontrol *ctl_clock_source; void (*hwvol_interrupt)(struct snd_emu10k1 *emu, unsigned int status); void (*capture_interrupt)(struct snd_emu10k1 *emu, unsigned int status); diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c index 1a13c086e86c..421053569aa0 100644 --- a/sound/pci/emu10k1/emu10k1.c +++ b/sound/pci/emu10k1/emu10k1.c @@ -192,6 +192,7 @@ static int snd_emu10k1_suspend(struct device *dev) emu->suspend = 1; cancel_work_sync(&emu->emu1010.firmware_work); + cancel_work_sync(&emu->emu1010.clock_work); snd_ac97_suspend(emu->ac97); diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index a11fcba4b9af..604645bfc908 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c @@ -789,6 +789,30 @@ static void emu1010_firmware_work(struct work_struct *work) } } +static void emu1010_clock_work(struct work_struct *work) +{ + struct snd_emu10k1 *emu; + struct snd_ctl_elem_id id; + + emu = container_of(work, struct snd_emu10k1, + emu1010.clock_work); + if (emu->card->shutdown) + return; +#ifdef CONFIG_PM_SLEEP + if (emu->suspend) + return; +#endif + + spin_lock_irq(&emu->reg_lock); + // This is the only thing that can actually happen. + emu->emu1010.clock_source = emu->emu1010.clock_fallback; + emu->emu1010.wclock = 1 - emu->emu1010.clock_source; + snd_emu1010_update_clock(emu); + spin_unlock_irq(&emu->reg_lock); + snd_ctl_build_ioff(&id, emu->ctl_clock_source, 0); + snd_ctl_notify(emu->card, SNDRV_CTL_EVENT_MASK_VALUE, &id); +} + static void emu1010_interrupt(struct snd_emu10k1 *emu) { u32 sts; @@ -802,6 +826,8 @@ static void emu1010_interrupt(struct snd_emu10k1 *emu) } else if (sts & EMU_HANA_IRQ_DOCK) { schedule_work(&emu->emu1010.firmware_work); } + if (sts & EMU_HANA_IRQ_WCLK_CHANGED) + schedule_work(&emu->emu1010.clock_work); } /* @@ -901,7 +927,7 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu) emu->gpio_interrupt = emu1010_interrupt; // Note: The Audigy INTE is set later snd_emu1010_fpga_write(emu, EMU_HANA_IRQ_ENABLE, - EMU_HANA_IRQ_DOCK | EMU_HANA_IRQ_DOCK_LOST); + EMU_HANA_IRQ_DOCK | EMU_HANA_IRQ_DOCK_LOST | EMU_HANA_IRQ_WCLK_CHANGED); snd_emu1010_fpga_read(emu, EMU_HANA_IRQ_STATUS, &reg); // Clear pending IRQs emu->emu1010.clock_source = 1; /* 48000 */ @@ -943,6 +969,7 @@ static void snd_emu10k1_free(struct snd_card *card) snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_PWR, 0); } cancel_work_sync(&emu->emu1010.firmware_work); + cancel_work_sync(&emu->emu1010.clock_work); release_firmware(emu->firmware); release_firmware(emu->dock_fw); snd_util_memhdr_free(emu->memhdr); @@ -1522,6 +1549,7 @@ int snd_emu10k1_create(struct snd_card *card, emu->synth = NULL; emu->get_synth_voice = NULL; INIT_WORK(&emu->emu1010.firmware_work, emu1010_firmware_work); + INIT_WORK(&emu->emu1010.clock_work, emu1010_clock_work); /* read revision & serial */ emu->revision = pci->revision; pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &emu->serial); diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c index 9a94f08f2463..f39025748072 100644 --- a/sound/pci/emu10k1/emumixer.c +++ b/sound/pci/emu10k1/emumixer.c @@ -986,17 +986,21 @@ static int snd_emu1010_clock_source_put(struct snd_kcontrol *kcontrol, val = ucontrol->value.enumerated.item[0] ; if (val >= emu_ci->num) return -EINVAL; + spin_lock_irq(&emu->reg_lock); change = (emu->emu1010.clock_source != val); if (change) { emu->emu1010.clock_source = val; emu->emu1010.wclock = emu_ci->vals[val]; + snd_emu1010_update_clock(emu); snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_MUTE); snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, emu->emu1010.wclock); + spin_unlock_irq(&emu->reg_lock); + msleep(10); // Allow DLL to settle snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE); - - snd_emu1010_update_clock(emu); + } else { + spin_unlock_irq(&emu->reg_lock); } return change; } @@ -2336,8 +2340,8 @@ int snd_emu10k1_mixer(struct snd_emu10k1 *emu, emu1010_map_source(emu_ri, emu_ri->out_dflts[i]); snd_emu1010_apply_sources(emu); - err = snd_ctl_add(card, - snd_ctl_new1(&snd_emu1010_clock_source, emu)); + kctl = emu->ctl_clock_source = snd_ctl_new1(&snd_emu1010_clock_source, emu); + err = snd_ctl_add(card, kctl); if (err < 0) return err; err = snd_ctl_add(card, -- 2.40.0.152.g15d061e6df

2 1

[PATCH] soundwire: Explicitly include correct DT includes
by Rob Herring 17 Jul '23

17 Jul '23

The DT of_device.h and of_platform.h date back to the separate of_platform_bus_type before it as merged into the regular platform bus. As part of that merge prepping Arm DT support 13 years ago, they "temporarily" include each other. They also include platform_device.h and of.h. As a result, there's a pretty much random mix of those include files used throughout the tree. In order to detangle these headers and replace the implicit includes with struct declarations, users need to explicitly include the correct includes. Signed-off-by: Rob Herring <robh(a)kernel.org> --- drivers/soundwire/qcom.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index 7970fdb27ba0..d178a0dc0918 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -10,7 +10,6 @@ #include <linux/debugfs.h> #include <linux/of.h> #include <linux/of_irq.h> -#include <linux/of_device.h> #include <linux/pm_runtime.h> #include <linux/regmap.h> #include <linux/reset.h> -- 2.40.1

2 1

[PATCH v2] ALSA: seq: Fix memory leak at error path in snd_seq_create_port()
by Takashi Iwai 17 Jul '23

17 Jul '23

We forgot to release a newly allocated item at the error path in snd_seq_create_port(). This patch fixes it. Fixes: 7c3f0d3d3a11 ("ALSA: seq: Check the conflicting port at port creation") Reported-by: syzbot+cf8e7fa4eeec59b3d485(a)syzkaller.appspotmail.com Closes: https://lore.kernel.org/r/00000000000098ed3a0600965f89@google.com Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- v1->v2: only patch meta data correction sound/core/seq/seq_ports.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/core/seq/seq_ports.c b/sound/core/seq/seq_ports.c index 9b80f8275026..f3f14ff0f80f 100644 --- a/sound/core/seq/seq_ports.c +++ b/sound/core/seq/seq_ports.c @@ -149,6 +149,7 @@ int snd_seq_create_port(struct snd_seq_client *client, int port, write_lock_irq(&client->ports_lock); list_for_each_entry(p, &client->ports_list_head, list) { if (p->addr.port == port) { + kfree(new_port); num = -EBUSY; goto unlock; } -- 2.35.3

1 0

[GIT PULL] ASoC fixes for v6.5-rc1
by Mark Brown 17 Jul '23

17 Jul '23

The following changes since commit 2d0cad0473bd1ffbc5842be0b9f2546265acb011: ASoC: core: Always store of_node when getting DAI link component (2023-06-23 22:09:00 +0100) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v6.5-rc1 for you to fetch changes up to e8bf1741c14eb8e4a4e1364d45aeeab66660ab9b: MAINTAINERS: Redo addition of ssm3515 to APPLE SOUND (2023-07-15 13:07:32 +0100) ---------------------------------------------------------------- ASoC: Fixes for v6.5 A lot of fixes here for the Qualcomm CODEC drivers, there was quite a bit of fragility with the SoundWire probe due to the combined DT and hotplug approach that the bus has which Johan Hovold fixed along with a bunch of other issues that came up in the process. Srivinvas Kandagatla also fixed some separate issues that have been lurking for a while in the Qualcomm AP side, and there's a good set of AMD fixes from Vijendar Mukunda too. ---------------------------------------------------------------- Derek Fang (1): ASoC: rt5640: Fix the issue of speaker noise Fabio Estevam (1): ASoC: fsl_sai: Revert "ASoC: fsl_sai: Enable MCTL_MCLK_EN bit for master mode" Geert Uytterhoeven (1): ASoC: codecs: SND_SOC_WCD934X should select REGMAP_IRQ Johan Hovold (15): ASoC: codecs: wcd938x: fix codec initialisation race ASoC: codecs: wcd938x: fix mbhc impedance loglevel ASoC: codecs: wcd938x: drop inline keywords ASoC: codecs: wcd938x: use dev_printk() for impedance logging ASoC: codecs: wcd934x: demote impedance printk ASoC: codecs: wcd934x: drop inline keywords ASoC: codecs: wcd938x: fix soundwire initialisation race ASoC: codecs: wcd938x: fix missing mbhc init error handling ASoC: qdsp6: audioreach: fix topology probe deferral ASoC: codecs: wcd938x: fix missing clsh ctrl error handling ASoC: codecs: wcd938x: fix resource leaks on component remove ASoC: codecs: wcd934x: fix resource leaks on component remove ASoC: codecs: wcd-mbhc-v2: fix resource leaks on component remove ASoC: topology: suppress probe deferral errors ASoC: core: suppress probe deferral errors Mario Limonciello (1): ASoC: amd: ps: Fix extraneous error messages Mark Brown (2): ASoC: codecs: wcd938x/wcd934x: loglevel fix and ASoC/soundwire/qdsp6/wcd: fix leaks and probe deferral Martin Povišer (1): MAINTAINERS: Redo addition of ssm3515 to APPLE SOUND Mastan Katragadda (1): ASoC: SOF: amd: add revision check for sending sha dma completion command Matthias Reichl (1): ASoC: hdmi-codec: fix channel info for compressed formats Nathan Chancellor (1): ASoC: cs35l45: Select REGMAP_IRQ Rob Herring (1): ASoC: dt-bindings: audio-graph-card2: Drop incomplete example Rohit kumar (1): ASoC: dt-bindings: Update maintainer email id Sameer Pujar (1): ASoC: rt5640: Fix sleep in atomic context Sheetal (2): ASoC: tegra: Fix AMX byte map ASoC: tegra: Fix ADX byte map Shuming Fan (1): ASoC: rt5645: check return value after reading device id Srinivas Kandagatla (4): ASoC: qdsp6: q6apm: use dai link pcm id as pcm device number ASoC: qcom: q6afe-dai: fix Display Port Playback stream name ASoC: codecs: wcd938x: fix dB range for HPHL and HPHR ASoC: qcom: q6apm: do not close GPR port before closing graph Vijendar Mukunda (6): ASoC: amd: ps: add comments for DMA irq bits mapping ASoC: amd: ps: add fix for dma irq mask for rx streams for SDW0 instance ASoC: amd: ps: fix for position register set for AUDIO0 RX stream ASoC: amd: ps: add comments for DMA register mapping ASoC: amd: ps: fix byte count return value for invalid SoundWire manager instance ASoC: amd: acp: fix for invalid dai id handling in acp_get_byte_count() .../bindings/sound/audio-graph-card2.yaml | 20 +---- .../bindings/sound/google,sc7180-trogdor.yaml | 2 +- .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 2 +- MAINTAINERS | 2 + sound/soc/amd/acp/amd.h | 7 +- sound/soc/amd/ps/acp63.h | 22 ++++- sound/soc/amd/ps/pci-ps.c | 4 +- sound/soc/amd/ps/ps-sdw-dma.c | 16 +++- sound/soc/codecs/Kconfig | 2 + sound/soc/codecs/hdmi-codec.c | 36 +++++--- sound/soc/codecs/rt5640.c | 13 +-- sound/soc/codecs/rt5645.c | 6 +- sound/soc/codecs/wcd-mbhc-v2.c | 57 +++++++++---- sound/soc/codecs/wcd934x.c | 20 ++++- sound/soc/codecs/wcd938x.c | 99 ++++++++++++++++++---- sound/soc/fsl/fsl_sai.c | 6 -- sound/soc/qcom/qdsp6/q6afe-dai.c | 2 +- sound/soc/qcom/qdsp6/q6apm-dai.c | 1 + sound/soc/qcom/qdsp6/q6apm.c | 7 +- sound/soc/qcom/qdsp6/topology.c | 4 +- sound/soc/soc-core.c | 6 +- sound/soc/soc-topology.c | 10 ++- sound/soc/sof/amd/acp.c | 10 ++- sound/soc/tegra/tegra210_adx.c | 34 +++++--- sound/soc/tegra/tegra210_amx.c | 40 +++++---- 25 files changed, 294 insertions(+), 134 deletions(-)

2 1

[PATCH] ALSA: seq: Fix memory leak at error path in snd_seq_create_port()
by Takashi Iwai 17 Jul '23

17 Jul '23

We forgot to release a newly allocated item at the error path in snd_seq_create_port(). This patch fixes it. Reported-by: syzbot+cf8e7fa4eeec59b3d485(a)syzkaller.appspotmail.com Closes: https://lore.kernel.org/r/00000000000098ed3a0600965f89@google.com Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/seq/seq_ports.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/core/seq/seq_ports.c b/sound/core/seq/seq_ports.c index 9b80f8275026..f3f14ff0f80f 100644 --- a/sound/core/seq/seq_ports.c +++ b/sound/core/seq/seq_ports.c @@ -149,6 +149,7 @@ int snd_seq_create_port(struct snd_seq_client *client, int port, write_lock_irq(&client->ports_lock); list_for_each_entry(p, &client->ports_list_head, list) { if (p->addr.port == port) { + kfree(new_port); num = -EBUSY; goto unlock; } -- 2.35.3

1 0

Pass through encoded audio in the AC3 profile
by GitHub issues - opened 16 Jul '23

16 Jul '23

alsa-project/alsa-plugins issue #53 was opened from AndrewAmmerlaan: Is there any technical reason why it is not possible to `pactl set-sink-formats X "pcm dts-iec61937 ac3-iec61937"` when the `Digital Surround 5.1 IEC958/AC3 Output` profile is selected? It would be convenient to not have to switch profiles when watching a movie with audio that is already encoded AC3. I noticed the `dcaenc` plug-in for DTS encoding does the same thing. So maybe there is a good reason for this I'm not seeing. Issue URL : https://github.com/alsa-project/alsa-plugins/issues/53 Repository URL: https://github.com/alsa-project/alsa-plugins

1 0

[PATCH] ASoC: dt-bindings: audio-graph-card2: Drop incomplete example
by Rob Herring 16 Jul '23

16 Jul '23

The example in audio-graph-card2 binding is incomplete, uses undocumented compatibles strings, and doesn't follow typical .dts formatting. Rather than try to fix with what would probably be a lengthy example, just drop the example. Signed-off-by: Rob Herring <robh(a)kernel.org> --- .../bindings/sound/audio-graph-card2.yaml | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/audio-graph-card2.yaml b/Documentation/devicetree/bindings/sound/audio-graph-card2.yaml index 3de7b36829da..d3ce4de449d5 100644 --- a/Documentation/devicetree/bindings/sound/audio-graph-card2.yaml +++ b/Documentation/devicetree/bindings/sound/audio-graph-card2.yaml @@ -39,22 +39,4 @@ required: additionalProperties: false -examples: - - | - sound { - compatible = "audio-graph-card2"; - - links = <&cpu_port>; - }; - - cpu { - compatible = "cpu-driver"; - - cpu_port: port { cpu_ep: endpoint { remote-endpoint = <&codec_ep>; }; }; - }; - - codec { - compatible = "codec-driver"; - - port { codec_ep: endpoint { remote-endpoint = <&cpu_ep>; }; }; - }; +... -- 2.40.1

2 2

[PATCH -next] ASoC: amd: acp: clean up some inconsistent indentings
by Yang Li 16 Jul '23

16 Jul '23

sound/soc/amd/acp/acp-rembrandt.c:283 rmb_pcm_resume() warn: inconsistent indenting Reported-by: Abaci Robot <abaci(a)linux.alibaba.com> Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=5863 Signed-off-by: Yang Li <yang.lee(a)linux.alibaba.com> --- sound/soc/amd/acp/acp-rembrandt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/amd/acp/acp-rembrandt.c b/sound/soc/amd/acp/acp-rembrandt.c index 89314d95ec2b..21e67ed956d1 100644 --- a/sound/soc/amd/acp/acp-rembrandt.c +++ b/sound/soc/amd/acp/acp-rembrandt.c @@ -280,8 +280,8 @@ static int __maybe_unused rmb_pcm_resume(struct device *dev) } } } - spin_unlock(&adata->acp_lock); - return 0; + spin_unlock(&adata->acp_lock); + return 0; } static const struct dev_pm_ops rmb_dma_pm_ops = { -- 2.20.1.7.g153144c

2 2