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

[PATCH 0/9] ALSA: firewire: cease from delayed card registration
by Takashi Sakamoto 07 Jun '21

07 Jun '21

Hi, Since Linux kernel v4.7, delayed card registration was introduced to all drivers in ALSA firewire stack. Nowadays it brings less benefit than code complication. This patchset ceases from it. Takashi Sakamoto (9): ALSA: bebob: cease from delayed card registration ALSA: fireworks: cease from delayed card registration ALSA: oxfw: cease from delayed card registration ALSA: dice: cease from delayed card registration ALSA: firewire-digi00x: cease from delayed card registration ALSA: firewire-tascam: cease from delayed card registration ALSA: firewire-motu: cease from delayed card registration ALSA: fireface: cease from delayed card registration ALSA: firewire-lib: delete unused kernel API sound/firewire/bebob/bebob.c | 159 ++++++++++----------------- sound/firewire/bebob/bebob.h | 4 - sound/firewire/dice/dice.c | 138 ++++++++--------------- sound/firewire/dice/dice.h | 4 - sound/firewire/digi00x/digi00x.c | 101 +++++------------ sound/firewire/digi00x/digi00x.h | 3 - sound/firewire/fireface/ff.c | 90 +++++---------- sound/firewire/fireface/ff.h | 3 - sound/firewire/fireworks/fireworks.c | 107 ++++++------------ sound/firewire/fireworks/fireworks.h | 3 - sound/firewire/lib.c | 32 ------ sound/firewire/lib.h | 3 - sound/firewire/motu/motu.c | 84 +++++--------- sound/firewire/motu/motu.h | 3 - sound/firewire/oxfw/oxfw.c | 128 ++++++++------------- sound/firewire/oxfw/oxfw.h | 6 +- sound/firewire/tascam/tascam.c | 92 +++++----------- sound/firewire/tascam/tascam.h | 2 - 18 files changed, 296 insertions(+), 666 deletions(-) -- 2.27.0

2 10

[PATCH v2] ASoC: qcom: Fix for DMA interrupt clear reg overwriting
by Srinivasa Rao Mandadapu 07 Jun '21

07 Jun '21

The DMA interrupt clear register overwritten during simultaneous playback and capture in lpass platform interrupt handler. It's causing playback or capture stuck in similtaneous plaback on speaker and capture on dmic test. Update appropriate reg fields of corresponding channel instead of entire register write. Fixes: commit c5c8635a04711 ("ASoC: qcom: Add LPASS platform driver") Signed-off-by: Srinivasa Rao Mandadapu <srivasam(a)codeaurora.org> --- sound/soc/qcom/lpass-platform.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/sound/soc/qcom/lpass-platform.c b/sound/soc/qcom/lpass-platform.c index 0df9481ea4c6..f220a2739ac3 100644 --- a/sound/soc/qcom/lpass-platform.c +++ b/sound/soc/qcom/lpass-platform.c @@ -526,7 +526,7 @@ static int lpass_platform_pcmops_trigger(struct snd_soc_component *component, return -EINVAL; } - ret = regmap_write(map, reg_irqclr, val_irqclr); + ret = regmap_update_bits(map, reg_irqclr, val_irqclr, val_irqclr); if (ret) { dev_err(soc_runtime->dev, "error writing to irqclear reg: %d\n", ret); return ret; @@ -650,7 +650,7 @@ static irqreturn_t lpass_dma_interrupt_handler( struct lpass_variant *v = drvdata->variant; irqreturn_t ret = IRQ_NONE; int rv; - unsigned int reg = 0, val = 0; + unsigned int reg, val, val_clr, val_mask; struct regmap *map; unsigned int dai_id = cpu_dai->driver->id; @@ -676,8 +676,9 @@ static irqreturn_t lpass_dma_interrupt_handler( return -EINVAL; } if (interrupts & LPAIF_IRQ_PER(chan)) { - - rv = regmap_write(map, reg, LPAIF_IRQ_PER(chan) | val); + val_clr = LPAIF_IRQ_PER(chan) | val; + val_mask = LPAIF_IRQ_ALL(chan); + rv = regmap_update_bits(map, reg, val_mask, val_clr); if (rv) { dev_err(soc_runtime->dev, "error writing to irqclear reg: %d\n", rv); @@ -688,7 +689,9 @@ static irqreturn_t lpass_dma_interrupt_handler( } if (interrupts & LPAIF_IRQ_XRUN(chan)) { - rv = regmap_write(map, reg, LPAIF_IRQ_XRUN(chan) | val); + val_clr = (LPAIF_IRQ_XRUN(chan) | val); + val_mask = LPAIF_IRQ_ALL(chan); + rv = regmap_update_bits(map, reg, val_mask, val_clr); if (rv) { dev_err(soc_runtime->dev, "error writing to irqclear reg: %d\n", rv); @@ -700,7 +703,9 @@ static irqreturn_t lpass_dma_interrupt_handler( } if (interrupts & LPAIF_IRQ_ERR(chan)) { - rv = regmap_write(map, reg, LPAIF_IRQ_ERR(chan) | val); + val_clr = (LPAIF_IRQ_ERR(chan) | val); + val_mask = LPAIF_IRQ_ALL(chan); + rv = regmap_update_bits(map, reg, val_mask, val_clr); if (rv) { dev_err(soc_runtime->dev, "error writing to irqclear reg: %d\n", rv); -- Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.

2 2

[PATCH] ASoC: Remove unneeded semicolon in rk817_codec.c
by Wan Jiabing 07 Jun '21

07 Jun '21

Fix following coccicheck warning: ./sound/soc/codecs/rk817_codec.c:49:2-3: Unneeded semicolon Signed-off-by: Wan Jiabing <wanjiabing(a)vivo.com> --- sound/soc/codecs/rk817_codec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/rk817_codec.c b/sound/soc/codecs/rk817_codec.c index fd3a5ba034a9..414d21f22a05 100644 --- a/sound/soc/codecs/rk817_codec.c +++ b/sound/soc/codecs/rk817_codec.c @@ -46,7 +46,7 @@ static int rk817_init(struct snd_soc_component *component) if (rk817->mic_in_differential) { snd_soc_component_update_bits(component, RK817_CODEC_AMIC_CFG0, MIC_DIFF_MASK, MIC_DIFF_EN); - }; + } return 0; } -- 2.20.1

3 3

Possible ALSA bug: Cannot record via mic while PA is running
by Meghdad Moradi 07 Jun '21

07 Jun '21

Hello, Please take a look at the following thread that I created some time ago: [1]https://ubuntuforums.org/showthread.php?t=2462882&p=14041574#post140 41574 I have included most relevant and useful info in the first and last post. pa-info output: [2]https://gist.github.com/no149/5c239626048a860a882f8d412013a4e6 I'd provide further info, if it's needed. References 1. https://ubuntuforums.org/showthread.php?t=2462882&p=14041574#post14041574 2. https://gist.github.com/no149/5c239626048a860a882f8d412013a4e6

1 0

[RFC][PATCH 0/3] ALSA: pcm/firewire: allow to queue period elapse event in process context
by Takashi Sakamoto 07 Jun '21

07 Jun '21

Hi, All of drivers in ALSA firewire stack processes two chances to process isochronous packets in any isochronous context; in software IRQ context for 1394 OHCI, and in process context of ALSA PCM application. In the process context, callbacks of .pointer and .ack are utilized. The callbacks are done by ALSA PCM core under acquiring lock of PCM substream, In design of ALSA PCM core, call of snd_pcm_period_elapsed() is used for drivers to awaken user processes from waiting for available frames. The function voluntarily acquires lock of PCM substream, therefore it is not called in the process context since it causes dead lock. As a workaround to avoid the dead lock, all of drivers in ALSA firewire stack uses workqueue to delegate the call. This patchset is my attempt for the issue. A variant of 'snd_pcm_period_elapsed()' without lock acquisition is going to be added, named 'snd_pcm_period_elapsed_without_lock()'. This is used in callbacks of .pointer and .ack of snd_pcm_ops structure. The patchset is still under my test, but it looks to work well in my easy and rough test. Before posting for merge, I'd like to get your comment to the idea. When evaluating, please merge below two histories: * 64584f329352 (for-next) * 9981b20a5e36 (for-linus) Takashi Sakamoto (3): ALSA: pcm: add snd_pcm_period_elapsed() variant without acquiring lock of PCM substream ALSA: firewire-lib: queue event of period elapse in process context ALSA: firewire-lib: obsolete workqueue for period update include/sound/pcm.h | 53 ++++++++++++++++++++++++++++++++++- sound/core/pcm_lib.c | 25 +++-------------- sound/firewire/amdtp-stream.c | 46 +++++++++--------------------- sound/firewire/amdtp-stream.h | 1 - 4 files changed, 70 insertions(+), 55 deletions(-) -- 2.27.0

2 5

New lavc api
by GitHub pull_request - opened 06 Jun '21

06 Jun '21

alsa-project/alsa-plugins pull request #23 was opened from jamrial: This is untested (I don't have access to a system with alsa, but the change was straightforward enough that i could write it). It is unlikely that it will fix the silence issue described in #22, but it nonetheless is a change required in order to support future versions of ffmpeg. The silence is, as far as i could tell, related to the fact that starting with ffmpeg 4.4, the ac3_fixed encoder takes S32 planar as input, versus the S16 planar it used to. This plugin should look at the AVCodec sample_fmts[0] value and feed the encoder the appropriate data. Request URL : https://github.com/alsa-project/alsa-plugins/pull/23 Patch URL : https://github.com/alsa-project/alsa-plugins/pull/23.patch Repository URL: https://github.com/alsa-project/alsa-plugins

1 0

[PATCH 0/8] ALSA: usb-audio: scarlett2: cleanup
by Geoffrey D. Bennett 06 Jun '21

06 Jun '21

Hi Takashi, Over the next few weeks I will have ready about 40 patches to clean up the Scarlett Gen 2 mixer driver a bit, add a few missing features, and add support for all Scarlett Gen 3 models. I was planning on submitting them in batches of 5-10 at a time; is that okay? Here are the first 8 patches which are ready to go; only small cleanups/renames/fixes. They are intended to be applied after these two patches that I submitted earlier: - ALSA: usb-audio: scarlett2: Read mixer volumes at init time - ALSA: usb-audio: scarlett2: Read mux at init time Thanks, Geoffrey. Geoffrey D. Bennett (8): ALSA: usb-audio: scarlett2: Remove incorrect S/PDIF comment ALSA: usb-audio: scarlett2: Coding style improvements ALSA: usb-audio: scarlett2: Remove unused/useless code ALSA: usb-audio: scarlett2: Remove interrupt debug message ALSA: usb-audio: scarlett2: Rename buttons/interrupts ALSA: usb-audio: scarlett2: Rename struct scarlett2_mixer_data ALSA: usb-audio: scarlett2: Add temp variable for consistency ALSA: usb-audio: scarlett2: Fix data_mutex lock sound/usb/mixer_scarlett_gen2.c | 229 ++++++++++++++------------------ 1 file changed, 102 insertions(+), 127 deletions(-) -- 2.31.1

1 8

a52: not compatible with recent avcodec
by GitHub issues - opened 06 Jun '21

06 Jun '21

alsa-project/alsa-plugins issue #22 was opened from manio: Hi! Current a52 plugin is not compatible with recent changes in the FFmpeg lib. The symptom is that using newest FFmpeg the a52 plugin produces silent in the speakers. During the weekend I was able to bisect the problem and shed some light on this, and here is what I found out: 1. The a52 plugin is working fine before commit: https://github.com/FFmpeg/FFmpeg/commit/93016f5d1d280f9cb7856883af287fa66af… 2. Above commit is wrapping avcodec_encode_audio2(), which a52 plugin is using, into new API internally inside the avcodec 3. All applications should move to new so called ["avcodec_send_frame() API"](https://ffmpeg.org/doxygen/3.4/group__lavc__encdec.html) 4. After the commit in point 1 the a52 output plugin is not working anymore I was asking the commit author @jamrial about the commit and he said that the main culprit could rather be the commit: https://github.com/FFmpeg/FFmpeg/commit/2d85e6e7230406e33e61d903b9c29ab562e… which is changing the S16 to S32 for ac3_fixed encoder while the a52 plugin _"is ignoring the kind of format the encoder takes as input (Starting from the aforementioned commit, ac3_fixed takes S32 planar audio), and unconditionally feeding it S16 planar audio."_ I was trying to change the a52 from S16 to S32 but I think some more work is needed on this... I was also try to change the do_encode() function from avcodec_encode_audio2 to avcodec_send_frame() with no luck... Issue URL : https://github.com/alsa-project/alsa-plugins/issues/22 Repository URL: https://github.com/alsa-project/alsa-plugins

1 0

[PATCH] ALSA: firewire-motu: add support for hybrid model of MOTU Ultralite mk3
by Takashi Sakamoto 06 Jun '21

06 Jun '21

This commit adds support for the hybrid model of MOTU Ultralite mk3 with alpha connector, which is already discontinued. The hardware specification of the model is the same as the one of FireWire-only model. $ cd linux-firewire-utils $ python3 src/crpp < /sys/bus/firewire/devices/fw1/config_rom ROM header and bus information block ----------------------------------------------------------------- 400 04101573 bus_info_length 4, crc_length 16, crc 5491 404 31333934 bus_name "1394" 408 20ff7000 irmc 0, cmc 0, isc 1, bmc 0, cyc_clk_acc 255, max_rec 7 (256) 40c 0001f200 company_id 0001f2 | 410 000a059c device_id 00000a059c | EUI-64 0001f200000a059c root directory ----------------------------------------------------------------- 414 0004ef04 directory_length 4, crc 61188 418 030001f2 vendor 41c 0c0083c0 node capabilities per IEEE 1394 420 d1000002 --> unit directory at 428 424 8d000005 --> eui-64 leaf at 438 unit directory at 428 ----------------------------------------------------------------- 428 0003f00b directory_length 3, crc 61451 42c 120001f2 specifier id 430 13000030 version 434 17103800 model eui-64 leaf at 438 ----------------------------------------------------------------- 438 0002d89c leaf_length 2, crc 55452 43c 0001f200 company_id 0001f2 | 440 000a059c device_id 00000a059c | EUI-64 0001f200000a059c Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/firewire/Kconfig | 2 ++ sound/firewire/motu/motu.c | 1 + 2 files changed, 3 insertions(+) diff --git a/sound/firewire/Kconfig b/sound/firewire/Kconfig index def1f3d5ecf5..fc6858131b59 100644 --- a/sound/firewire/Kconfig +++ b/sound/firewire/Kconfig @@ -154,6 +154,8 @@ config SND_FIREWIRE_MOTU * 8pre * 828mk3 (FireWire only) * 828mk3 (Hybrid) + * Ultralite mk3 (FireWire only) + * Ultralite mk3 (Hybrid) * Audio Express * 4pre diff --git a/sound/firewire/motu/motu.c b/sound/firewire/motu/motu.c index a4929c1302dc..2a8a6ea2d3f1 100644 --- a/sound/firewire/motu/motu.c +++ b/sound/firewire/motu/motu.c @@ -190,6 +190,7 @@ static const struct ieee1394_device_id motu_id_table[] = { SND_MOTU_DEV_ENTRY(0x00000f, &snd_motu_spec_8pre), SND_MOTU_DEV_ENTRY(0x000015, &snd_motu_spec_828mk3), // FireWire only. SND_MOTU_DEV_ENTRY(0x000019, &snd_motu_spec_ultralite_mk3), // FireWire only. + SND_MOTU_DEV_ENTRY(0x000030, &snd_motu_spec_ultralite_mk3), // Hybrid. SND_MOTU_DEV_ENTRY(0x000035, &snd_motu_spec_828mk3), // Hybrid. SND_MOTU_DEV_ENTRY(0x000033, &snd_motu_spec_audio_express), SND_MOTU_DEV_ENTRY(0x000045, &snd_motu_spec_4pre), -- 2.27.0

2 1

[PATCH] ALSA: firewire-lib: remove useless operations for kernel preemption
by Takashi Sakamoto 06 Jun '21

06 Jun '21

In all of drivers of ALSA firewire stack, the callback of .pointer and .ack in snd_pcm_ops structure is done in acquired spin_lock of PCM substream, therefore already under disabled kernel preemption. Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/firewire/amdtp-stream.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c index 945597ffacc2..1c566ddf0776 100644 --- a/sound/firewire/amdtp-stream.c +++ b/sound/firewire/amdtp-stream.c @@ -1751,13 +1751,8 @@ unsigned long amdtp_domain_stream_pcm_pointer(struct amdtp_domain *d, // Later, the process context will sometimes schedules software // IRQ context of the period_work. Then, no need to flush the // queue by the same reason as described in the above - if (current_work() != &s->period_work) { - // Queued packet should be processed without any kernel - // preemption to keep latency against bus cycle. - preempt_disable(); + if (current_work() != &s->period_work) fw_iso_context_flush_completions(irq_target->context); - preempt_enable(); - } } return READ_ONCE(s->pcm_buffer_pointer); @@ -1777,13 +1772,8 @@ int amdtp_domain_stream_pcm_ack(struct amdtp_domain *d, struct amdtp_stream *s) // Process isochronous packets for recent isochronous cycle to handle // queued PCM frames. - if (irq_target && amdtp_stream_running(irq_target)) { - // Queued packet should be processed without any kernel - // preemption to keep latency against bus cycle. - preempt_disable(); + if (irq_target && amdtp_stream_running(irq_target)) fw_iso_context_flush_completions(irq_target->context); - preempt_enable(); - } return 0; } -- 2.27.0

2 1