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

[PATCH -next] ASoC: imx-audio-rpmsg: Remove redundant initialization owner in imx_audio_rpmsg_driver
by Li Zetao 08 Aug '23

08 Aug '23

The module_rpmsg_driver() will set "THIS_MODULE" to driver.owner when register a rpmsg_driver driver, so it is redundant initialization to set driver.owner in the statement. Remove it for clean code. Signed-off-by: Li Zetao <lizetao1(a)huawei.com> --- sound/soc/fsl/imx-audio-rpmsg.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/fsl/imx-audio-rpmsg.c b/sound/soc/fsl/imx-audio-rpmsg.c index d5234ac4b09b..289e47c03d40 100644 --- a/sound/soc/fsl/imx-audio-rpmsg.c +++ b/sound/soc/fsl/imx-audio-rpmsg.c @@ -116,7 +116,6 @@ static struct rpmsg_device_id imx_audio_rpmsg_id_table[] = { static struct rpmsg_driver imx_audio_rpmsg_driver = { .drv.name = "imx_audio_rpmsg", - .drv.owner = THIS_MODULE, .id_table = imx_audio_rpmsg_id_table, .probe = imx_audio_rpmsg_probe, .callback = imx_audio_rpmsg_cb, -- 2.34.1

2 1

[linux-next:master] BUILD REGRESSION 71cd4fc492ec41e4acd85e98bbf7a13753fc1e03
by kernel test robot 08 Aug '23

08 Aug '23

tree/branch: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git master branch HEAD: 71cd4fc492ec41e4acd85e98bbf7a13753fc1e03 Add linux-next specific files for 20230808 Error/Warning reports: https://lore.kernel.org/oe-kbuild-all/202307251531.p8ZLFTMZ-lkp@intel.com https://lore.kernel.org/oe-kbuild-all/202308081459.US5rLYAY-lkp@intel.com Error/Warning: (recently discovered and may have been fixed) ../lib/gcc/loongarch64-linux/12.3.0/plugin/include/config/loongarch/loongarch-opts.h:31:10: fatal error: loongarch-def.h: No such file or directory drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dmub_replay.c:37: warning: This comment starts with '/**', but isn't a kernel-doc comment. Refer Documentation/doc-guide/kernel-doc.rst sound/soc/codecs/aw88261.c:651:7: warning: variable 'ret' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized] Unverified Error/Warning (likely false positive, please contact us if interested): drivers/gpu/drm/tests/drm_exec_test.c:166 test_prepare_array() error: uninitialized symbol 'ret'. drivers/mtd/nand/raw/qcom_nandc.c:2590 qcom_op_cmd_mapping() error: uninitialized symbol 'ret'. drivers/mtd/nand/raw/qcom_nandc.c:3017 qcom_check_op() warn: was && intended here instead of ||? kernel/futex/waitwake.c:422 futex_wait_multiple_setup() warn: bitwise AND condition is false here sh4-linux-gcc: internal compiler error: Segmentation fault signal terminated program cc1 {standard input}: Warning: end of file not at end of a line; newline inserted {standard input}:927: Error: pcrel too far Error/Warning ids grouped by kconfigs: gcc_recent_errors |-- alpha-allyesconfig | `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst |-- arc-allyesconfig | `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst |-- arm-allmodconfig | `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst |-- arm-allyesconfig | `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst |-- arm64-allyesconfig | `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst |-- csky-randconfig-m041-20230808 | `-- drivers-gpu-drm-tests-drm_exec_test.c-test_prepare_array()-error:uninitialized-symbol-ret-. |-- i386-allyesconfig | `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst |-- loongarch-allmodconfig | `-- lib-gcc-loongarch64-linux-..-plugin-include-config-loongarch-loongarch-opts.h:fatal-error:loongarch-def.h:No-such-file-or-directory |-- mips-allmodconfig | `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst |-- mips-allyesconfig | `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst |-- parisc-allyesconfig | `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst |-- powerpc-allmodconfig | `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst |-- riscv-allmodconfig | `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst |-- riscv-allyesconfig | `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst |-- riscv-randconfig-m031-20230808 | |-- drivers-gpu-drm-tests-drm_exec_test.c-test_prepare_array()-error:uninitialized-symbol-ret-. | |-- drivers-mtd-nand-raw-qcom_nandc.c-qcom_check_op()-warn:was-intended-here-instead-of | |-- drivers-mtd-nand-raw-qcom_nandc.c-qcom_op_cmd_mapping()-error:uninitialized-symbol-ret-. | `-- kernel-futex-waitwake.c-futex_wait_multiple_setup()-warn:bitwise-AND-condition-is-false-here |-- s390-allyesconfig | `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst |-- s390-randconfig-r044-20230808 | `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst |-- sh-allmodconfig | |-- sh4-linux-gcc:internal-compiler-error:Segmentation-fault-signal-terminated-program-cc1 | |-- standard-input:Error:pcrel-too-far | `-- standard-input:Warning:end-of-file-not-at-end-of-a-line-newline-inserted |-- sparc-allyesconfig | `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst |-- x86_64-allyesconfig | `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst `-- xtensa-randconfig-r022-20230808 `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-dce-dmub_replay.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst clang_recent_errors `-- arm64-randconfig-r006-20230808 `-- sound-soc-codecs-aw88261.c:warning:variable-ret-is-used-uninitialized-whenever-if-condition-is-false elapsed time: 721m configs tested: 106 configs skipped: 5 tested configs: alpha allyesconfig gcc alpha defconfig gcc arc allyesconfig gcc arc defconfig gcc arc randconfig-r034-20230808 gcc arc randconfig-r043-20230808 gcc arm allmodconfig gcc arm allyesconfig gcc arm defconfig gcc arm randconfig-r012-20230808 clang arm randconfig-r046-20230808 clang arm64 allyesconfig gcc arm64 defconfig gcc arm64 randconfig-r001-20230808 clang csky defconfig gcc csky randconfig-r024-20230808 gcc hexagon randconfig-r015-20230808 clang hexagon randconfig-r031-20230808 clang hexagon randconfig-r041-20230808 clang hexagon randconfig-r045-20230808 clang i386 allyesconfig gcc i386 buildonly-randconfig-r004-20230808 clang i386 buildonly-randconfig-r005-20230808 clang i386 buildonly-randconfig-r006-20230808 clang i386 debian-10.3 gcc i386 defconfig gcc i386 randconfig-i001-20230808 clang i386 randconfig-i002-20230808 clang i386 randconfig-i003-20230808 clang i386 randconfig-i004-20230808 clang i386 randconfig-i005-20230808 clang i386 randconfig-i006-20230808 clang i386 randconfig-i011-20230808 gcc i386 randconfig-i012-20230808 gcc i386 randconfig-i013-20230808 gcc i386 randconfig-i014-20230808 gcc i386 randconfig-i015-20230808 gcc i386 randconfig-i016-20230808 gcc i386 randconfig-r014-20230808 gcc loongarch allmodconfig gcc loongarch allnoconfig gcc loongarch defconfig gcc m68k allmodconfig gcc m68k allyesconfig gcc m68k defconfig gcc m68k randconfig-r004-20230808 gcc mips allmodconfig gcc mips allyesconfig gcc nios2 defconfig gcc parisc allyesconfig gcc parisc defconfig gcc parisc randconfig-r002-20230808 gcc parisc randconfig-r016-20230808 gcc parisc64 defconfig gcc powerpc allmodconfig gcc powerpc allnoconfig gcc powerpc randconfig-r005-20230808 clang riscv allmodconfig gcc riscv allnoconfig gcc riscv allyesconfig gcc riscv defconfig gcc riscv randconfig-r042-20230808 gcc riscv rv32_defconfig gcc s390 allmodconfig gcc s390 allyesconfig gcc s390 defconfig gcc s390 randconfig-r011-20230808 gcc s390 randconfig-r023-20230808 gcc s390 randconfig-r044-20230808 gcc sh allmodconfig gcc sh randconfig-r006-20230808 gcc sh randconfig-r025-20230808 gcc sparc allyesconfig gcc sparc defconfig gcc um allmodconfig clang um allnoconfig clang um allyesconfig clang um defconfig gcc um i386_defconfig gcc um randconfig-r033-20230808 gcc um x86_64_defconfig gcc x86_64 allyesconfig gcc x86_64 buildonly-randconfig-r001-20230808 clang x86_64 buildonly-randconfig-r002-20230808 clang x86_64 buildonly-randconfig-r003-20230808 clang x86_64 defconfig gcc x86_64 kexec gcc x86_64 randconfig-r003-20230808 clang x86_64 randconfig-r021-20230808 gcc x86_64 randconfig-x001-20230808 gcc x86_64 randconfig-x002-20230808 gcc x86_64 randconfig-x003-20230808 gcc x86_64 randconfig-x004-20230808 gcc x86_64 randconfig-x005-20230808 gcc x86_64 randconfig-x006-20230808 gcc x86_64 randconfig-x011-20230808 clang x86_64 randconfig-x012-20230808 clang x86_64 randconfig-x013-20230808 clang x86_64 randconfig-x014-20230808 clang x86_64 randconfig-x015-20230808 clang x86_64 randconfig-x016-20230808 clang x86_64 rhel-8.3-rust clang x86_64 rhel-8.3 gcc xtensa randconfig-r013-20230808 gcc xtensa randconfig-r022-20230808 gcc xtensa randconfig-r035-20230808 gcc -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[PATCH] ASoC: amd: acp3x-rt5682-max9836: Configure jack as not detecting Line Out
by Alper Nebi Yasak 08 Aug '23

08 Aug '23

The RT5682, RT1015 and RT1015p codecs used in this driver do not seem capable of distinguishing Line Out connections from Headphone, but the driver configures its jack object as if it can. Remove the wrong value from the jack creation call to avoid any confusion. Signed-off-by: Alper Nebi Yasak <alpernebiyasak(a)gmail.com> --- Depends on [1] which applies onto of linux-next. Untested, see [2]: [1] https://lore.kernel.org/alsa-devel/20230802175737.263412-5-alpernebiyasak@g… [2] https://lore.kernel.org/alsa-devel/3d6794c9-60d3-b8f3-99d2-afdc69593d9f@gma… sound/soc/amd/acp3x-rt5682-max9836.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/amd/acp3x-rt5682-max9836.c b/sound/soc/amd/acp3x-rt5682-max9836.c index 3bf7e1e83c36..28ad5f5b9a76 100644 --- a/sound/soc/amd/acp3x-rt5682-max9836.c +++ b/sound/soc/amd/acp3x-rt5682-max9836.c @@ -98,7 +98,7 @@ static int acp3x_5682_init(struct snd_soc_pcm_runtime *rtd) rt5682_dai_bclk = clk_get(component->dev, "rt5682-dai-bclk"); ret = snd_soc_card_jack_new_pins(card, "Headset Jack", - SND_JACK_HEADSET | SND_JACK_LINEOUT | + SND_JACK_HEADSET | SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2 | SND_JACK_BTN_3, &pco_jack, base-commit: 626c67169f9972fffcdf3bc3864de421f162ebf5 prerequisite-patch-id: 7158530856f8f97324906b342528a5ffe7b4032b -- 2.40.1

4 3

[PATCH 00/20] ASoC: SOF: Intel: add LunarLake support
by Pierre-Louis Bossart 08 Aug '23

08 Aug '23

IMPORTANT NOTE: this patchset is dependent on Takashi's hda-intel-6.6 tag. The PCI parts will not compile without merging this tag into the ASoC tree. This patchset first fixes a number of errors made in the hda-mlink support, then adds Lunar Lake definitions. The main contribution is the hda-dai changes where the HDaudio DMA is now used for SSP, DMIC and SoundWire. In previous hardware the GPDMA (aka DesignWare) was used and controlled by the audio firmware. The volume of code is minimized with the abstraction added in previous kernel cycles. Due to cross-dependencies between ASoC and SoundWire trees, the full support for jack detection will be deferred to the next kernel cycle. There's not much point to ask for a sync of the two trees to support one patch for each tree - we are at -rc5 already. Pierre-Louis Bossart (18): ASoC: SOF: Intel: hda-mlink: fix off-by-one error ASoC: SOF: Intel: fix u16/32 confusion in LSDIID ASoC: SOF: ipc4-topology: restore gateway config length ASoC: SOF: Intel: hda: add interface definitions for ACE2.x ASoC: SOF: Intel: split MTL and LNL operations ASoC: SOF: Intel: LNL: enable DMIC/SSP offload in probe/resume ASoC: SOF: Intel: hda-dai-ops: add/select DMA ops for SSP ASoC: SOF: Intel: hda-dai: add ops for SSP ASoC: SOF: Intel: hda-dai: add DMIC support ASoC: SOF: Intel: hda-dai-ops: only allocate/release streams for first CPU DAI ASoC: SOF: Intel: hda-dai-ops: add ops for SoundWire ASoC: SOF: Intel: hda-dai: add helpers for SoundWire callbacks ASoC: SOF: Intel: hda: add hw_params/free/trigger callbacks ASoC: SOF: Intel: add abstraction for SoundWire wake-ups ASoC: SOF: Intel: hda-mlink: add helper to get sublink LSDIID register ASoC: SOF: Intel: hda-dai-ops: reset device count for SoundWire DAIs ASoC: SOF: IPC4: clarify 'pipeline_ids' usage and logs ASoC: SOF: Intel: hda-mlink: add sublink to dev_dbg() log Ranjani Sridharan (2): ASoC: SOF: ipc4: avoid uninitialized default instance 0 ASoC: SOF: Intel: LNL: Add support for Lunarlake platform include/sound/hda-mlink.h | 4 + sound/soc/sof/intel/Kconfig | 16 +++ sound/soc/sof/intel/Makefile | 4 +- sound/soc/sof/intel/cnl.c | 2 + sound/soc/sof/intel/hda-dai-ops.c | 179 ++++++++++++++++++++++++- sound/soc/sof/intel/hda-dai.c | 211 +++++++++++++++++++++++++++++- sound/soc/sof/intel/hda-mlink.c | 45 ++++++- sound/soc/sof/intel/hda.c | 58 +++++++- sound/soc/sof/intel/hda.h | 21 +++ sound/soc/sof/intel/icl.c | 1 + sound/soc/sof/intel/lnl.c | 189 ++++++++++++++++++++++++++ sound/soc/sof/intel/mtl.c | 23 ++-- sound/soc/sof/intel/mtl.h | 22 +++- sound/soc/sof/intel/pci-lnl.c | 71 ++++++++++ sound/soc/sof/intel/shim.h | 1 + sound/soc/sof/intel/tgl.c | 4 + sound/soc/sof/ipc4-pcm.c | 21 +-- sound/soc/sof/ipc4-topology.c | 7 + sound/soc/sof/ipc4-topology.h | 4 +- sound/soc/sof/topology.c | 2 + 20 files changed, 842 insertions(+), 43 deletions(-) create mode 100644 sound/soc/sof/intel/lnl.c create mode 100644 sound/soc/sof/intel/pci-lnl.c -- 2.39.2

2 23

[PATCH 0/2] ASoC: Intel: sof_sdw: fix two settings
by Pierre-Louis Bossart 08 Aug '23

08 Aug '23

Fix button mapping for CS42L42 and jack detection for LunarLake RVP. Pierre-Louis Bossart (1): ASoC: Intel: sof-sdw: update jack detection quirk for LunarLake RVP jairaj-arava (1): ASoC: Intel: sof-sdw-cs42142: fix for codec button mapping sound/soc/intel/boards/sof_sdw.c | 2 +- sound/soc/intel/boards/sof_sdw_cs42l42.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) -- 2.39.2

2 5

[PATCH -next] ASoC: SOF: ipc3-dtrace: Switch to memdup_user_nul() helper
by Yang Yingliang 08 Aug '23

08 Aug '23

Use memdup_user_nul() helper instead of open-coding to simplify the code. Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- sound/soc/sof/ipc3-dtrace.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/sound/soc/sof/ipc3-dtrace.c b/sound/soc/sof/ipc3-dtrace.c index 35da85a45a9a..bd07f0472efd 100644 --- a/sound/soc/sof/ipc3-dtrace.c +++ b/sound/soc/sof/ipc3-dtrace.c @@ -196,15 +196,9 @@ static ssize_t dfsentry_trace_filter_write(struct file *file, const char __user return -EINVAL; } - string = kmalloc(count + 1, GFP_KERNEL); - if (!string) - return -ENOMEM; - - if (copy_from_user(string, from, count)) { - ret = -EFAULT; - goto error; - } - string[count] = '\0'; + string = memdup_user_nul(from, count); + if (IS_ERR(string)) + return PTR_ERR(string); ret = trace_filter_parse(sdev, string, &num_elems, &elems); if (ret < 0) -- 2.25.1

2 1

Regression fix not progressing towards mainline/stable
by Thorsten Leemhuis 08 Aug '23

08 Aug '23

Hi everyone, I noticed a regression fix that afaics lingers in the thesofproject's git repo instead of progressing towards the stable trees and wondered what's up here. I'm talking about about the fix "ASoC: SOF: intel: hda: Clean up link DMA for IPC3 during stop" for this ticket: https://github.com/thesofproject/linux/issues/4455 Two more tickets about it: https://github.com/thesofproject/linux/issues/4482 https://bugzilla.kernel.org/show_bug.cgi?id=217673 It seems the fix is ready and reviewed for two weeks now, but not even in -next by now. That's not how it should be for regression fixes, as per https://docs.kernel.org/process/handling-regressions.html it ideally should be in -stable soon or already. Is this a mistake, am I missing something, or is there a good reason for this? Ciao, Thorsten

2 2

[PATCH] ALSA: hda/tegra: refactor deprecated strncpy
by Justin Stitt 08 Aug '23

08 Aug '23

`strncpy` is deprecated for use on NUL-terminated destination strings [1]. A suitable replacement is `strscpy` [2] due to the fact that it guarantees NUL-termination on its destination buffer argument which is _not_ the case for `strncpy`! It should be noted that the current implementation is unlikely to have a bug because `drv_name` is a string literal with a size of 9 while `card->driver` has a size of 16. However, it is probably worthwhile to switch to a more robust and less ambiguous interface. [1]: www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-termi… [2]: https://manpages.debian.org/testing/linux-manual-4.8/strscpy.9.en.html Link: https://github.com/KSPP/linux/issues/90 Cc: linux-hardening(a)vger.kernel.org Signed-off-by: Justin Stitt <justinstitt(a)google.com> --- sound/pci/hda/hda_tegra.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/pci/hda/hda_tegra.c b/sound/pci/hda/hda_tegra.c index 9d0ab043880b..f16740500d46 100644 --- a/sound/pci/hda/hda_tegra.c +++ b/sound/pci/hda/hda_tegra.c @@ -378,14 +378,14 @@ static int hda_tegra_first_init(struct azx *chip, struct platform_device *pdev) } /* driver name */ - strncpy(card->driver, drv_name, sizeof(card->driver)); + strscpy(card->driver, drv_name, sizeof(card->driver)); /* shortname for card */ sname = of_get_property(np, "nvidia,model", NULL); if (!sname) sname = drv_name; if (strlen(sname) > sizeof(card->shortname)) dev_info(card->dev, "truncating shortname for card\n"); - strncpy(card->shortname, sname, sizeof(card->shortname)); + strscpy(card->shortname, sname, sizeof(card->shortname)); /* longname for card */ snprintf(card->longname, sizeof(card->longname), --- base-commit: c1a515d3c0270628df8ae5f5118ba859b85464a2 change-id: 20230803-sound-pci-hda-c3a712b72a35 Best regards, -- Justin Stitt <justinstitt(a)google.com>

2 1

[PATCH -next] ALSA: info: Remove unused function declarations
by Yue Haibing 08 Aug '23

08 Aug '23

These declarations is never used since beginning of git history. Signed-off-by: Yue Haibing <yuehaibing(a)huawei.com> --- include/sound/info.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/sound/info.h b/include/sound/info.h index 7c13bf52cc81..adbc506860d6 100644 --- a/include/sound/info.h +++ b/include/sound/info.h @@ -118,8 +118,6 @@ struct snd_info_entry *snd_info_create_card_entry(struct snd_card *card, const char *name, struct snd_info_entry *parent); void snd_info_free_entry(struct snd_info_entry *entry); -int snd_info_store_text(struct snd_info_entry *entry); -int snd_info_restore_text(struct snd_info_entry *entry); int snd_info_card_create(struct snd_card *card); int snd_info_card_register(struct snd_card *card); -- 2.34.1

2 1

[PATCH v2 1/2] ALSA: pcmtest: Move buffer iterator initialization to prepare callback
by Ivan Orlov 08 Aug '23

08 Aug '23

Trigger callback is not the best place for buffer iterator initialization, so move it out to the prepare callback, where it have to be. Minor enhancement: remove blank line. Signed-off-by: Ivan Orlov <ivan.orlov0322(a)gmail.com> --- V1 -> V2: - Split changes in the patch into two different patches sound/drivers/pcmtest.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/sound/drivers/pcmtest.c b/sound/drivers/pcmtest.c index 08e14b5eb772..dc7c9c758537 100644 --- a/sound/drivers/pcmtest.c +++ b/sound/drivers/pcmtest.c @@ -92,7 +92,6 @@ MODULE_PARM_DESC(inject_trigger_err, "Inject EINVAL error in the 'trigger' callb module_param(inject_open_err, bool, 0600); MODULE_PARM_DESC(inject_open_err, "Inject EBUSY error in the 'open' callback"); - struct pcmtst { struct snd_pcm *pcm; struct snd_card *card; @@ -405,25 +404,9 @@ static int snd_pcmtst_pcm_close(struct snd_pcm_substream *substream) static int snd_pcmtst_pcm_trigger(struct snd_pcm_substream *substream, int cmd) { - struct snd_pcm_runtime *runtime = substream->runtime; - struct pcmtst_buf_iter *v_iter = runtime->private_data; - if (inject_trigger_err) return -EINVAL; - v_iter->sample_bytes = runtime->sample_bits / 8; - v_iter->period_bytes = frames_to_bytes(runtime, runtime->period_size); - if (runtime->access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED || - runtime->access == SNDRV_PCM_ACCESS_MMAP_NONINTERLEAVED) { - v_iter->chan_block = runtime->dma_bytes / runtime->channels; - v_iter->interleaved = false; - } else { - v_iter->interleaved = true; - } - // We want to record RATE * ch_cnt samples per sec, it is rate * sample_bytes * ch_cnt bytes - v_iter->s_rw_ch = runtime->rate / TIMER_PER_SEC; - v_iter->b_rw = v_iter->s_rw_ch * v_iter->sample_bytes * runtime->channels; - return 0; } @@ -454,8 +437,24 @@ static void pcmtst_pdev_release(struct device *dev) static int snd_pcmtst_pcm_prepare(struct snd_pcm_substream *substream) { + struct snd_pcm_runtime *runtime = substream->runtime; + struct pcmtst_buf_iter *v_iter = runtime->private_data; + if (inject_prepare_err) return -EINVAL; + + v_iter->sample_bytes = samples_to_bytes(runtime, 1); + v_iter->period_bytes = snd_pcm_lib_period_bytes(substream); + v_iter->interleaved = true; + if (runtime->access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED || + runtime->access == SNDRV_PCM_ACCESS_MMAP_NONINTERLEAVED) { + v_iter->chan_block = snd_pcm_lib_buffer_bytes(substream) / runtime->channels; + v_iter->interleaved = false; + } + // We want to record RATE * ch_cnt samples per sec, it is rate * sample_bytes * ch_cnt bytes + v_iter->s_rw_ch = runtime->rate / TIMER_PER_SEC; + v_iter->b_rw = v_iter->s_rw_ch * v_iter->sample_bytes * runtime->channels; + return 0; } -- 2.34.1

2 2