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

[PATCH -next] soc: fsl_asrc: Make some functions static
by ChenTao 07 May '20

07 May '20

Fix the following warning: sound/soc/fsl/fsl_asrc.c:157:5: warning: symbol 'fsl_asrc_request_pair' was not declared. Should it be static? sound/soc/fsl/fsl_asrc.c:200:6: warning: symbol 'fsl_asrc_release_pair' was not declared. Should it be static? Reported-by: Hulk Robot <hulkci(a)huawei.com> Signed-off-by: ChenTao <chentao107(a)huawei.com> --- sound/soc/fsl/fsl_asrc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c index 067a54ab554f..432936039de4 100644 --- a/sound/soc/fsl/fsl_asrc.c +++ b/sound/soc/fsl/fsl_asrc.c @@ -154,7 +154,7 @@ static void fsl_asrc_sel_proc(int inrate, int outrate, * within range [ANCA, ANCA+ANCB-1], depends on the channels of pair A * while pair A and pair C are comparatively independent. */ -int fsl_asrc_request_pair(int channels, struct fsl_asrc_pair *pair) +static int fsl_asrc_request_pair(int channels, struct fsl_asrc_pair *pair) { enum asrc_pair_index index = ASRC_INVALID_PAIR; struct fsl_asrc *asrc = pair->asrc; @@ -197,7 +197,7 @@ int fsl_asrc_request_pair(int channels, struct fsl_asrc_pair *pair) * * It clears the resource from asrc and releases the occupied channels. */ -void fsl_asrc_release_pair(struct fsl_asrc_pair *pair) +static void fsl_asrc_release_pair(struct fsl_asrc_pair *pair) { struct fsl_asrc *asrc = pair->asrc; enum asrc_pair_index index = pair->index; -- 2.22.0

2 1

[PATCH] ASoC: mediatek: mt8183: fix error handling of platform_get_irq()
by Tzung-Bi Shih 07 May '20

07 May '20

platform_get_irq() returns negative value on error instead of 0. Signed-off-by: Tzung-Bi Shih <tzungbi(a)google.com> --- sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) The patch is inspired by https://patchwork.kernel.org/patch/11531297/ diff --git a/sound/soc/mediatek/mt8183/mt8183-afe-pcm.c b/sound/soc/mediatek/mt8183/mt8183-afe-pcm.c index c8ded53bde1d..e0c4714da92c 100644 --- a/sound/soc/mediatek/mt8183/mt8183-afe-pcm.c +++ b/sound/soc/mediatek/mt8183/mt8183-afe-pcm.c @@ -1186,10 +1186,9 @@ static int mt8183_afe_pcm_dev_probe(struct platform_device *pdev) /* request irq */ irq_id = platform_get_irq(pdev, 0); - if (!irq_id) { - dev_err(dev, "%pOFn no irq found\n", dev->of_node); - return -ENXIO; - } + if (irq_id < 0) + return irq_id; + ret = devm_request_irq(dev, irq_id, mt8183_afe_irq_handler, IRQF_TRIGGER_NONE, "asys-isr", (void *)afe); if (ret) { -- 2.26.2.526.g744177e7f7-goog

2 1

KASAN: use-after-free Write in snd_rawmidi_kernel_write1
by butt3rflyh4ck 07 May '20

07 May '20

I report a bug (in linux-5.7-rc1) found by syzkaller. kernel config: https://github.com/butterflyhack/syzkaller-fuzz/blob/master/v5.7.0-rc1.conf… reproducer: https://github.com/butterflyhack/syzkaller-fuzz/blob/master/repro.cprog I test the reproducer in linux-5.7-rc4 and crash too. crash log: ================================================================== BUG: KASAN: use-after-free in _copy_from_user+0x113/0x1a0 lib/usercopy.c:13 Write of size 1 at addr ffff888069da43ca by task syz-executor611/6797 CPU: 0 PID: 6797 Comm: syz-executor611 Not tainted 5.7.0-rc1 #3 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1ubuntu1 04/01/2014 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x188/0x20d lib/dump_stack.c:118 print_address_description.constprop.0.cold+0xd3/0x347 mm/kasan/report.c:382 __kasan_report.cold+0x35/0x4d mm/kasan/report.c:511 kasan_report+0x33/0x50 mm/kasan/common.c:625 check_memory_region_inline mm/kasan/generic.c:187 [inline] check_memory_region+0x141/0x190 mm/kasan/generic.c:193 _copy_from_user+0x113/0x1a0 lib/usercopy.c:13 copy_from_user include/linux/uaccess.h:144 [inline] snd_rawmidi_kernel_write1+0x320/0x6f0 sound/core/rawmidi.c:1363 snd_rawmidi_write+0x2e4/0xb80 sound/core/rawmidi.c:1429 __vfs_write+0x76/0x100 fs/read_write.c:495 vfs_write+0x268/0x5d0 fs/read_write.c:559 ksys_write+0x1ee/0x250 fs/read_write.c:612 do_syscall_64+0xf6/0x7d0 arch/x86/entry/common.c:295 entry_SYSCALL_64_after_hwframe+0x49/0xb3 RIP: 0033:0x4553a9 Code: 00 00 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 bc ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007f556b7f5cc8 EFLAGS: 00000246 ORIG_RAX: 0000000000000001 RAX: ffffffffffffffda RBX: 00000000006d9588 RCX: 00000000004553a9 RDX: 00000000fffffc85 RSI: 0000000020000040 RDI: 0000000000000004 RBP: 00000000006d9580 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 00000000006d958c R13: 0000000000000000 R14: 00000000006d9580 R15: 00007fff34bcb390 Allocated by task 6797: save_stack+0x1b/0x40 mm/kasan/common.c:49 set_track mm/kasan/common.c:57 [inline] __kasan_kmalloc mm/kasan/common.c:495 [inline] __kasan_kmalloc.constprop.0+0xbf/0xd0 mm/kasan/common.c:468 kmalloc_node include/linux/slab.h:578 [inline] kvmalloc_node+0x61/0xf0 mm/util.c:574 kvmalloc include/linux/mm.h:757 [inline] kvzalloc include/linux/mm.h:765 [inline] snd_rawmidi_runtime_create sound/core/rawmidi.c:141 [inline] open_substream+0x33d/0x880 sound/core/rawmidi.c:285 rawmidi_open_priv+0x58e/0x6e0 sound/core/rawmidi.c:336 snd_rawmidi_open+0x455/0xb20 sound/core/rawmidi.c:433 snd_open+0x212/0x3d0 sound/core/sound.c:163 chrdev_open+0x219/0x5c0 fs/char_dev.c:414 do_dentry_open+0x4ba/0x1290 fs/open.c:797 do_open fs/namei.c:3229 [inline] path_openat+0x1e59/0x27d0 fs/namei.c:3346 do_filp_open+0x192/0x260 fs/namei.c:3373 do_sys_openat2+0x585/0x7d0 fs/open.c:1148 do_sys_open+0xc3/0x140 fs/open.c:1164 do_syscall_64+0xf6/0x7d0 arch/x86/entry/common.c:295 entry_SYSCALL_64_after_hwframe+0x49/0xb3 Freed by task 6798: save_stack+0x1b/0x40 mm/kasan/common.c:49 set_track mm/kasan/common.c:57 [inline] kasan_set_free_info mm/kasan/common.c:317 [inline] __kasan_slab_free+0x126/0x170 mm/kasan/common.c:456 slab_free_hook mm/slub.c:1445 [inline] slab_free_freelist_hook+0xc4/0x1c0 mm/slub.c:1478 slab_free mm/slub.c:3035 [inline] kfree+0xd8/0x330 mm/slub.c:4003 kvfree+0x42/0x50 mm/util.c:603 resize_runtime_buffer+0x29e/0x370 sound/core/rawmidi.c:677 snd_rawmidi_output_params+0x128/0x170 sound/core/rawmidi.c:690 snd_rawmidi_ioctl+0x544/0x5b0 sound/core/rawmidi.c:841 vfs_ioctl fs/ioctl.c:47 [inline] ksys_ioctl+0x11a/0x180 fs/ioctl.c:763 __do_sys_ioctl fs/ioctl.c:772 [inline] __se_sys_ioctl fs/ioctl.c:770 [inline] __x64_sys_ioctl+0x6f/0xb0 fs/ioctl.c:770 do_syscall_64+0xf6/0x7d0 arch/x86/entry/common.c:295 entry_SYSCALL_64_after_hwframe+0x49/0xb3 The buggy address belongs to the object at ffff888069da4000 which belongs to the cache kmalloc-4k of size 4096 The buggy address is located 970 bytes inside of 4096-byte region [ffff888069da4000, ffff888069da5000) The buggy address belongs to the page: page:ffffea0001a76800 refcount:1 mapcount:0 mapping:00000000c136e8e7 index:0x0 head:ffffea0001a76800 order:3 compound_mapcount:0 compound_pincount:0 flags: 0xfffe0000010200(slab|head) raw: 00fffe0000010200 dead000000000100 dead000000000122 ffff88806bc0c280 raw: 0000000000000000 0000000080040004 00000001ffffffff 0000000000000000 page dumped because: kasan: bad access detected Memory state around the buggy address: ffff888069da4280: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ffff888069da4300: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb >ffff888069da4380: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ^ ffff888069da4400: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ffff888069da4480: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ================================================================== Regards, butt3rflyh4ck

4 9

KASAN: use-after-free Write in snd_rawmidi_kernel_write1
by butt3rflyh4ck 07 May '20

07 May '20

I report a bug (in linux-5.7-rc1) found by syzkaller. kernel config: https://github.com/butterflyhack/syzkaller-fuzz/blob/master/v5.7.0-rc1.conf… reproducer: https://github.com/butterflyhack/syzkaller-fuzz/blob/master/repro.cprog I test the reproducer in linux-5.7-rc4 and crash too. crash log: ================================================================== BUG: KASAN: use-after-free in _copy_from_user+0x113/0x1a0 lib/usercopy.c:13 Write of size 1 at addr ffff888069da43ca by task syz-executor611/6797 CPU: 0 PID: 6797 Comm: syz-executor611 Not tainted 5.7.0-rc1 #3 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1ubuntu1 04/01/2014 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x188/0x20d lib/dump_stack.c:118 print_address_description.constprop.0.cold+0xd3/0x347 mm/kasan/report.c:382 __kasan_report.cold+0x35/0x4d mm/kasan/report.c:511 kasan_report+0x33/0x50 mm/kasan/common.c:625 check_memory_region_inline mm/kasan/generic.c:187 [inline] check_memory_region+0x141/0x190 mm/kasan/generic.c:193 _copy_from_user+0x113/0x1a0 lib/usercopy.c:13 copy_from_user include/linux/uaccess.h:144 [inline] snd_rawmidi_kernel_write1+0x320/0x6f0 sound/core/rawmidi.c:1363 snd_rawmidi_write+0x2e4/0xb80 sound/core/rawmidi.c:1429 __vfs_write+0x76/0x100 fs/read_write.c:495 vfs_write+0x268/0x5d0 fs/read_write.c:559 ksys_write+0x1ee/0x250 fs/read_write.c:612 do_syscall_64+0xf6/0x7d0 arch/x86/entry/common.c:295 entry_SYSCALL_64_after_hwframe+0x49/0xb3 RIP: 0033:0x4553a9 Code: 00 00 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 bc ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007f556b7f5cc8 EFLAGS: 00000246 ORIG_RAX: 0000000000000001 RAX: ffffffffffffffda RBX: 00000000006d9588 RCX: 00000000004553a9 RDX: 00000000fffffc85 RSI: 0000000020000040 RDI: 0000000000000004 RBP: 00000000006d9580 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 00000000006d958c R13: 0000000000000000 R14: 00000000006d9580 R15: 00007fff34bcb390 Allocated by task 6797: save_stack+0x1b/0x40 mm/kasan/common.c:49 set_track mm/kasan/common.c:57 [inline] __kasan_kmalloc mm/kasan/common.c:495 [inline] __kasan_kmalloc.constprop.0+0xbf/0xd0 mm/kasan/common.c:468 kmalloc_node include/linux/slab.h:578 [inline] kvmalloc_node+0x61/0xf0 mm/util.c:574 kvmalloc include/linux/mm.h:757 [inline] kvzalloc include/linux/mm.h:765 [inline] snd_rawmidi_runtime_create sound/core/rawmidi.c:141 [inline] open_substream+0x33d/0x880 sound/core/rawmidi.c:285 rawmidi_open_priv+0x58e/0x6e0 sound/core/rawmidi.c:336 snd_rawmidi_open+0x455/0xb20 sound/core/rawmidi.c:433 snd_open+0x212/0x3d0 sound/core/sound.c:163 chrdev_open+0x219/0x5c0 fs/char_dev.c:414 do_dentry_open+0x4ba/0x1290 fs/open.c:797 do_open fs/namei.c:3229 [inline] path_openat+0x1e59/0x27d0 fs/namei.c:3346 do_filp_open+0x192/0x260 fs/namei.c:3373 do_sys_openat2+0x585/0x7d0 fs/open.c:1148 do_sys_open+0xc3/0x140 fs/open.c:1164 do_syscall_64+0xf6/0x7d0 arch/x86/entry/common.c:295 entry_SYSCALL_64_after_hwframe+0x49/0xb3 Freed by task 6798: save_stack+0x1b/0x40 mm/kasan/common.c:49 set_track mm/kasan/common.c:57 [inline] kasan_set_free_info mm/kasan/common.c:317 [inline] __kasan_slab_free+0x126/0x170 mm/kasan/common.c:456 slab_free_hook mm/slub.c:1445 [inline] slab_free_freelist_hook+0xc4/0x1c0 mm/slub.c:1478 slab_free mm/slub.c:3035 [inline] kfree+0xd8/0x330 mm/slub.c:4003 kvfree+0x42/0x50 mm/util.c:603 resize_runtime_buffer+0x29e/0x370 sound/core/rawmidi.c:677 snd_rawmidi_output_params+0x128/0x170 sound/core/rawmidi.c:690 snd_rawmidi_ioctl+0x544/0x5b0 sound/core/rawmidi.c:841 vfs_ioctl fs/ioctl.c:47 [inline] ksys_ioctl+0x11a/0x180 fs/ioctl.c:763 __do_sys_ioctl fs/ioctl.c:772 [inline] __se_sys_ioctl fs/ioctl.c:770 [inline] __x64_sys_ioctl+0x6f/0xb0 fs/ioctl.c:770 do_syscall_64+0xf6/0x7d0 arch/x86/entry/common.c:295 entry_SYSCALL_64_after_hwframe+0x49/0xb3 The buggy address belongs to the object at ffff888069da4000 which belongs to the cache kmalloc-4k of size 4096 The buggy address is located 970 bytes inside of 4096-byte region [ffff888069da4000, ffff888069da5000) The buggy address belongs to the page: page:ffffea0001a76800 refcount:1 mapcount:0 mapping:00000000c136e8e7 index:0x0 head:ffffea0001a76800 order:3 compound_mapcount:0 compound_pincount:0 flags: 0xfffe0000010200(slab|head) raw: 00fffe0000010200 dead000000000100 dead000000000122 ffff88806bc0c280 raw: 0000000000000000 0000000080040004 00000001ffffffff 0000000000000000 page dumped because: kasan: bad access detected Memory state around the buggy address: ffff888069da4280: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ffff888069da4300: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb >ffff888069da4380: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ^ ffff888069da4400: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ffff888069da4480: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ================================================================== Regards, butt3rflyh4ck

3 3

[PATCH v2] ALSA: hda: Allow SST driver on SKL and KBL platforms with DMIC
by Cezary Rojewski 07 May '20

07 May '20

Update intel-dspcfg with FLAG_SST_ONLY_IF_DMIC option and use it for Skylake and Kabylake platforms when DMIC is present. Signed-off-by: Cezary Rojewski <cezary.rojewski(a)intel.com> --- Changes in v2: - no functional changes, just rebased to fix conflicts sound/hda/intel-dsp-config.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c index 1c1fdab2a55f..20b8f6cb3ff8 100644 --- a/sound/hda/intel-dsp-config.c +++ b/sound/hda/intel-dsp-config.c @@ -19,6 +19,7 @@ MODULE_PARM_DESC(dsp_driver, "Force the DSP driver for Intel DSP (0=auto, 1=lega #define FLAG_SST BIT(0) #define FLAG_SOF BIT(1) +#define FLAG_SST_ONLY_IF_DMIC BIT(15) #define FLAG_SOF_ONLY_IF_DMIC BIT(16) #define FLAG_SOF_ONLY_IF_SOUNDWIRE BIT(17) @@ -107,6 +108,10 @@ static const struct config_entry config_table[] = { {} } }, + { + .flags = FLAG_SST | FLAG_SST_ONLY_IF_DMIC, + .device = 0x9d70, + }, #endif /* Kabylake-LP */ #if IS_ENABLED(CONFIG_SND_SOC_INTEL_KBL) @@ -123,6 +128,10 @@ static const struct config_entry config_table[] = { {} } }, + { + .flags = FLAG_SST | FLAG_SST_ONLY_IF_DMIC, + .device = 0x9d71, + }, #endif /* @@ -410,8 +419,17 @@ int snd_intel_dsp_driver_probe(struct pci_dev *pci) return SND_INTEL_DSP_DRIVER_SOF; } - if (cfg->flags & FLAG_SST) - return SND_INTEL_DSP_DRIVER_SST; + + if (cfg->flags & FLAG_SST) { + if (cfg->flags & FLAG_SST_ONLY_IF_DMIC) { + if (snd_intel_dsp_check_dmic(pci)) { + dev_info(&pci->dev, "Digital mics found on Skylake+ platform, using SST driver\n"); + return SND_INTEL_DSP_DRIVER_SST; + } + } else { + return SND_INTEL_DSP_DRIVER_SST; + } + } return SND_INTEL_DSP_DRIVER_LEGACY; } -- 2.17.1

3 2

[PATCH -next] ALSA: portman2x4: Use bitwise instead of arithmetic operator for flags
by Samuel Zou 07 May '20

07 May '20

Fix the following coccinelle warning: sound/drivers/portman2x4.c:460:34-35: WARNING: sum of probable bitmasks, consider | Reported-by: Hulk Robot <hulkci(a)huawei.com> Signed-off-by: Samuel Zou <zou_wei(a)huawei.com> --- sound/drivers/portman2x4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c index ecefa7c..38603cb 100644 --- a/sound/drivers/portman2x4.c +++ b/sound/drivers/portman2x4.c @@ -457,7 +457,7 @@ static int portman_probe(struct parport *p) /* Set for RXDATA0 where no damage will be done. */ /* 5 */ - parport_write_control(p, RXDATA0 + STROBE); /* Write Strobe=1 to command reg. */ + parport_write_control(p, RXDATA0 | STROBE); /* Write Strobe=1 to command reg. */ /* 6 */ if ((parport_read_status(p) & ESTB) != ESTB) -- 2.6.2

3 2

[PATCH -next] ALSA: sound/ppc: Use bitwise instead of arithmetic operator for flags
by Samuel Zou 07 May '20

07 May '20

Fix the following coccinelle warnings: sound/ppc/pmac.c:729:57-58: WARNING: sum of probable bitmasks, consider | sound/ppc/pmac.c:229:37-38: WARNING: sum of probable bitmasks, consider | Reported-by: Hulk Robot <hulkci(a)huawei.com> Signed-off-by: Samuel Zou <zou_wei(a)huawei.com> --- sound/ppc/pmac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c index 592532c..2e750b3 100644 --- a/sound/ppc/pmac.c +++ b/sound/ppc/pmac.c @@ -226,7 +226,7 @@ static int snd_pmac_pcm_prepare(struct snd_pmac *chip, struct pmac_stream *rec, offset += rec->period_size; } /* make loop */ - cp->command = cpu_to_le16(DBDMA_NOP + BR_ALWAYS); + cp->command = cpu_to_le16(DBDMA_NOP | BR_ALWAYS); cp->cmd_dep = cpu_to_le32(rec->cmd.addr); snd_pmac_dma_stop(rec); @@ -726,7 +726,7 @@ void snd_pmac_beep_dma_start(struct snd_pmac *chip, int bytes, unsigned long add chip->extra_dma.cmds->xfer_status = cpu_to_le16(0); chip->extra_dma.cmds->cmd_dep = cpu_to_le32(chip->extra_dma.addr); chip->extra_dma.cmds->phy_addr = cpu_to_le32(addr); - chip->extra_dma.cmds->command = cpu_to_le16(OUTPUT_MORE + BR_ALWAYS); + chip->extra_dma.cmds->command = cpu_to_le16(OUTPUT_MORE | BR_ALWAYS); out_le32(&chip->awacs->control, (in_le32(&chip->awacs->control) & ~0x1f00) | (speed << 8)); -- 2.6.2

2 1

[PATCH -next] ASoC: amd: acp3x-pcm-dma: Use bitwise instead of arithmetic operator for flags
by Samuel Zou 07 May '20

07 May '20

Fix the following coccinelle warnings: sound/soc/amd/raven/acp3x-pcm-dma.c:161:39-40: WARNING: sum of probable bitmasks, consider | sound/soc/amd/raven/acp3x-pcm-dma.c:172:39-40: WARNING: sum of probable bitmasks, consider | sound/soc/amd/raven/acp3x-pcm-dma.c:183:39-40: WARNING: sum of probable bitmasks, consider | sound/soc/amd/raven/acp3x-pcm-dma.c:194:39-40: WARNING: sum of probable bitmasks, consider | Reported-by: Hulk Robot <hulkci(a)huawei.com> Signed-off-by: Samuel Zou <zou_wei(a)huawei.com> --- sound/soc/amd/raven/acp3x-pcm-dma.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/amd/raven/acp3x-pcm-dma.c b/sound/soc/amd/raven/acp3x-pcm-dma.c index e362f0b..b0cc0fe 100644 --- a/sound/soc/amd/raven/acp3x-pcm-dma.c +++ b/sound/soc/amd/raven/acp3x-pcm-dma.c @@ -158,7 +158,7 @@ static void config_acp3x_dma(struct i2s_stream_instance *rtd, int direction) switch (rtd->i2s_instance) { case I2S_BT_INSTANCE: reg_dma_size = mmACP_BT_TX_DMA_SIZE; - acp_fifo_addr = ACP_SRAM_PTE_OFFSET + + acp_fifo_addr = ACP_SRAM_PTE_OFFSET | BT_PB_FIFO_ADDR_OFFSET; reg_fifo_addr = mmACP_BT_TX_FIFOADDR; reg_fifo_size = mmACP_BT_TX_FIFOSIZE; @@ -169,7 +169,7 @@ static void config_acp3x_dma(struct i2s_stream_instance *rtd, int direction) case I2S_SP_INSTANCE: default: reg_dma_size = mmACP_I2S_TX_DMA_SIZE; - acp_fifo_addr = ACP_SRAM_PTE_OFFSET + + acp_fifo_addr = ACP_SRAM_PTE_OFFSET | SP_PB_FIFO_ADDR_OFFSET; reg_fifo_addr = mmACP_I2S_TX_FIFOADDR; reg_fifo_size = mmACP_I2S_TX_FIFOSIZE; @@ -180,7 +180,7 @@ static void config_acp3x_dma(struct i2s_stream_instance *rtd, int direction) switch (rtd->i2s_instance) { case I2S_BT_INSTANCE: reg_dma_size = mmACP_BT_RX_DMA_SIZE; - acp_fifo_addr = ACP_SRAM_PTE_OFFSET + + acp_fifo_addr = ACP_SRAM_PTE_OFFSET | BT_CAPT_FIFO_ADDR_OFFSET; reg_fifo_addr = mmACP_BT_RX_FIFOADDR; reg_fifo_size = mmACP_BT_RX_FIFOSIZE; @@ -191,7 +191,7 @@ static void config_acp3x_dma(struct i2s_stream_instance *rtd, int direction) case I2S_SP_INSTANCE: default: reg_dma_size = mmACP_I2S_RX_DMA_SIZE; - acp_fifo_addr = ACP_SRAM_PTE_OFFSET + + acp_fifo_addr = ACP_SRAM_PTE_OFFSET | SP_CAPT_FIFO_ADDR_OFFSET; reg_fifo_addr = mmACP_I2S_RX_FIFOADDR; reg_fifo_size = mmACP_I2S_RX_FIFOSIZE; -- 2.6.2

2 1

[PATCH] ASoC: Intel: sst: ipc command timeout
by Brent Lu 07 May '20

07 May '20

After sending an ipc command to DSP, the host waits for the reply message which will be read from SST_IPCD register in sst_byt_irq_thread() to complete the transaction. Sometimes the value read from SST_IPCD register is still the reply message for previous command instead of the waiting command so ipc command timeout happens. In an experiment we read the same SST_IPCD register again when the defect happens and found the value of second read is different from previous one and is the correct reply message. It suggests the DSP is okay but the way we read the register may be the cause. Currently the driver is using memcpy_fromio() to read the value of 64-bit registers. This function is based on __builtin_memcpy() call and depends on the implementation of compiler. Since this issue happens right after the toolchain switched from clang 10 to clang 11, we replace the register read with two readl() function calls to avoid all optimization from compiler's library. Signed-off-by: Brent Lu <brent.lu(a)intel.com> --- sound/soc/intel/common/sst-dsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/intel/common/sst-dsp.c b/sound/soc/intel/common/sst-dsp.c index ec66be2..12af7aa 100644 --- a/sound/soc/intel/common/sst-dsp.c +++ b/sound/soc/intel/common/sst-dsp.c @@ -42,7 +42,7 @@ u64 sst_shim32_read64(void __iomem *addr, u32 offset) { u64 val; - memcpy_fromio(&val, addr + offset, sizeof(val)); + sst_memcpy_fromio_32(NULL, &val, addr + offset, sizeof(val)); return val; } EXPORT_SYMBOL_GPL(sst_shim32_read64); -- 2.7.4

7 14

[PATCH] ASoC: Intel: Skylake: Update description for HDaudio kconfig
by Cezary Rojewski 06 May '20

06 May '20

With 'ASoC: Intel: Skylake: Fix HDaudio and Dmic' series applied, warning is no longer true. Remove it and update the description. Signed-off-by: Cezary Rojewski <cezary.rojewski(a)intel.com> --- sound/soc/intel/Kconfig | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index c8de0bb5bed9..4d11f4f3f7e2 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -209,12 +209,8 @@ config SND_SOC_INTEL_SKYLAKE_SSP_CLK config SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC bool "HDAudio codec support" help - This option broke audio on Linus' Skylake laptop in December 2018 - and the race conditions during the probe were not fixed since. - This option is DEPRECATED, all HDaudio codec support needs - to be handled by the SOF driver. - Distributions should not enable this option and there are no known - users of this capability. + If you have Intel Skylake or Kabylake with HDaudio codec + then enable this option by saying Y or m. config SND_SOC_INTEL_SKYLAKE_COMMON tristate -- 2.17.1

2 3