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

[PATCH v2 0/6] ASoC: rt5640: 1 Bugfix + Add support for external GPIO jack-detect
by Hans de Goede 06 Jan '22

06 Jan '22

Hi All, Here is v2 of my series to fix jack-detect not working on some x86 Bay Trail devices. Now rebased on top of the latest broonie/sound.git/for-next. New this version is a bug-fix for an issue which I noticed in the current broonie/sound.git/for-next (patch 1 of the series). Since this fixes a NULL-ptr deref in current for-next patch 1 should be included into a pull-req for 5.17. The rest of the series can go to either 5.17 or 5.18. Regards, Hans Hans de Goede (6): ASoC: rt5640: Fix possible NULL pointer deref on resume ASoC: rt5640: Change jack_work to a delayed_work ASoC: rt5640: Allow snd_soc_component_set_jack() to override the codec IRQ ASoC: rt5640: Add support for boards with an external jack-detect GPIO ASoC: Intel: bytcr_rt5640: Support retrieving the codec IRQ from the AMCR0F28 ACPI dev ASoC: Intel: bytcr_rt5640: Add support for external GPIO jack-detect sound/soc/codecs/rt5640.c | 71 +++++++++++++++++----- sound/soc/codecs/rt5640.h | 11 +++- sound/soc/intel/boards/bytcr_rt5640.c | 86 +++++++++++++++++++++++++-- 3 files changed, 146 insertions(+), 22 deletions(-) -- 2.33.1

2 7

[PATCH] ASoC: topology: Fix typo
by Qinghua Jin 06 Jan '22

06 Jan '22

change 'postion' to 'position' Signed-off-by: Qinghua Jin <qhjin.dev(a)gmail.com> --- sound/soc/soc-topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index f5b9e66ac3b8..2630df024dff 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -56,7 +56,7 @@ struct soc_tplg { const struct firmware *fw; /* runtime FW parsing */ - const u8 *pos; /* read postion */ + const u8 *pos; /* read position */ const u8 *hdr_pos; /* header position */ unsigned int pass; /* pass number */ -- 2.30.2

2 1

[PATCH 1/5] ASoC: rt5640: Change jack_work to a delayed_work
by Hans de Goede 06 Jan '22

06 Jan '22

Change jack_work from a struct work_struct to a struct delayed_work, this is a preparation patch for adding support for boards where an external GPIO is used for jack-detect, rather then one of the JD pins of the codec. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- sound/soc/codecs/rt5640.c | 12 ++++++------ sound/soc/codecs/rt5640.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index d01fe73ab9c8..36c00ad17182 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -2297,7 +2297,7 @@ EXPORT_SYMBOL_GPL(rt5640_detect_headset); static void rt5640_jack_work(struct work_struct *work) { struct rt5640_priv *rt5640 = - container_of(work, struct rt5640_priv, jack_work); + container_of(work, struct rt5640_priv, jack_work.work); struct snd_soc_component *component = rt5640->component; int status; @@ -2348,7 +2348,7 @@ static void rt5640_jack_work(struct work_struct *work) * disabled the OVCD IRQ, the IRQ pin will stay high and as * we react to edges, we miss the unplug event -> recheck. */ - queue_work(system_long_wq, &rt5640->jack_work); + queue_delayed_work(system_long_wq, &rt5640->jack_work, 0); } } @@ -2357,7 +2357,7 @@ static irqreturn_t rt5640_irq(int irq, void *data) struct rt5640_priv *rt5640 = data; if (rt5640->jack) - queue_work(system_long_wq, &rt5640->jack_work); + queue_delayed_work(system_long_wq, &rt5640->jack_work, 0); return IRQ_HANDLED; } @@ -2366,7 +2366,7 @@ static void rt5640_cancel_work(void *data) { struct rt5640_priv *rt5640 = data; - cancel_work_sync(&rt5640->jack_work); + cancel_delayed_work_sync(&rt5640->jack_work); cancel_delayed_work_sync(&rt5640->bp_work); } @@ -2475,7 +2475,7 @@ static void rt5640_enable_jack_detect(struct snd_soc_component *component, } /* sync initial jack state */ - queue_work(system_long_wq, &rt5640->jack_work); + queue_delayed_work(system_long_wq, &rt5640->jack_work, 0); } static int rt5640_set_jack(struct snd_soc_component *component, @@ -2856,7 +2856,7 @@ static int rt5640_i2c_probe(struct i2c_client *i2c, rt5640->hp_mute = true; rt5640->irq = i2c->irq; INIT_DELAYED_WORK(&rt5640->bp_work, rt5640_button_press_work); - INIT_WORK(&rt5640->jack_work, rt5640_jack_work); + INIT_DELAYED_WORK(&rt5640->jack_work, rt5640_jack_work); /* Make sure work is stopped on probe-error / remove */ ret = devm_add_action_or_reset(&i2c->dev, rt5640_cancel_work, rt5640); diff --git a/sound/soc/codecs/rt5640.h b/sound/soc/codecs/rt5640.h index 2c28f83e338a..7ab930def8dd 100644 --- a/sound/soc/codecs/rt5640.h +++ b/sound/soc/codecs/rt5640.h @@ -2145,7 +2145,7 @@ struct rt5640_priv { int release_count; int poll_count; struct delayed_work bp_work; - struct work_struct jack_work; + struct delayed_work jack_work; struct snd_soc_jack *jack; unsigned int jd_src; bool jd_inverted; -- 2.33.1

3 10

[PATCH 2/2] ALSA: virmidi: Remove duplicated code
by Stefan Sauer 06 Jan '22

06 Jan '22

seq_virmidi.c: snd_virmidi_new() is already setting seq_mode to SNDRV_VIRMIDI_SEQ_DISPATCH. Signed-off-by: Stefan Sauer <st_kost(a)gmx.de> --- sound/drivers/virmidi.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sound/drivers/virmidi.c b/sound/drivers/virmidi.c index 7f7eed6faaae..58012de90c38 100644 --- a/sound/drivers/virmidi.c +++ b/sound/drivers/virmidi.c @@ -90,15 +90,12 @@ static int snd_virmidi_probe(struct platform_device *devptr) } for (idx = 0; idx < midi_devs[dev]; idx++) { struct snd_rawmidi *rmidi; - struct snd_virmidi_dev *rdev; err = snd_virmidi_new(card, idx, &rmidi); if (err < 0) return err; - rdev = rmidi->private_data; vmidi->midi[idx] = rmidi; strcpy(rmidi->name, "Virtual Raw MIDI"); - rdev->seq_mode = SNDRV_VIRMIDI_SEQ_DISPATCH; } strcpy(card->driver, "VirMIDI"); -- 2.34.1

2 1

[PATCH 1/2] ALSA: seq: virmidi: Add a drain operation
by Stefan Sauer 06 Jan '22

06 Jan '22

If a driver does not supply a drain operation for outputs, a default code path will execute msleep(50). Especially for a virtual midi device this severely limmits the throughput. This implementation for the virtual midi driver simply flushes the output workqueue. Signed-off-by: Stefan Sauer <st_kost(a)gmx.de> --- sound/core/seq/seq_virmidi.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sound/core/seq/seq_virmidi.c b/sound/core/seq/seq_virmidi.c index 4abc38c70cae..f5cae49500c8 100644 --- a/sound/core/seq/seq_virmidi.c +++ b/sound/core/seq/seq_virmidi.c @@ -262,6 +262,16 @@ static int snd_virmidi_output_close(struct snd_rawmidi_substream *substream) return 0; } +/* + * drain output work queue + */ +static void snd_virmidi_output_drain(struct snd_rawmidi_substream *substream) +{ + struct snd_virmidi *vmidi = substream->runtime->private_data; + + flush_work(&vmidi->output_work); +} + /* * subscribe callback - allow output to rawmidi device */ @@ -336,6 +346,7 @@ static const struct snd_rawmidi_ops snd_virmidi_output_ops = { .open = snd_virmidi_output_open, .close = snd_virmidi_output_close, .trigger = snd_virmidi_output_trigger, + .drain = snd_virmidi_output_drain, }; /* -- 2.34.1

2 1

[PATCH v2] ALSA: intel_hdmi: Check for error num after setting mask
by Jiasheng Jiang 06 Jan '22

06 Jan '22

To maintain the consistency of the code, it should be better to add the sanity check after calling dma_set_mask_and_coherent(), like tegra_pcm_dma_allocate() in `sound/soc/tegra/tegra_pcm.c`. Signed-off-by: Jiasheng Jiang <jiasheng(a)iscas.ac.cn> --- Changelog v1 -> v2 * Change 1. Remove the fixes tag and change the message. --- sound/x86/intel_hdmi_audio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c index 33b12aa67cf5..6caea517f07f 100644 --- a/sound/x86/intel_hdmi_audio.c +++ b/sound/x86/intel_hdmi_audio.c @@ -1770,7 +1770,9 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev) card_ctx->irq = irq; /* only 32bit addressable */ - dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); + ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); + if (ret) + goto err; init_channel_allocations(); -- 2.25.1

2 1

Re: Re: [PATCH] ALSA: intel_hdmi: Check for error num after setting mask
by Jiasheng Jiang 06 Jan '22

06 Jan '22

On Thu, Jan 06, 2022 at 04:18:01PM +0800, Takashi Iwai wrote: > Well, 32bit DMA mask practically never fails on x86 (and other > architectures, IIRC). It's fine to add a sanity check, but it's > better to be mentioned that it never fails. Actually, I have already found many place check the 32bit DMA mask. For example: snd_ad1889_create() in `sound/pci/ad1889.c`, snd_vortex_create() in `sound/pci/au88x0/au88x0.c` tegra_pcm_dma_allocate() in `sound/soc/tegra/tegra_pcm.c`. Therefore, I think there must be some reason that 32bit may fail. So, to make the system more robust, it should be better to add the sanity check. Sincerely thanks, Jiang

2 1

[PATCH] ALSA: intel_hdmi: Check for error num after setting mask
by Jiasheng Jiang 06 Jan '22

06 Jan '22

As the dma_supported() may fail, the dma_set_mask_and_coherent() may fail too. Therefore, it should be better to check it and return error if fails. Fixes: da8648097497 ("ALSA: x86: Flatten two abstraction layers") Signed-off-by: Jiasheng Jiang <jiasheng(a)iscas.ac.cn> --- sound/x86/intel_hdmi_audio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c index 33b12aa67cf5..6caea517f07f 100644 --- a/sound/x86/intel_hdmi_audio.c +++ b/sound/x86/intel_hdmi_audio.c @@ -1770,7 +1770,9 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev) card_ctx->irq = irq; /* only 32bit addressable */ - dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); + ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); + if (ret) + goto err; init_channel_allocations(); -- 2.25.1

2 1

hda-analyzer porting to GTK3
by GitHub issues - opened 06 Jan '22

06 Jan '22

alsa-project/alsa-utils issue #134 was opened from kosiu: I know that hda-analyzer is not a part of alsa-utils. I'm trying to port it into GTK3 at first but I encounter problems with scrolling of the graph. Source is here: https://github.com/kosiu/alsa/tree/gtk3 Issue URL : https://github.com/alsa-project/alsa-utils/issues/134 Repository URL: https://github.com/alsa-project/alsa-utils

1 0

UAC2: are UAC2 latency controls included in snd_pcm_status_get_delay?
by Pavel Hofman 06 Jan '22

06 Jan '22

Hi, The UAC2 ch. "5.2.4.8 Latency Control" specifies latencies optionally reported by the device for individual entities. Especially the overall terminal latency TE_LATENCY_CONTROL is interesting. Some video players include the delay reported by snd_pcm_status_get_delay into their AV sync calculation. A linux USB audio gadget can perform some advanced DSP, which including the output device latency can result in a non-negligible overall latency. The gadget userspace software could configure the actual value to be reported by the gadget to the host in the selector UAC2_TE_LATENCY (audio_v2.h). The UAC2-specced max value of over 4 secs is more than sufficient for standard use cases. But I could not find any read of the UAC2_TE_LATENCY control selector in the snd-usb-audio driver ( https://elixir.bootlin.com/linux/latest/C/ident/UAC2_TE_LATENCY ). Please does the driver include this value into the overall delay reported through alsa-lib? If not, would it make sense to add such support? Thanks a lot, Pavel.

1 0