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

[PATCH v2] ALSA: jack: Access input_dev under mutex
by Amadeusz Sławiński 12 Apr '22

12 Apr '22

It is possible when using ASoC that input_dev is unregistered while calling snd_jack_report, which causes NULL pointer dereference. In order to prevent this serialize access to input_dev using mutex lock. Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com> --- Changes: v2: - drop mutex in snd_jack_new - add comment that snd_jack_report() should be called in context where it can sleep --- include/sound/jack.h | 1 + sound/core/jack.c | 34 +++++++++++++++++++++++++++------- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/include/sound/jack.h b/include/sound/jack.h index 1181f536557e..1ed90e2109e9 100644 --- a/include/sound/jack.h +++ b/include/sound/jack.h @@ -62,6 +62,7 @@ struct snd_jack { const char *id; #ifdef CONFIG_SND_JACK_INPUT_DEV struct input_dev *input_dev; + struct mutex input_dev_lock; int registered; int type; char name[100]; diff --git a/sound/core/jack.c b/sound/core/jack.c index d1e3055f2b6a..88493cc31914 100644 --- a/sound/core/jack.c +++ b/sound/core/jack.c @@ -42,8 +42,11 @@ static int snd_jack_dev_disconnect(struct snd_device *device) #ifdef CONFIG_SND_JACK_INPUT_DEV struct snd_jack *jack = device->device_data; - if (!jack->input_dev) + mutex_lock(&jack->input_dev_lock); + if (!jack->input_dev) { + mutex_unlock(&jack->input_dev_lock); return 0; + } /* If the input device is registered with the input subsystem * then we need to use a different deallocator. */ @@ -52,6 +55,7 @@ static int snd_jack_dev_disconnect(struct snd_device *device) else input_free_device(jack->input_dev); jack->input_dev = NULL; + mutex_unlock(&jack->input_dev_lock); #endif /* CONFIG_SND_JACK_INPUT_DEV */ return 0; } @@ -90,8 +94,11 @@ static int snd_jack_dev_register(struct snd_device *device) snprintf(jack->name, sizeof(jack->name), "%s %s", card->shortname, jack->id); - if (!jack->input_dev) + mutex_lock(&jack->input_dev_lock); + if (!jack->input_dev) { + mutex_unlock(&jack->input_dev_lock); return 0; + } jack->input_dev->name = jack->name; @@ -116,6 +123,7 @@ static int snd_jack_dev_register(struct snd_device *device) if (err == 0) jack->registered = 1; + mutex_unlock(&jack->input_dev_lock); return err; } #endif /* CONFIG_SND_JACK_INPUT_DEV */ @@ -517,9 +525,11 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, return -ENOMEM; } - /* don't creat input device for phantom jack */ - if (!phantom_jack) { #ifdef CONFIG_SND_JACK_INPUT_DEV + mutex_init(&jack->input_dev_lock); + + /* don't create input device for phantom jack */ + if (!phantom_jack) { int i; jack->input_dev = input_allocate_device(); @@ -537,8 +547,8 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, input_set_capability(jack->input_dev, EV_SW, jack_switch_types[i]); -#endif /* CONFIG_SND_JACK_INPUT_DEV */ } +#endif /* CONFIG_SND_JACK_INPUT_DEV */ err = snd_device_new(card, SNDRV_DEV_JACK, jack, &ops); if (err < 0) @@ -578,10 +588,14 @@ EXPORT_SYMBOL(snd_jack_new); void snd_jack_set_parent(struct snd_jack *jack, struct device *parent) { WARN_ON(jack->registered); - if (!jack->input_dev) + mutex_lock(&jack->input_dev_lock); + if (!jack->input_dev) { + mutex_unlock(&jack->input_dev_lock); return; + } jack->input_dev->dev.parent = parent; + mutex_unlock(&jack->input_dev_lock); } EXPORT_SYMBOL(snd_jack_set_parent); @@ -629,6 +643,8 @@ EXPORT_SYMBOL(snd_jack_set_key); /** * snd_jack_report - Report the current status of a jack + * Note: This function uses mutexes and should be called from a + * context which can sleep (such as a workqueue). * * @jack: The jack to report status for * @status: The current status of the jack @@ -654,8 +670,11 @@ void snd_jack_report(struct snd_jack *jack, int status) status & jack_kctl->mask_bits); #ifdef CONFIG_SND_JACK_INPUT_DEV - if (!jack->input_dev) + mutex_lock(&jack->input_dev_lock); + if (!jack->input_dev) { + mutex_unlock(&jack->input_dev_lock); return; + } for (i = 0; i < ARRAY_SIZE(jack->key); i++) { int testbit = ((SND_JACK_BTN_0 >> i) & ~mask_bits); @@ -675,6 +694,7 @@ void snd_jack_report(struct snd_jack *jack, int status) } input_sync(jack->input_dev); + mutex_unlock(&jack->input_dev_lock); #endif /* CONFIG_SND_JACK_INPUT_DEV */ } EXPORT_SYMBOL(snd_jack_report); -- 2.25.1

3 2

[PATCH 0/2] Add support for HDA Jack poll in suspend state
by Mohan Kumar 12 Apr '22

12 Apr '22

This series is to add HDA jack polling support to update the Jack mixer control status properly even during runtime suspended state, as unsol event won't be triggered during D3 state. Mohan Kumar (2): ALSA: hda: Jack detection poll in suspend state ALSA: hda/tegra: Enable Jack poll for tegra include/sound/hda_codec.h | 3 +++ sound/pci/hda/hda_codec.c | 11 ++++++++++- sound/pci/hda/hda_tegra.c | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-) -- 2.17.1

2 3

[BUG] ALSA: echoaudio: warning when the driver fails to probe
by Zheyu Ma 12 Apr '22

12 Apr '22

Hello, I found a bug in echoaudio.c. When the driver fails at the function snd_echo_create(), it should release resources requested before, otherwise we will get the following warning: [ 3.262866] remove_proc_entry: removing non-empty directory 'irq/21', leaking at least 'snd_indigodj' [ 3.263577] WARNING: CPU: 3 PID: 261 at fs/proc/generic.c:717 remove_proc_entry+0x389/0x3f0 [ 3.267098] RIP: 0010:remove_proc_entry+0x389/0x3f0 [ 3.269976] Call Trace: [ 3.269979] <TASK> [ 3.269988] unregister_irq_proc+0x14c/0x170 [ 3.269997] irq_free_descs+0x94/0xe0 [ 3.270004] mp_unmap_irq+0xb6/0x100 [ 3.270011] acpi_unregister_gsi_ioapic+0x27/0x40 [ 3.270017] acpi_pci_irq_disable+0x1d3/0x320 [ 3.270025] pci_disable_device+0x1ad/0x380 [ 3.270034] pcim_release+0x566/0x6d0 [ 3.270046] devres_release_all+0x1f1/0x2c0 [ 3.270057] really_probe+0xe0/0x920 Regards, Zheyu Ma

2 9

[PATCH] slimbus: qcom: Fix IRQ check in qcom_slim_probe
by Miaoqian Lin 12 Apr '22

12 Apr '22

platform_get_irq() returns negative error number instead 0 on failure. And the doc of platform_get_irq() provides a usage example: int irq = platform_get_irq(pdev, 0); if (irq < 0) return irq; Fix the check of return value to catch errors correctly. Fixes: ad7fcbc308b0 ("slimbus: qcom: Add Qualcomm Slimbus controller driver") Signed-off-by: Miaoqian Lin <linmq006(a)gmail.com> --- drivers/slimbus/qcom-ctrl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/slimbus/qcom-ctrl.c b/drivers/slimbus/qcom-ctrl.c index f04b961b96cd..ec58091fc948 100644 --- a/drivers/slimbus/qcom-ctrl.c +++ b/drivers/slimbus/qcom-ctrl.c @@ -510,9 +510,9 @@ static int qcom_slim_probe(struct platform_device *pdev) } ctrl->irq = platform_get_irq(pdev, 0); - if (!ctrl->irq) { + if (ctrl->irq < 0) { dev_err(&pdev->dev, "no slimbus IRQ\n"); - return -ENODEV; + return ctrl->irq; } sctrl = &ctrl->ctrl; -- 2.17.1

3 3

[PATCH v1 1/2] rename tas2764 to tas27xx
by Raphael-Xu 11 Apr '22

11 Apr '22

rename tas2764.yaml to tas27xx.yaml Signed-off-by: Raphael-Xu <13691752556(a)139.com> --- .../devicetree/bindings/sound/{tas2764.yaml => tas27xx.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Documentation/devicetree/bindings/sound/{tas2764.yaml => tas27xx.yaml} (100%) diff --git a/Documentation/devicetree/bindings/sound/tas2764.yaml b/Documentation/devicetree/bindings/sound/tas27xx.yaml similarity index 100% rename from Documentation/devicetree/bindings/sound/tas2764.yaml rename to Documentation/devicetree/bindings/sound/tas27xx.yaml -- 2.35.1

3 4

[PATCH 00/30] use utility macro to declare GObject-derived objects
by GitHub pull_request - opened 11 Apr '22

11 Apr '22

alsa-project/alsa-gobject pull request #68 was opened from takaswie: GObject v2.44 got new macro to declare GObject-derived objects. This enables us to reduce boireplate for the declaration. This patchset is to replace current boireplates with it. ``` Takashi Sakamoto (30): all: minor code refactoring for inclusion guard seq: enum: fix tab indentation timer: device_params: fix type decration with private data ctl: card: use an utility macro to declare GObject-derived object ctl: card_info: use an utility macro to declare GObject-derived object ctl: elem_info: use an utility macro to declare GObject-derived object ctl: elem_value: use an utility macro to declare GObject-derived object hwdep: device_info: use an utility macro to declare GObject-derived object rawmidi: stream_pair: use an utility macro to declare GObject-derived object rawmidi: substream_info: use an utility macro to declare GObject-derived object rawmidi; substream_params: use an utility macro to declare GObject-derived object rawmidi: substream_status: use an utility macro to declare GObject-derived object timer: user_instance: use an utility macro to declare GObject-derived object timer: device_info: use an utility macro to declare GObject-derived object timer: device_status: use an utility macro to declare GObject-derived object timer: device_params: use an utility macro to declare GObject-derived object timer: instance_info: use an utility macro to declare GObject-derived object timer: instance_status: use an utility macro to declare GObject-derived object timer: instance_params: use an utility macro to declare GObject-derived object seq: user_client: use an utility macro to declare GObject-derived object seq: client_info: use an utility macro to declare GObject-derived object seq: client_pool: use an utility macro to declare GObject-derived object seq: system_info: use an utility macro to declare GObject-derived object seq: port_info: use an utility macro to declare GObject-derived object seq: subscribe_data: use an utility macro to declare GObject-derived object seq: event_cntr: use an utility macro to declare GObject-derived object seq: queue_info: use an utility macro to declare GObject-derived object seq: queue_status: use an utility macro to declare GObject-derived object seq: queue_tempo: use an utility macro to declare GObject-derived object seq: queue_timer: use an utility macro to declare GObject-derived object src/ctl/alsactl-enum-types.h | 4 +-- src/ctl/card-info.c | 4 +-- src/ctl/card-info.h | 36 +++---------------------- src/ctl/card.c | 6 ++--- src/ctl/card.h | 40 ++++------------------------ src/ctl/elem-id.h | 4 +-- src/ctl/elem-info.c | 4 +-- src/ctl/elem-info.h | 36 +++---------------------- src/ctl/elem-value.c | 8 +++--- src/ctl/elem-value.h | 36 +++---------------------- src/ctl/privates.h | 4 +-- src/ctl/query.h | 4 +-- src/hwdep/alsahwdep-enum-types.h | 4 +-- src/hwdep/device-info.c | 4 +-- src/hwdep/device-info.h | 36 +++---------------------- src/hwdep/privates.h | 4 +-- src/hwdep/query.h | 4 +-- src/meson.build | 2 +- src/rawmidi/alsarawmidi-enum-types.h | 4 +-- src/rawmidi/privates.h | 4 +-- src/rawmidi/query.h | 4 +-- src/rawmidi/stream-pair.c | 4 +-- src/rawmidi/stream-pair.h | 36 +++---------------------- src/rawmidi/substream-info.c | 4 +-- src/rawmidi/substream-info.h | 38 +++----------------------- src/rawmidi/substream-params.c | 4 +-- src/rawmidi/substream-params.h | 38 +++----------------------- src/rawmidi/substream-status.c | 4 +-- src/rawmidi/substream-status.h | 37 +++---------------------- src/seq/addr.h | 4 +-- src/seq/alsaseq-enum-types.h | 6 ++--- src/seq/alsaseq.h | 4 +-- src/seq/client-info.c | 4 +-- src/seq/client-info.h | 36 +++---------------------- src/seq/client-pool.c | 4 +-- src/seq/client-pool.h | 36 +++---------------------- src/seq/event-cntr.h | 36 +++---------------------- src/seq/event-data-connect.h | 4 +-- src/seq/event-data-ctl.h | 4 +-- src/seq/event-data-note.h | 4 +-- src/seq/event-data-result.h | 4 +-- src/seq/port-info.c | 4 +-- src/seq/port-info.h | 36 +++---------------------- src/seq/privates.h | 4 +-- src/seq/query.h | 4 +-- src/seq/queue-info.c | 4 +-- src/seq/queue-info.h | 37 +++---------------------- src/seq/queue-status.c | 4 +-- src/seq/queue-status.h | 36 +++---------------------- src/seq/queue-tempo.c | 4 +-- src/seq/queue-tempo.h | 36 +++---------------------- src/seq/queue-timer-data-alsa.h | 4 +-- src/seq/queue-timer.c | 4 +-- src/seq/queue-timer.h | 36 +++---------------------- src/seq/remove-filter.h | 4 +-- src/seq/subscribe-data.c | 4 +-- src/seq/subscribe-data.h | 36 +++---------------------- src/seq/system-info.c | 4 +-- src/seq/system-info.h | 36 +++---------------------- src/seq/tstamp.h | 4 +-- src/seq/user-client.c | 4 +-- src/seq/user-client.h | 36 +++---------------------- src/timer/alsatimer-enum-types.h | 5 ++-- src/timer/alsatimer.h | 1 + src/timer/device-id.h | 4 +-- src/timer/device-info.c | 4 +-- src/timer/device-info.h | 37 +++---------------------- src/timer/device-params.c | 6 ++--- src/timer/device-params.h | 37 +++---------------------- src/timer/device-status.c | 4 +-- src/timer/device-status.h | 37 +++---------------------- src/timer/event-data-tick.h | 4 +-- src/timer/event-data-tstamp.h | 4 +-- src/timer/event.h | 4 +-- src/timer/instance-info.c | 4 +-- src/timer/instance-info.h | 37 +++---------------------- src/timer/instance-params.c | 4 +-- src/timer/instance-params.h | 37 +++---------------------- src/timer/instance-status.c | 4 +-- src/timer/instance-status.h | 37 +++---------------------- src/timer/privates.h | 4 +-- src/timer/query.h | 4 +-- src/timer/user-instance.c | 4 +-- src/timer/user-instance.h | 37 +++---------------------- 84 files changed, 211 insertions(+), 1012 deletions(-) ``` Request URL : https://github.com/alsa-project/alsa-gobject/pull/68 Patch URL : https://github.com/alsa-project/alsa-gobject/pull/68.patch Repository URL: https://github.com/alsa-project/alsa-gobject

1 0

[PATCH] ALSA: hda/realtek: add quirk for Lenovo Thinkpad X12 speakers
by Tao Jin 11 Apr '22

11 Apr '22

For this specific device on Lenovo Thinkpad X12 tablet, the verbs were dumped by qemu running a guest OS that init this codec properly. After studying the dump, it turns out that the same quirk used by the other Lenovo devices can be reused. The patch was tested working against the mainline kernel. Cc: <stable(a)vger.kernel.org> Signed-off-by: Tao Jin <tao-j(a)outlook.com> --- 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 75ff7e8..a5d6f8a 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -9207,6 +9207,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x505d, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), SND_PCI_QUIRK(0x17aa, 0x505f, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), SND_PCI_QUIRK(0x17aa, 0x5062, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), + SND_PCI_QUIRK(0x17aa, 0x508b, "Thinkpad X12 Gen 1", ALC287_FIXUP_LEGION_15IMHG05_SPEAKERS), SND_PCI_QUIRK(0x17aa, 0x5109, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), SND_PCI_QUIRK(0x17aa, 0x511e, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), SND_PCI_QUIRK(0x17aa, 0x511f, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), -- 2.35.1

2 1

[PATCH] ALSA: usb-audio: Increase max buffer size
by Takashi Iwai 10 Apr '22

10 Apr '22

The current limit of max buffer size 1MB seems too small for modern devices with lots of channels and high sample rates. Let's make bigger, 4MB. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/usb/pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index 6a460225f2e3..37ee6df8b15a 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -659,7 +659,7 @@ static int snd_usb_pcm_prepare(struct snd_pcm_substream *substream) #define hwc_debug(fmt, args...) do { } while(0) #endif -#define MAX_BUFFER_BYTES (1024 * 1024) +#define MAX_BUFFER_BYTES (4 * 1024 * 1024) #define MAX_PERIOD_BYTES (512 * 1024) static const struct snd_pcm_hardware snd_usb_hardware = -- 2.31.1

3 6

imx8mn: Using the easrc driver
by Fabio Estevam 09 Apr '22

09 Apr '22

Hi Shengjiu, I am running kernel 5.18-rc1 on an imx8mn-ddr4-evk board. The following playback devices are available: # aplay -l **** List of PLAYBACK Hardware Devices **** card 0: imxspdif [imx-spdif], device 0: S/PDIF PCM snd-soc-dummy-dai-0 [S/PDIF PCM snd-soc-dummy-dai-0] Subdevices: 1/1 Subdevice #0: subdevice #0 card 1: wm8524audio [wm8524-audio], device 0: HiFi wm8524-hifi-0 [HiFi wm8524-hifi-0] Subdevices: 1/1 Subdevice #0: subdevice #0 card 1: wm8524audio [wm8524-audio], device 1: HiFi-ASRC-FE (*) [] Subdevices: 1/1 Subdevice #0: subdevice #0 # I would like to use the sample rate conversion (provided by the easrc driver): # aplay -D hw:1,1 /media/f2bjrop1.0.wav Playing WAVE '/media/f2bjrop1.0.wav' : Signed 16 bit Little Endian, Rate 16000 Hz, Mono Warning: rate is not accurate (requested = 16000Hz, got = 32000Hz) please, try the plug plugin , but the playback does not play at the correct speed. It plays at a much faster rate. The f2bjrop1.0.wav file I got from: http://www.fit.vutbr.cz/~motlicek/speech_hnm.html What should be done for the easrc to convert the sampling rates properly? Thanks, Fabio Estevam

2 2

[PATCH v7 1/3] rename tas2764 to tas27xx
by Raphael-Xu 09 Apr '22

09 Apr '22

rename tas2764.c and tas2764.h to tas27xx.c and tas27xx.h rename tas2764 to tas27xx in Kconfig and Makefile Signed-off-by: Raphael-Xu <13691752556(a)139.com> --- sound/soc/codecs/Kconfig | 6 +++--- sound/soc/codecs/Makefile | 4 ++-- sound/soc/codecs/{tas2764.c => tas27xx.c} | 0 sound/soc/codecs/{tas2764.h => tas27xx.h} | 0 4 files changed, 5 insertions(+), 5 deletions(-) rename sound/soc/codecs/{tas2764.c => tas27xx.c} (100%) rename sound/soc/codecs/{tas2764.h => tas27xx.h} (100%) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index f46a22660103..2c4595f6f7ec 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -213,7 +213,7 @@ config SND_SOC_ALL_CODECS imply SND_SOC_STI_SAS imply SND_SOC_TAS2552 imply SND_SOC_TAS2562 - imply SND_SOC_TAS2764 + imply SND_SOC_TAS27XX imply SND_SOC_TAS2770 imply SND_SOC_TAS5086 imply SND_SOC_TAS571X @@ -1472,8 +1472,8 @@ config SND_SOC_TAS2562 tristate "Texas Instruments TAS2562 Mono Audio amplifier" depends on I2C -config SND_SOC_TAS2764 - tristate "Texas Instruments TAS2764 Mono Audio amplifier" +config SND_SOC_TAS27XX + tristate "Texas Instruments TAS2764/TAS2780 Mono Audio amplifier" depends on I2C config SND_SOC_TAS2770 diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 8637e9e869e3..15ceb95d42f5 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -337,7 +337,7 @@ snd-soc-simple-amplifier-objs := simple-amplifier.o snd-soc-tpa6130a2-objs := tpa6130a2.o snd-soc-tas2552-objs := tas2552.o snd-soc-tas2562-objs := tas2562.o -snd-soc-tas2764-objs := tas2764.o +snd-soc-tas27xx-objs := tas27xx.o # Mux snd-soc-simple-mux-objs := simple-mux.o @@ -574,7 +574,7 @@ obj-$(CONFIG_SND_SOC_STAC9766) += snd-soc-stac9766.o obj-$(CONFIG_SND_SOC_STI_SAS) += snd-soc-sti-sas.o obj-$(CONFIG_SND_SOC_TAS2552) += snd-soc-tas2552.o obj-$(CONFIG_SND_SOC_TAS2562) += snd-soc-tas2562.o -obj-$(CONFIG_SND_SOC_TAS2764) += snd-soc-tas2764.o +obj-$(CONFIG_SND_SOC_TAS27XX) += snd-soc-tas27xx.o obj-$(CONFIG_SND_SOC_TAS5086) += snd-soc-tas5086.o obj-$(CONFIG_SND_SOC_TAS571X) += snd-soc-tas571x.o obj-$(CONFIG_SND_SOC_TAS5720) += snd-soc-tas5720.o diff --git a/sound/soc/codecs/tas2764.c b/sound/soc/codecs/tas27xx.c similarity index 100% rename from sound/soc/codecs/tas2764.c rename to sound/soc/codecs/tas27xx.c diff --git a/sound/soc/codecs/tas2764.h b/sound/soc/codecs/tas27xx.h similarity index 100% rename from sound/soc/codecs/tas2764.h rename to sound/soc/codecs/tas27xx.h -- 2.35.1

2 3