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

[PATCH 0/3] Add Probe functionality support for amd platforms.
by V sujith kumar Reddy 18 Jul '23

18 Jul '23

The Patch series consists of probe functionality support for amd platforms. V sujith kumar Reddy (3): ASoC: SOF: amd: Add Probe functionality support for amd platforms. ASoC: SOF: Add acp-probe id to sof probe client driver for registration. ASoC: SOF: amd: Add Probe register offset for renoir and rembrandt platform. sound/soc/sof/amd/Kconfig | 8 ++ sound/soc/sof/amd/Makefile | 1 + sound/soc/sof/amd/acp-common.c | 4 + sound/soc/sof/amd/acp-ipc.c | 26 ++++++ sound/soc/sof/amd/acp-probes.c | 147 ++++++++++++++++++++++++++++++ sound/soc/sof/amd/acp.h | 9 ++ sound/soc/sof/amd/pci-rmb.c | 2 + sound/soc/sof/amd/pci-rn.c | 2 + sound/soc/sof/sof-client-probes.c | 1 + 9 files changed, 200 insertions(+) create mode 100644 sound/soc/sof/amd/acp-probes.c -- 2.25.1

2 4

[PATCH] ASoC: fsl_sai: Disable bit clock with transmitter
by Matus Gajdos 18 Jul '23

18 Jul '23

Otherwise bit clock remains running writing invalid data to the DAC. Signed-off-by: Matus Gajdos <matuszpd(a)gmail.com> --- sound/soc/fsl/fsl_sai.c | 2 +- sound/soc/fsl/fsl_sai.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index 5e09f634c61b..dcc7fbe7acac 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -719,7 +719,7 @@ static void fsl_sai_config_disable(struct fsl_sai *sai, int dir) u32 xcsr, count = 100; regmap_update_bits(sai->regmap, FSL_SAI_xCSR(tx, ofs), - FSL_SAI_CSR_TERE, 0); + FSL_SAI_CSR_TERE | FSL_SAI_CSR_BCE, 0); /* TERE will remain set till the end of current frame */ do { diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h index 8254c3547b87..550df87b6a06 100644 --- a/sound/soc/fsl/fsl_sai.h +++ b/sound/soc/fsl/fsl_sai.h @@ -91,6 +91,7 @@ /* SAI Transmit/Receive Control Register */ #define FSL_SAI_CSR_TERE BIT(31) #define FSL_SAI_CSR_SE BIT(30) +#define FSL_SAI_CSR_BCE BIT(28) #define FSL_SAI_CSR_FR BIT(25) #define FSL_SAI_CSR_SR BIT(24) #define FSL_SAI_CSR_xF_SHIFT 16 -- 2.25.1

4 5

[PATCH] ALSA: gus: Fix errors in gus_mem.c
by shijie001＠208suo.com 18 Jul '23

18 Jul '23

The following checkpatch errors are removed: ERROR: trailing whitespace ERROR: "foo * bar" should be "foo *bar" Signed-off-by: Jie Shi <shijie001(a)208suo.com> --- sound/isa/gus/gus_mem.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sound/isa/gus/gus_mem.c b/sound/isa/gus/gus_mem.c index 3e56c01c4544..00c73c0b068f 100644 --- a/sound/isa/gus/gus_mem.c +++ b/sound/isa/gus/gus_mem.c @@ -11,11 +11,11 @@ #include <sound/info.h> #ifdef CONFIG_SND_DEBUG -static void snd_gf1_mem_info_read(struct snd_info_entry *entry, +static void snd_gf1_mem_info_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer); #endif -void snd_gf1_mem_lock(struct snd_gf1_mem * alloc, int xup) +void snd_gf1_mem_lock(struct snd_gf1_mem *alloc, int xup) { if (!xup) { mutex_lock(&alloc->memory_mutex); @@ -67,7 +67,7 @@ snd_gf1_mem_xalloc(struct snd_gf1_mem *alloc, struct snd_gf1_mem_block *block, return nblock; } -int snd_gf1_mem_xfree(struct snd_gf1_mem * alloc, struct snd_gf1_mem_block * block) +int snd_gf1_mem_xfree(struct snd_gf1_mem *alloc, struct snd_gf1_mem_block *block) { if (block->share) { /* ok.. shared block */ block->share--; @@ -97,7 +97,7 @@ int snd_gf1_mem_xfree(struct snd_gf1_mem * alloc, struct snd_gf1_mem_block * blo return 0; } -static struct snd_gf1_mem_block *snd_gf1_mem_look(struct snd_gf1_mem * alloc, +static struct snd_gf1_mem_block *snd_gf1_mem_look(struct snd_gf1_mem *alloc, unsigned int address) { struct snd_gf1_mem_block *block; @@ -110,7 +110,7 @@ static struct snd_gf1_mem_block *snd_gf1_mem_look(struct snd_gf1_mem * alloc, return NULL; } -static struct snd_gf1_mem_block *snd_gf1_mem_share(struct snd_gf1_mem * alloc, +static struct snd_gf1_mem_block *snd_gf1_mem_share(struct snd_gf1_mem *alloc, unsigned int *share_id) { struct snd_gf1_mem_block *block; @@ -125,8 +125,8 @@ static struct snd_gf1_mem_block *snd_gf1_mem_share(struct snd_gf1_mem * alloc, return NULL; } -static int snd_gf1_mem_find(struct snd_gf1_mem * alloc, - struct snd_gf1_mem_block * block, +static int snd_gf1_mem_find(struct snd_gf1_mem *alloc, + struct snd_gf1_mem_block *block, unsigned int size, int w_16, int align) { struct snd_gf1_bank_info *info = w_16 ? alloc->banks_16 : alloc->banks_8; @@ -177,7 +177,7 @@ static int snd_gf1_mem_find(struct snd_gf1_mem * alloc, return -ENOMEM; } -struct snd_gf1_mem_block *snd_gf1_mem_alloc(struct snd_gf1_mem * alloc, int owner, +struct snd_gf1_mem_block *snd_gf1_mem_alloc(struct snd_gf1_mem *alloc, int owner, char *name, int size, int w_16, int align, unsigned int *share_id) { @@ -210,7 +210,7 @@ struct snd_gf1_mem_block *snd_gf1_mem_alloc(struct snd_gf1_mem * alloc, int owne return nblock; } -int snd_gf1_mem_free(struct snd_gf1_mem * alloc, unsigned int address) +int snd_gf1_mem_free(struct snd_gf1_mem *alloc, unsigned int address) { int result; struct snd_gf1_mem_block *block; @@ -226,7 +226,7 @@ int snd_gf1_mem_free(struct snd_gf1_mem * alloc, unsigned int address) return -EINVAL; } -int snd_gf1_mem_init(struct snd_gus_card * gus) +int snd_gf1_mem_init(struct snd_gus_card *gus) { struct snd_gf1_mem *alloc; struct snd_gf1_mem_block block; @@ -255,7 +255,7 @@ int snd_gf1_mem_init(struct snd_gus_card * gus) return 0; } -int snd_gf1_mem_done(struct snd_gus_card * gus) +int snd_gf1_mem_done(struct snd_gus_card *gus) { struct snd_gf1_mem *alloc; struct snd_gf1_mem_block *block, *nblock; @@ -271,7 +271,7 @@ int snd_gf1_mem_done(struct snd_gus_card * gus) } #ifdef CONFIG_SND_DEBUG -static void snd_gf1_mem_info_read(struct snd_info_entry *entry, +static void snd_gf1_mem_info_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer) { struct snd_gus_card *gus;

1 0

[PATCH 0/2] Add support for rpmsg sound card on i.MX93 platform
by Chancel Liu 17 Jul '23

17 Jul '23

Support rpmsg sound card on i.MX93 platform. Chancel Liu (2): ASoC: dt-bindings: fsl_rpmsg: Add compatible string for i.MX93 ASoC: fsl_rpmsg: Add support for i.MX93 platform Documentation/devicetree/bindings/sound/fsl,rpmsg.yaml | 1 + sound/soc/fsl/fsl_rpmsg.c | 8 ++++++++ 2 files changed, 9 insertions(+) -- 2.25.1

4 5

[PATCH 0/4] ASoC: qcom: Use the maple tree register cache
by Mark Brown 17 Jul '23

17 Jul '23

The maple tree register cache should now be a good replacement for the rbtree cache in almost all situations, update the Qualcomm CODEC drivers to use the newer cache. --- Mark Brown (4): ASoC: wcd9335: Update to use maple tree register cache ASoC: wcd938x: Update to use maple tree register cache ASoC: wsa881x: Update to use maple tree register cache ASoC: wsa883x: Update to use maple tree register cache sound/soc/codecs/wcd9335.c | 2 +- sound/soc/codecs/wcd938x-sdw.c | 2 +- sound/soc/codecs/wsa881x.c | 2 +- sound/soc/codecs/wsa883x.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) --- base-commit: 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 change-id: 20230629-asoc-qcom-maple-02adff47e26f Best regards, -- Mark Brown <broonie(a)kernel.org>

1 5

[PATCH 1/5] ASoC: bcm: bcm63xx-i2s-whistler: Convert to devm_platform_ioremap_resource()
by Yangtao Li 17 Jul '23

17 Jul '23

Use devm_platform_ioremap_resource() to simplify code. Signed-off-by: Yangtao Li <frank.li(a)vivo.com> --- sound/soc/bcm/bcm63xx-i2s-whistler.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/sound/soc/bcm/bcm63xx-i2s-whistler.c b/sound/soc/bcm/bcm63xx-i2s-whistler.c index 18c51dbbc8dc..c64609718738 100644 --- a/sound/soc/bcm/bcm63xx-i2s-whistler.c +++ b/sound/soc/bcm/bcm63xx-i2s-whistler.c @@ -225,7 +225,6 @@ static int bcm63xx_i2s_dev_probe(struct platform_device *pdev) { int ret = 0; void __iomem *regs; - struct resource *r_mem, *region; struct bcm_i2s_priv *i2s_priv; struct regmap *regmap_i2s; struct clk *i2s_clk; @@ -241,20 +240,7 @@ static int bcm63xx_i2s_dev_probe(struct platform_device *pdev) return PTR_ERR(i2s_clk); } - r_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!r_mem) { - dev_err(&pdev->dev, "Unable to get register resource.\n"); - return -ENODEV; - } - - region = devm_request_mem_region(&pdev->dev, r_mem->start, - resource_size(r_mem), DRV_NAME); - if (!region) { - dev_err(&pdev->dev, "Memory region already claimed\n"); - return -EBUSY; - } - - regs = devm_ioremap_resource(&pdev->dev, r_mem); + regs = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(regs)) { ret = PTR_ERR(regs); return ret; -- 2.39.0

3 6

[syzbot] [alsa?] memory leak in snd_seq_create_port
by syzbot 17 Jul '23

17 Jul '23

Hello, syzbot found the following issue on: HEAD commit: 3f01e9fed845 Merge tag 'linux-watchdog-6.5-rc2' of git://w.. git tree: upstream console output: https://syzkaller.appspot.com/x/log.txt?x=14b07344a80000 kernel config: https://syzkaller.appspot.com/x/.config?x=75da4f0a455bdbd3 dashboard link: https://syzkaller.appspot.com/bug?extid=cf8e7fa4eeec59b3d485 compiler: gcc (Debian 10.2.1-6) 10.2.1 20210110, GNU ld (GNU Binutils for Debian) 2.35.2 syz repro: https://syzkaller.appspot.com/x/repro.syz?x=15877dc2a80000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=12905004a80000 Downloadable assets: disk image: https://storage.googleapis.com/syzbot-assets/441fb7ea58b8/disk-3f01e9fe.raw… vmlinux: https://storage.googleapis.com/syzbot-assets/8fa7790ba0c3/vmlinux-3f01e9fe.… kernel image: https://storage.googleapis.com/syzbot-assets/5e7a6471dadf/bzImage-3f01e9fe.… IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syzbot+cf8e7fa4eeec59b3d485(a)syzkaller.appspotmail.com Warning: Permanently added '10.128.1.1' (ED25519) to the list of known hosts. executing program executing program BUG: memory leak unreferenced object 0xffff888100877000 (size 512): comm "syz-executor257", pid 5012, jiffies 4294941742 (age 12.790s) hex dump (first 32 bytes): 80 ff 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ backtrace: [<ffffffff8154bf94>] kmalloc_trace+0x24/0x90 mm/slab_common.c:1076 [<ffffffff83d29e28>] kmalloc include/linux/slab.h:582 [inline] [<ffffffff83d29e28>] kzalloc include/linux/slab.h:703 [inline] [<ffffffff83d29e28>] snd_seq_create_port+0x78/0x300 sound/core/seq/seq_ports.c:135 [<ffffffff83d1f681>] snd_seq_ioctl_create_port+0xe1/0x2a0 sound/core/seq/seq_clientmgr.c:1324 [<ffffffff83d20e5e>] snd_seq_ioctl+0x13e/0x290 sound/core/seq/seq_clientmgr.c:2327 [<ffffffff81685173>] vfs_ioctl fs/ioctl.c:51 [inline] [<ffffffff81685173>] __do_sys_ioctl fs/ioctl.c:870 [inline] [<ffffffff81685173>] __se_sys_ioctl fs/ioctl.c:856 [inline] [<ffffffff81685173>] __x64_sys_ioctl+0x103/0x140 fs/ioctl.c:856 [<ffffffff84a77ff9>] do_syscall_x64 arch/x86/entry/common.c:50 [inline] [<ffffffff84a77ff9>] do_syscall_64+0x39/0xb0 arch/x86/entry/common.c:80 [<ffffffff84c0008b>] entry_SYSCALL_64_after_hwframe+0x63/0xcd BUG: memory leak unreferenced object 0xffff888106742c00 (size 512): comm "syz-executor257", pid 5013, jiffies 4294942276 (age 7.450s) hex dump (first 32 bytes): 80 ff 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ backtrace: [<ffffffff8154bf94>] kmalloc_trace+0x24/0x90 mm/slab_common.c:1076 [<ffffffff83d29e28>] kmalloc include/linux/slab.h:582 [inline] [<ffffffff83d29e28>] kzalloc include/linux/slab.h:703 [inline] [<ffffffff83d29e28>] snd_seq_create_port+0x78/0x300 sound/core/seq/seq_ports.c:135 [<ffffffff83d1f681>] snd_seq_ioctl_create_port+0xe1/0x2a0 sound/core/seq/seq_clientmgr.c:1324 [<ffffffff83d20e5e>] snd_seq_ioctl+0x13e/0x290 sound/core/seq/seq_clientmgr.c:2327 [<ffffffff81685173>] vfs_ioctl fs/ioctl.c:51 [inline] [<ffffffff81685173>] __do_sys_ioctl fs/ioctl.c:870 [inline] [<ffffffff81685173>] __se_sys_ioctl fs/ioctl.c:856 [inline] [<ffffffff81685173>] __x64_sys_ioctl+0x103/0x140 fs/ioctl.c:856 [<ffffffff84a77ff9>] do_syscall_x64 arch/x86/entry/common.c:50 [inline] [<ffffffff84a77ff9>] do_syscall_64+0x39/0xb0 arch/x86/entry/common.c:80 [<ffffffff84c0008b>] entry_SYSCALL_64_after_hwframe+0x63/0xcd --- This report is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syzkaller(a)googlegroups.com. syzbot will keep track of this issue. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot. If the bug is already fixed, let syzbot know by replying with: #syz fix: exact-commit-title If you want syzbot to run the reproducer, reply with: #syz test: git://repo/address.git branch-or-commit-hash If you attach or paste a git patch, syzbot will apply it before testing. If you want to change bug's subsystems, reply with: #syz set subsystems: new-subsystem (See the list of subsystem names on the web dashboard) If the bug is a duplicate of another bug, reply with: #syz dup: exact-subject-of-another-report If you want to undo deduplication, reply with: #syz undup

4 7

[PATCH] ASoC: SOF: ipc3-dtrace: uninitialized data in dfsentry_trace_filter_write()
by Dan Carpenter 17 Jul '23

17 Jul '23

This doesn't check how many bytes the simple_write_to_buffer() writes to the buffer. The only thing that we know is that the first byte is initialized and the last byte of the buffer is set to NUL. However the middle bytes could be uninitialized. There is no need to use simple_write_to_buffer(). This code does not support partial writes but instead passes "pos = 0" as the starting offset regardless of what the user passed as "*ppos". Just use the copy_from_user() function and initialize the whole buffer. Fixes: 671e0b90051e ("ASoC: SOF: Clone the trace code to ipc3-dtrace as fw_tracing implementation") Signed-off-by: Dan Carpenter <dan.carpenter(a)linaro.org> --- The nicer thing to do would have been to use strndup_user() but that comes with a small risk of breaking user space and I can't test this so I didn't do that. sound/soc/sof/ipc3-dtrace.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sound/soc/sof/ipc3-dtrace.c b/sound/soc/sof/ipc3-dtrace.c index 1d3bca2d28dd..35da85a45a9a 100644 --- a/sound/soc/sof/ipc3-dtrace.c +++ b/sound/soc/sof/ipc3-dtrace.c @@ -186,7 +186,6 @@ static ssize_t dfsentry_trace_filter_write(struct file *file, const char __user struct snd_sof_dfsentry *dfse = file->private_data; struct sof_ipc_trace_filter_elem *elems = NULL; struct snd_sof_dev *sdev = dfse->sdev; - loff_t pos = 0; int num_elems; char *string; int ret; @@ -201,11 +200,11 @@ static ssize_t dfsentry_trace_filter_write(struct file *file, const char __user if (!string) return -ENOMEM; - /* assert null termination */ - string[count] = 0; - ret = simple_write_to_buffer(string, count, &pos, from, count); - if (ret < 0) + if (copy_from_user(string, from, count)) { + ret = -EFAULT; goto error; + } + string[count] = '\0'; ret = trace_filter_parse(sdev, string, &num_elems, &elems); if (ret < 0) -- 2.39.2

2 1

[PATCH] ASoC: cs42l51: fix driver to properly autoload with automatic module loading
by Thomas Petazzoni 17 Jul '23

17 Jul '23

In commit 2cb1e0259f50 ("ASoC: cs42l51: re-hook of_match_table pointer"), 9 years ago, some random guy fixed the cs42l51 after it was split into a core part and an I2C part to properly match based on a Device Tree compatible string. However, the fix in this commit is wrong: the MODULE_DEVICE_TABLE(of, ....) is in the core part of the driver, not the I2C part. Therefore, automatic module loading based on module.alias, based on matching with the DT compatible string, loads the core part of the driver, but not the I2C part. And threfore, the i2c_driver is not registered, and the codec is not known to the system, nor matched with a DT node with the corresponding compatible string. In order to fix that, we move the MODULE_DEVICE_TABLE(of, ...) into the I2C part of the driver. The cs42l51_of_match[] array is also moved as well, as it is not possible to have this definition in one file, and the MODULE_DEVICE_TABLE(of, ...) invocation in another file, due to how MODULE_DEVICE_TABLE works. Thanks to this commit, the I2C part of the driver now properly autoloads, and thanks to its dependency on the core part, the core part gets autoloaded as well, resulting in a functional sound card without having to manually load kernel modules. Fixes: 2cb1e0259f50 ("ASoC: cs42l51: re-hook of_match_table pointer") Cc: stable(a)vger.kernel.org Signed-off-by: Thomas Petazzoni <thomas.petazzoni(a)bootlin.com> --- sound/soc/codecs/cs42l51-i2c.c | 6 ++++++ sound/soc/codecs/cs42l51.c | 7 ------- sound/soc/codecs/cs42l51.h | 1 - 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/cs42l51-i2c.c b/sound/soc/codecs/cs42l51-i2c.c index b2106ff6a7cb..e7db7bcd0296 100644 --- a/sound/soc/codecs/cs42l51-i2c.c +++ b/sound/soc/codecs/cs42l51-i2c.c @@ -19,6 +19,12 @@ static struct i2c_device_id cs42l51_i2c_id[] = { }; MODULE_DEVICE_TABLE(i2c, cs42l51_i2c_id); +const struct of_device_id cs42l51_of_match[] = { + { .compatible = "cirrus,cs42l51", }, + { } +}; +MODULE_DEVICE_TABLE(of, cs42l51_of_match); + static int cs42l51_i2c_probe(struct i2c_client *i2c) { struct regmap_config config; diff --git a/sound/soc/codecs/cs42l51.c b/sound/soc/codecs/cs42l51.c index a67cd3ee84e0..a7079ae0ca09 100644 --- a/sound/soc/codecs/cs42l51.c +++ b/sound/soc/codecs/cs42l51.c @@ -823,13 +823,6 @@ int __maybe_unused cs42l51_resume(struct device *dev) } EXPORT_SYMBOL_GPL(cs42l51_resume); -const struct of_device_id cs42l51_of_match[] = { - { .compatible = "cirrus,cs42l51", }, - { } -}; -MODULE_DEVICE_TABLE(of, cs42l51_of_match); -EXPORT_SYMBOL_GPL(cs42l51_of_match); - MODULE_AUTHOR("Arnaud Patard <arnaud.patard(a)rtp-net.org>"); MODULE_DESCRIPTION("Cirrus Logic CS42L51 ALSA SoC Codec Driver"); MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/cs42l51.h b/sound/soc/codecs/cs42l51.h index a79343e8a54e..125703ede113 100644 --- a/sound/soc/codecs/cs42l51.h +++ b/sound/soc/codecs/cs42l51.h @@ -16,7 +16,6 @@ int cs42l51_probe(struct device *dev, struct regmap *regmap); void cs42l51_remove(struct device *dev); int __maybe_unused cs42l51_suspend(struct device *dev); int __maybe_unused cs42l51_resume(struct device *dev); -extern const struct of_device_id cs42l51_of_match[]; #define CS42L51_CHIP_ID 0x1B #define CS42L51_CHIP_REV_A 0x00 -- 2.41.0

2 1

[PATCH v2 0/8] ALSA: emu10k1: add support for high-bitrate modes of E-MU cards
by Oswald Buddenhagen 17 Jul '23

17 Jul '23

This series is what all the work was about: support the "dual-/quad-pumped" modes of the E-MU cards. Oswald Buddenhagen (8): ALSA: emu10k1: introduce alternative E-MU D.A.S. mode ALSA: emu10k1: improve mixer control naming in E-MU D.A.S. mode ALSA: emu10k1: set the "no filtering" bits on PCM voices ALSA: emu10k1: make playback in E-MU D.A.S. mode 32-bit ALSA: add snd_ctl_add_locked() ALSA: emu10k1: add support for 2x/4x word clocks in E-MU D.A.S. mode ALSA: emu10k1: add high-rate capture in E-MU D.A.S. mode ALSA: emu10k1: add high-rate playback in E-MU D.A.S. mode include/sound/control.h | 1 + include/sound/emu10k1.h | 11 + sound/core/control.c | 31 ++ sound/pci/emu10k1/emu10k1.c | 29 +- sound/pci/emu10k1/emu10k1_main.c | 19 +- sound/pci/emu10k1/emufx.c | 109 +++- sound/pci/emu10k1/emumixer.c | 901 +++++++++++++++++++++++++++---- sound/pci/emu10k1/emupcm.c | 422 +++++++++++++-- sound/pci/emu10k1/emuproc.c | 5 + sound/pci/emu10k1/io.c | 30 +- sound/pci/emu10k1/voice.c | 6 + 11 files changed, 1383 insertions(+), 181 deletions(-) Range-diff against v1: 1: c8c1fbba5e52 = 1: 7cb49147164f ALSA: emu10k1: introduce alternative E-MU D.A.S. mode 2: 879066428bee = 2: aa9ead00e045 ALSA: emu10k1: improve mixer control naming in E-MU D.A.S. mode 3: b663229a0f46 = 3: ac830e67322f ALSA: emu10k1: set the "no filtering" bits on PCM voices 4: a9de9a73571e = 4: 26e0b7c02c1d ALSA: emu10k1: make playback in E-MU D.A.S. mode 32-bit 5: 0f1950b03193 ! 5: 94b64e6c123d ALSA: add snd_ctl_add_locked() @@ Commit message This is in fact more symmetrical to snd_ctl_remove() than snd_ctl_add() is - the former could be named snd_ctl_remove_locked() just as well. + One may argue that this is going in the wrong direction, as drivers have + no business managing the lock. This may be true in principle, but in + practice the vast majority of controls is created even before the device + was registered, and therefore before any locking is necessary at all. + That means that an even more radical approach of changing snd_ctl_add() + do do no locking, and converting the call sites that actually need + locking to a new function, would better match reality, and would be + somewhat more efficient at that. However, that seems a bit risky and way + too much work. + This will be used to dynamically change the available controls from another control's put() callback, which is already locked. One might want to add snd_ctl_replace_locked() for completeness, but I have no use for it now. Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen(a)gmx.de> + --- + v2: + - extended commit message ## include/sound/control.h ## @@ include/sound/control.h: void snd_ctl_notify_one(struct snd_card * card, unsigned int mask, struct snd_kc 6: 511efe4ac7ad ! 6: 7bc314bae7f2 ALSA: emu10k1: add support for 2x/4x word clocks in E-MU D.A.S. mode @@ Commit message on playback, and throw away the excess ones on capture. Input-to-output monitoring does actually use the full sample rate, though. - Notably, add_ctls() now uses snd_ctl_add_locked(), so it doesn't - deadlock when called from snd_emu1010_clock_shift_put(). This also - affects the initial creation of the controls, which is OK, as that is - done before the card is registered, so no concurrent access can occur. + Due to hardware constraints, changing the clock multiplier (CM) changes + the available audio ports and the number of available channels. This has + an impact on the channel routing mixer controls. One way to deal with + this would be presenting a union of all possibilities, and simply + ignoring currently inapplicable settings. However, this would be a + terrible user experience, and go against the spirit of prior patches + aimed at decluttering the mixer. Therefore, we do dynamic + reconfiguration (DR) of the mixer in response to changing the CM. + + DR is somewhat controversial, as it has the potential to crash poorly + programmed applications. But that in itself isn't a very convincing + argument against it, as by that logic we'd have to ban all hot-plugging. + Such crashes would also not really qualify as regressions, as the D.A.S. + mode is a new opt-in feature, and therefore no previously stable setups + would be impacted. Also, pendantically, the driver already had DR via + SNDRV_EMU10K1_IOCTL_CODE_POKE. A somewhat valid concern is that changing + mixer settings is a non-privileged operation and therefore potential + crashes could be exploited for a somewhat more impactful nuisance attack + on another user than messing with the mixer per se. However, systemd & + co. limit device access to the user currently logged in on the seat + owning the device. + + There is a specific concern about doing DR in response to changing a + mixer control's value, as an application may legitimately react to DR by + updating all mixer settings in turn. However, that update should write + the same value to the clock multiplier, thus terminating the recursion. + + One may limit DR to merely disabling inapplicable controls, in the hope + that this would be better handled than completely tearing down and + re-creating controls as we do. However, there is no guarantee for that. + And because it is impossible to disable particular enum values within a + control, it would be necessary to have three complete sets of + per-channel controls. This would yield an extremely cluttered and + confusing UI if the application (reasonably) chose to merely visually + disable inactive controls rather than hiding them. + + We do the DR synchronously from within snd_emu1010_clock_shift_put(). + This was enabled by commit 5bbb1ab5bd ("control: use counting semaphore + as write lock for ELEM_WRITE operation"); we merely need to make + add_ctls() use snd_ctl_add_locked() instead of snd_ctl_add(), so it + doesn't deadlock. That also affects the initial creation of the + controls, which is OK, as that is done before the card is registered, so + no concurrent access can occur. + + It would be possible to do the DR in a tasklet after the ioctl finishes. + However, it is not obvious what actual problem that would solve, and the + added asynchronicity would significantly complicate matters, esp. wrt. + the batch updates expected during mixer state restoration. Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen(a)gmx.de> + --- + v2: + - expanded commit message ## include/sound/emu10k1.h ## @@ include/sound/emu10k1.h: struct snd_emu1010 { 7: d5cb50ca707f = 7: 72a156fb32cd ALSA: emu10k1: add high-rate capture in E-MU D.A.S. mode 8: 319425a4ccb6 ! 8: 6d35891832b3 ALSA: emu10k1: add high-rate playback in E-MU D.A.S. mode @@ Commit message d948035a92 ("Remove PCM xfer_align sw params"). Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen(a)gmx.de> + --- + v2: + - fixed `sparse` warning re missing __user annotation ## sound/pci/emu10k1/emufx.c ## @@ sound/pci/emu10k1/emufx.c: static int _snd_emu10k1_das_init_efx(struct snd_emu10k1 *emu) @@ sound/pci/emu10k1/emupcm.c: static int snd_emu10k1_efx_playback_trigger(struct s + for (i = 0; i < channels; i++) { + for (j = 0; j < subchans; j++) { + u32 *dst = get_dma_ptr_x(runtime, shift, i, j, hwoff); -+ u32 *src = (u32 *)buf + j * channels + i; ++ u32 __user *src = (u32 __user *)buf + j * channels + i; + for (k = 0; k < frames; k++, dst++, src += voices) + unsafe_get_user(*dst, src, faulted); + } -- 2.40.0.152.g15d061e6df

2 14