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

[PATCH 1/2] ALSA: pcm: Fix error checks of default read/write copy ops
by Takashi Iwai 02 Sep '23

02 Sep '23

copy_from/to_iter() returns the actually copied bytes, and the more correct check should be to compare with the given bytes, instead of zero-check. Fixes: cf393babb37a ("ALSA: pcm: Add copy ops with iov_iter") Reported-by: Al Viro <viro(a)zeniv.linux.org.uk> Closes: https://lore.kernel.org/r/20230902053044.GJ3390869@ZenIV Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/pcm_lib.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index 4859fb1caec9..a11cd7d6295f 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -1992,8 +1992,8 @@ static int default_write_copy(struct snd_pcm_substream *substream, int channel, unsigned long hwoff, struct iov_iter *iter, unsigned long bytes) { - if (!copy_from_iter(get_dma_ptr(substream->runtime, channel, hwoff), - bytes, iter)) + if (copy_from_iter(get_dma_ptr(substream->runtime, channel, hwoff), + bytes, iter) != bytes) return -EFAULT; return 0; } @@ -2025,8 +2025,8 @@ static int default_read_copy(struct snd_pcm_substream *substream, int channel, unsigned long hwoff, struct iov_iter *iter, unsigned long bytes) { - if (!copy_to_iter(get_dma_ptr(substream->runtime, channel, hwoff), - bytes, iter)) + if (copy_to_iter(get_dma_ptr(substream->runtime, channel, hwoff), + bytes, iter) != bytes) return -EFAULT; return 0; } -- 2.35.3

1 1

[PATCH v2 00/25] ALSA: Generic PCM copy ops using iov_iter
by Takashi Iwai 02 Sep '23

02 Sep '23

Hi, this is a v2 patch set for cleaning up the PCM copy ops using iov_iter to deal with kernel / user-space pointers consistently. v1->v2: * The error condition checks of copy_to/from_iter() are changed to be more strictly * Put Acked and Reviewed tags * The indents in the patch in dmaengine was slightly changed v1: https://lore.kernel.org/r/20230814115523.15279-1-tiwai@suse.de Takashi === Cc: Alexander Viro <viro(a)zeniv.linux.org.uk> Cc: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> Cc: Andrey Utkin <andrey_utkin(a)fastmail.com> Cc: Anton Sviridenko <anton(a)corp.bluecherry.net> Cc: Arnaud Pouliquen <arnaud.pouliquen(a)foss.st.com> Cc: Banajit Goswami <bgoswami(a)quicinc.com> Cc: Bluecherry Maintainers <maintainers(a)bluecherrydvr.com> Cc: Claudiu Beznea <claudiu.beznea(a)microchip.com> Cc: Ismael Luceno <ismael(a)iodev.co.uk> Cc: Lars-Peter Clausen <lars(a)metafoo.de> Cc: Mark Brown <broonie(a)kernel.org> Cc: Mauro Carvalho Chehab <mchehab(a)kernel.org> Cc: Oleksandr Andrushchenko <oleksandr_andrushchenko(a)epam.com> Cc: Olivier Moysan <olivier.moysan(a)foss.st.com> Cc: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Cc: linux-media(a)vger.kernel.org Cc: xen-devel(a)lists.xenproject.org === Takashi Iwai (25): iov_iter: Export import_ubuf() ALSA: pcm: Add copy ops with iov_iter ALSA: core: Add memory copy helpers between iov_iter and iomem ALSA: dummy: Convert to generic PCM copy ops ALSA: gus: Convert to generic PCM copy ops ALSA: emu8000: Convert to generic PCM copy ops ALSA: es1938: Convert to generic PCM copy ops ALSA: korg1212: Convert to generic PCM copy ops ALSA: nm256: Convert to generic PCM copy ops ALSA: rme32: Convert to generic PCM copy ops ALSA: rme96: Convert to generic PCM copy ops ALSA: hdsp: Convert to generic PCM copy ops ALSA: rme9652: Convert to generic PCM copy ops ALSA: sh: Convert to generic PCM copy ops ALSA: xen: Convert to generic PCM copy ops ALSA: pcmtest: Update comment about PCM copy ops media: solo6x10: Convert to generic PCM copy ops ASoC: component: Add generic PCM copy ops ASoC: mediatek: Convert to generic PCM copy ops ASoC: qcom: Convert to generic PCM copy ops ASoC: dmaengine: Convert to generic PCM copy ops ASoC: dmaengine: Use iov_iter for process callback, too ALSA: doc: Update description for the new PCM copy ops ASoC: pcm: Drop obsoleted PCM copy_user ops ALSA: pcm: Drop obsoleted PCM copy_user and copy_kernel ops .../kernel-api/writing-an-alsa-driver.rst | 58 ++++------- drivers/media/pci/solo6x10/solo6x10-g723.c | 39 ++------ include/sound/dmaengine_pcm.h | 2 +- include/sound/pcm.h | 13 ++- include/sound/soc-component.h | 14 +-- lib/iov_iter.c | 1 + sound/core/memory.c | 56 +++++++++-- sound/core/pcm_lib.c | 95 ++++++++++--------- sound/core/pcm_native.c | 2 +- sound/drivers/dummy.c | 12 +-- sound/drivers/pcmtest.c | 2 +- sound/isa/gus/gus_pcm.c | 23 +---- sound/isa/sb/emu8000_pcm.c | 74 ++++----------- sound/pci/es1938.c | 30 +----- sound/pci/korg1212/korg1212.c | 50 +++------- sound/pci/nm256/nm256.c | 42 ++------ sound/pci/rme32.c | 50 +++------- sound/pci/rme96.c | 42 ++------ sound/pci/rme9652/hdsp.c | 42 ++------ sound/pci/rme9652/rme9652.c | 46 ++------- sound/sh/sh_dac_audio.c | 25 +---- sound/soc/atmel/mchp-pdmc.c | 2 +- sound/soc/mediatek/common/mtk-btcvsd.c | 27 ++---- sound/soc/qcom/lpass-platform.c | 13 +-- sound/soc/soc-component.c | 16 ++-- sound/soc/soc-generic-dmaengine-pcm.c | 18 ++-- sound/soc/soc-pcm.c | 4 +- sound/soc/stm/stm32_sai_sub.c | 2 +- sound/xen/xen_snd_front_alsa.c | 56 +++-------- 29 files changed, 269 insertions(+), 587 deletions(-) -- 2.35.3

3 30

Re: [PATCH v2 00/11] Fix support for System Suspend for CS35L41 HDA
by Waldek Andrukiewicz 01 Sep '23

01 Sep '23

On 28.07.23 15:55, Stefan Binding wrote: > > On 28/07/2023 12:10, Takashi Iwai wrote: >> On Mon, 24 Jul 2023 11:00:38 +0200, >> Takashi Iwai wrote: >>> On Fri, 21 Jul 2023 17:18:05 +0200, >>> Stefan Binding wrote: >>>> There have been a couple of customer reports of intermittant issues >>>> after >>>> system resume, where sometimes the DSP firmware stops responding. >>>> Investigations into this issue show that there is a race between >>>> receiving >>>> a prepare from the HDA core, and the firmware reload which is >>>> started by >>>> the system resume. This can causes the Global Enable on the CS35L41 >>>> to be >>>> enabled during the firmware load, which can sometimes cause issues >>>> in the >>>> DSP. >>>> >>>> The existing system resume behaviour also did not resume the audio, if >>>> audio was previously playing when it was suspended. >>>> In addition, during investigation, it was found there were additional >>>> problems in the System Resume sequence, as well as the Playback >>>> sequence >>>> with External Boost, where the driver does not correctly follow its >>>> enable sequence for this mode. This can cause additional issues >>>> such as >>>> pops and clicks. >>>> >>>> This chain intends to correct the sequences for playback and system >>>> suspend/resume so that the driver: obeys the external boost enable >>>> sequence; >>>> resumes audio on system resume; and avoids the race condition on >>>> firmware >>>> load and playback during system resume. >>>> >>>> Changes since v1: >>>> - Split patch 1 into 2 separate patches >>>> - Combine Patches 6 and 9 >>>> >>>> Stefan Binding (11): >>>> ALSA: cs35l41: Use mbox command to enable speaker output for >>>> external >>>> boost >>>> ALSA: cs35l41: Poll for Power Up/Down rather than waiting a fixed >>>> delay >>>> ALSA: hda: cs35l41: Check mailbox status of pause command after >>>> firmware load >>>> ALSA: hda: cs35l41: Ensure we correctly re-sync regmap before >>>> system >>>> suspending. >>>> ALSA: hda: cs35l41: Ensure we pass up any errors during system >>>> suspend. >>>> ALSA: hda: cs35l41: Move Play and Pause into separate functions >>>> ALSA: hda: hda_component: Add pre and post playback hooks to >>>> hda_component >>>> ALSA: hda: cs35l41: Use pre and post playback hooks >>>> ALSA: hda: cs35l41: Rework System Suspend to ensure correct call >>>> separation >>>> ALSA: hda: cs35l41: Add device_link between HDA and cs35l41_hda >>>> ALSA: hda: cs35l41: Ensure amp is only unmuted during playback >>> Applied all patches now to for-next branch. >> It seems that this patch set causes occasional freeze at suspend: >> https://bugzilla.suse.com/show_bug.cgi?id=1213745 >> >> Could you take a look? >> >> >> thanks, >> >> Takashi > > Hi Takashi, > > The initial bug report shows one of the original issues that this patch > chain was trying to fix. > From what I can tell from the second issue, something has caused the > CS35L41 to stop responding, > which in turn caused the system suspend call to fail, and the error is > passed up. Since system suspend > failed, there was no corresponding system resume, which means the > CS35L41 was stuck broken. > > I'm not sure what was meant by "freeze" and "overheating" in the bug > report, since the log seems to > indicate the laptop is still responsive, even if audio is broken. > > There is some oddity in the log, since one of the errors that was > printed should only be printed when > the CS35L41 is using External Boost, but I think this laptop is supposed > to use Internal Boost. > We'll investigate further. > > Thanks, > > Stefan Binding Hello, I would like to inform you that (one of) those patches is probably breaking sound on Lenovo Legion 7 16ACHg6. They were applied in Manjaro Linux kernel here: https://gitlab.manjaro.org/packages/core/linux64/-/commit/742e66f525170fe02… and when I install this kernel, there is no sound anymore. There is nothing more than those patches in this commit. A kernel compiled from the previous commit works fine. Sound used to work fine from 5.17 if I remember correctly. I hope I replied correctly to this thread, if not, apologies. Best Regards, Waldek Andrukiewicz

3 2

[PATCH 1/2] ASoC: dmaengine: Drop unused iov_iter for process callback
by Takashi Iwai 01 Sep '23

01 Sep '23

Passing the iov_iter to the process callback is rather buggy, as the iterator has been already processed for playback. Similarly, it makes the copy for capture buggy after the process callback reading the iterator out. Moreover, all existing process callbacks don't refer to the passed iterator at all. So, it's better to drop the argument from the process callback. Fixes: 9bebd65443c1 ("ASoC: dmaengine: Use iov_iter for process callback, too") Suggested-by: Linus Torvalds <torvalds(a)linux-foundation.org> Link: https://lore.kernel.org/r/CAHk-=wje+VkXjjfVTmK-uJdG_M5=ar14QxAwK+XDiq07k_pz… Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- include/sound/dmaengine_pcm.h | 2 +- sound/soc/atmel/mchp-pdmc.c | 2 +- sound/soc/soc-generic-dmaengine-pcm.c | 4 ++-- sound/soc/stm/stm32_sai_sub.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/sound/dmaengine_pcm.h b/include/sound/dmaengine_pcm.h index c9a8bce9a785..d70c55f17df7 100644 --- a/include/sound/dmaengine_pcm.h +++ b/include/sound/dmaengine_pcm.h @@ -142,7 +142,7 @@ struct snd_dmaengine_pcm_config { struct snd_pcm_substream *substream); int (*process)(struct snd_pcm_substream *substream, int channel, unsigned long hwoff, - struct iov_iter *buf, unsigned long bytes); + unsigned long bytes); dma_filter_fn compat_filter_fn; struct device *dma_dev; const char *chan_names[SNDRV_PCM_STREAM_LAST + 1]; diff --git a/sound/soc/atmel/mchp-pdmc.c b/sound/soc/atmel/mchp-pdmc.c index afe213a71212..dcc4e14b3dde 100644 --- a/sound/soc/atmel/mchp-pdmc.c +++ b/sound/soc/atmel/mchp-pdmc.c @@ -954,7 +954,7 @@ static int mchp_pdmc_dt_init(struct mchp_pdmc *dd) /* used to clean the channel index found on RHR's MSB */ static int mchp_pdmc_process(struct snd_pcm_substream *substream, int channel, unsigned long hwoff, - struct iov_iter *buf, unsigned long bytes) + unsigned long bytes) { struct snd_pcm_runtime *runtime = substream->runtime; u8 *dma_ptr = runtime->dma_area + hwoff + diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c index ff2166525dbc..7a07fbf98e2e 100644 --- a/sound/soc/soc-generic-dmaengine-pcm.c +++ b/sound/soc/soc-generic-dmaengine-pcm.c @@ -296,7 +296,7 @@ static int dmaengine_copy(struct snd_soc_component *component, struct dmaengine_pcm *pcm = soc_component_to_pcm(component); int (*process)(struct snd_pcm_substream *substream, int channel, unsigned long hwoff, - struct iov_iter *buf, unsigned long bytes) = pcm->config->process; + unsigned long bytes) = pcm->config->process; bool is_playback = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; void *dma_ptr = runtime->dma_area + hwoff + channel * (runtime->dma_bytes / runtime->channels); @@ -306,7 +306,7 @@ static int dmaengine_copy(struct snd_soc_component *component, return -EFAULT; if (process) { - int ret = process(substream, channel, hwoff, buf, bytes); + int ret = process(substream, channel, hwoff, bytes); if (ret < 0) return ret; } diff --git a/sound/soc/stm/stm32_sai_sub.c b/sound/soc/stm/stm32_sai_sub.c index f9b5d5969155..0acc848c1f00 100644 --- a/sound/soc/stm/stm32_sai_sub.c +++ b/sound/soc/stm/stm32_sai_sub.c @@ -1246,7 +1246,7 @@ static const struct snd_soc_dai_ops stm32_sai_pcm_dai_ops2 = { static int stm32_sai_pcm_process_spdif(struct snd_pcm_substream *substream, int channel, unsigned long hwoff, - struct iov_iter *buf, unsigned long bytes) + unsigned long bytes) { struct snd_pcm_runtime *runtime = substream->runtime; struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); -- 2.35.3

2 3

[PATCH v3 0/2] Match data improvements for wm8580 driver
by Biju Das 01 Sep '23

01 Sep '23

This patch series aims to add match data improvements for wm8580 driver. This patch series is only compile tested. v2->v3: * Added Rb tag from Andy. * Restored OF table postion and moved in patch#2 * Moved OF table near to the user. v1->v2: * Added Ack from Charles Keepax. * Removed comma in the terminator entry. * Restored original error code -EINVAL Biju Das (2): ASoC: wm8580: Simplify probe() ASoC: wm8580: Move OF table sound/soc/codecs/wm8580.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) -- 2.25.1

2 5

Sound recorded by the internal microphone is very low
by GitHub issues - opened 01 Sep '23

01 Sep '23

alsa-project/alsa-ucm-conf issue #345 was opened from pseudocc: Even if it is set to the maximum value, headphone microphone is good. http://alsa-project.org/db/?f=0fdb2be1be960a5efe41fdcc5aab9436f4c91d1f Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/345 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0