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

[syzbot] WARNING: kmalloc bug in snd_pcm_plugin_alloc (2)
by syzbot 17 Mar '22

17 Mar '22

Hello, syzbot found the following issue on: HEAD commit: 68453767131a ARM: Spectre-BHB: provide empty stub for non-.. git tree: upstream console output: https://syzkaller.appspot.com/x/log.txt?x=11ddd329700000 kernel config: https://syzkaller.appspot.com/x/.config?x=442f8ac61e60a75e dashboard link: https://syzkaller.appspot.com/bug?extid=72732c532ac1454eeee9 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=13636d79700000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=128fcd03700000 The issue was bisected to: commit 7661809d493b426e979f39ab512e3adf41fbcc69 Author: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Wed Jul 14 16:45:49 2021 +0000 mm: don't allow oversized kvmalloc() calls bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=134eb7d1700000 final oops: https://syzkaller.appspot.com/x/report.txt?x=10ceb7d1700000 console output: https://syzkaller.appspot.com/x/log.txt?x=174eb7d1700000 IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syzbot+72732c532ac1454eeee9(a)syzkaller.appspotmail.com Fixes: 7661809d493b ("mm: don't allow oversized kvmalloc() calls") ------------[ cut here ]------------ WARNING: CPU: 1 PID: 3761 at mm/util.c:591 kvmalloc_node+0x121/0x130 mm/util.c:591 Modules linked in: CPU: 0 PID: 3761 Comm: syz-executor165 Not tainted 5.17.0-rc7-syzkaller-00227-g68453767131a #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 RIP: 0010:kvmalloc_node+0x121/0x130 mm/util.c:591 Code: eb 8e 45 31 e4 e9 49 ff ff ff e8 fa 91 d0 ff 41 81 e5 00 20 00 00 31 ff 44 89 ee e8 69 95 d0 ff 45 85 ed 75 dd e8 df 91 d0 ff <0f> 0b e9 22 ff ff ff 0f 1f 84 00 00 00 00 00 55 48 89 fd 53 e8 c6 RSP: 0018:ffffc9000282fb38 EFLAGS: 00010293 RAX: 0000000000000000 RBX: ffff88801c2d4d00 RCX: 0000000000000000 RDX: ffff88806c235700 RSI: ffffffff81a82e51 RDI: 0000000000000003 RBP: 00000000c0c0c100 R08: 0000000000000000 R09: 00000000ffffffff R10: ffffffff81a82e47 R11: 0000000000000000 R12: 0000000000000000 R13: 0000000000000000 R14: 00000000ffffffff R15: ffff88801c2d4d14 FS: 00007f4196580700(0000) GS:ffff8880b9c00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007ffee56e9938 CR3: 000000006d5c7000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> kvmalloc include/linux/slab.h:731 [inline] kvzalloc include/linux/slab.h:739 [inline] snd_pcm_plugin_alloc+0x570/0x770 sound/core/oss/pcm_plugin.c:71 snd_pcm_plug_alloc+0x20d/0x310 sound/core/oss/pcm_plugin.c:118 snd_pcm_oss_change_params_locked+0x19db/0x3bf0 sound/core/oss/pcm_oss.c:1041 snd_pcm_oss_change_params sound/core/oss/pcm_oss.c:1104 [inline] snd_pcm_oss_get_active_substream+0x164/0x1c0 sound/core/oss/pcm_oss.c:1121 snd_pcm_oss_get_rate sound/core/oss/pcm_oss.c:1778 [inline] snd_pcm_oss_set_rate sound/core/oss/pcm_oss.c:1770 [inline] snd_pcm_oss_ioctl+0x144f/0x3430 sound/core/oss/pcm_oss.c:2632 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:874 [inline] __se_sys_ioctl fs/ioctl.c:860 [inline] __x64_sys_ioctl+0x193/0x200 fs/ioctl.c:860 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae RIP: 0033:0x7f41965cf1f9 Code: 28 00 00 00 75 05 48 83 c4 28 c3 e8 41 15 00 00 90 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 b8 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007f41965802f8 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 RAX: ffffffffffffffda RBX: 00007f41966584a8 RCX: 00007f41965cf1f9 RDX: 0000000020000140 RSI: 00000000c0045002 RDI: 0000000000000003 RBP: 00007f41966584a0 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 00007f41966584ac R13: 00007f4196625088 R14: 7364612f7665642f R15: 0000000000022000 </TASK> --- 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. For information about bisection process see: https://goo.gl/tpsmEJ#bisection syzbot can test patches for this issue, for details see: https://goo.gl/tpsmEJ#testing-patches

3 3

[PATCH 00/19] ASoC: fsl_micfil: Driver updates
by Sascha Hauer 17 Mar '22

17 Mar '22

This series has a bunch of cleanups for the FSL MICFIL driver. There is not much chance for regressions in this series as the driver currently can't work at all. The MICFIL needs multififo support in the i.MX SDMA engine which is added with this series, see 10/19. The multififo support is selected in the dma phandle arguments in the device tree, the transfer type must be '25' aka IMX_DMATYPE_MULTI_SAI. This is set already to 25 in the upstream i.MX8M[NM] dtsi files, but the SDMA driver silently ignores unsupported values instead of throwing an error. This is fixed in this series and multififo support is added. I think the series should go via the ASoC tree, so I'll need an ack from the DMA guys for 9/19 and 10/10. Sascha Sascha Hauer (19): ASoC: fsl_micfil: Drop unnecessary register read ASoC: fsl_micfil: Drop unused register read ASoC: fsl_micfil: drop fsl_micfil_set_mclk_rate() ASoC: fsl_micfil: do not define SHIFT/MASK for single bits ASoC: fsl_micfil: use GENMASK to define register bit fields ASoC: fsl_micfil: use clear/set bits ASoC: fsl_micfil: drop error messages from failed register accesses ASoC: fsl_micfil: drop unused variables dma: imx-sdma: error out on unsupported transfer types dma: imx-sdma: Add multi fifo support ASoC: fsl_micfil: add multi fifo support ASoC: fsl_micfil: use define for OSR default value ASoC: fsl_micfil: Drop get_pdm_clk() ASoC: fsl_micfil: simplify clock setting ASoC: fsl_micfil: rework quality setting ASoC: fsl_micfil: drop unused include ASoC: fsl_micfil: drop only once used defines ASoC: fsl_micfil: drop support for undocumented property ASoC: fsl_micfil: fold fsl_set_clock_params() into its only user drivers/dma/imx-sdma.c | 71 ++++- include/linux/platform_data/dma-imx.h | 7 + sound/soc/fsl/fsl_micfil.c | 368 +++++++++----------------- sound/soc/fsl/fsl_micfil.h | 269 +++++-------------- 4 files changed, 265 insertions(+), 450 deletions(-) -- 2.30.2

2 20

Re: [PATCH 10/19] dma: imx-sdma: Add multi fifo support
by Sascha Hauer 17 Mar '22

17 Mar '22

On Thu, Mar 17, 2022 at 08:20:22PM +0800, Shengjiu Wang wrote: > Hi > On Thu, Mar 17, 2022 at 6:19 PM Sascha Hauer <[1]s.hauer(a)pengutronix.de> > wrote: > > On Thu, Mar 17, 2022 at 05:08:55PM +0800, Shengjiu Wang wrote: > > On Thu, Mar 17, 2022 at 4:28 PM Sascha Hauer > <[1][2]s.hauer(a)pengutronix.de> > > wrote: > > > > +struct sdma_peripheral_config { > > + int n_fifos_src; > > + int n_fifos_dst; > > + bool sw_done; > > +}; > > + > > #endif > > > > Hi Sascha > > This is our internal definition for this sdma_peripheral_config. > > Could you please adopt this? > > This structure is completely internal to the kernel and can be adjusted > when we need it. I don't see a reason to add unused fields to it just to > be compatible with a downstream kernel. > > Yes, it is not used by micfil. But the fifo_offset and words_per_fifo > is part the multi fifo script support scope, if only add fifo_num, it > looks > like this feature is not complete. No, it's not. I only added the parts that I am interested in and that I can test. I have some multichannel audio stuff in my pipeline, I might add more pieces later. > By the way, which multi fifo script version are you using? seems it is > not the latest compared with our release, right? I am using the latest firmware from linux-firmware.git. Sascha -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |

1 0

Re: [PATCH] ASoC: SOF: topology: Use kmemdup() to replace kzalloc + memcpy
by Pierre-Louis Bossart 17 Mar '22

17 Mar '22

On 3/17/22 04:38, Yihao Han wrote: > fix memdup.cocci warning: > sound/soc/sof/topology.c:876:19-26: WARNING opportunity for kmemdup > > Generated by: scripts/coccinelle/api/memdup.cocci > > Signed-off-by: Yihao Han <hanyihao(a)vivo.com> Thanks for the patch Acked-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> > --- > sound/soc/sof/topology.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c > index 367fbe2d5b31..369693cc6d10 100644 > --- a/sound/soc/sof/topology.c > +++ b/sound/soc/sof/topology.c > @@ -873,11 +873,10 @@ static int sof_control_load_bytes(struct snd_soc_component *scomp, > > /* copy the private data */ > if (priv_size > 0) { > - scontrol->priv = kzalloc(priv_size, GFP_KERNEL); > + scontrol->priv = kmemdup(control->priv.data, priv_size, GFP_KERNEL); > if (!scontrol->priv) > return -ENOMEM; > > - memcpy(scontrol->priv, control->priv.data, priv_size); > scontrol->priv_size = priv_size; > } >

1 0

Re: [PATCH 10/19] dma: imx-sdma: Add multi fifo support
by Sascha Hauer 17 Mar '22

17 Mar '22

On Thu, Mar 17, 2022 at 05:08:55PM +0800, Shengjiu Wang wrote: > On Thu, Mar 17, 2022 at 4:28 PM Sascha Hauer <[1]s.hauer(a)pengutronix.de> > wrote: > > +struct sdma_peripheral_config { > + int n_fifos_src; > + int n_fifos_dst; > + bool sw_done; > +}; > + > #endif > > Hi Sascha > This is our internal definition for this sdma_peripheral_config. > Could you please adopt this? This structure is completely internal to the kernel and can be adjusted when we need it. I don't see a reason to add unused fields to it just to be compatible with a downstream kernel. Sascha > /** > * struct sdma_audio_config - special sdma config for audio case > * @src_fifo_num: source fifo number for mcu_2_sai/sai_2_mcu script > * For example, if there are 4 fifos, sdma will fetch > * fifos one by one and roll back to the first fifo after > * the 4th fifo fetch. > * @dst_fifo_num: similar as src_fifo_num, but dest fifo instead. > * @src_fifo_off: source fifo offset, 0 means all fifos are continuous, 1 > * means 1 word offset between fifos. All offset between > * fifos should be same. > * @dst_fifo_off: dst fifo offset, similar as @src_fifo_off. > * @words_per_fifo: numbers of words per fifo fetch/fill, 0 means > * one channel per fifo, 1 means 2 channels per fifo.. > * If 'src_fifo_num = 4' and 'chans_per_fifo = 1', it > * means the first two words(channels) fetch from fifo1 > * and then jump to fifo2 for next two words, and so on > * after the last fifo4 fetched, roll back to fifo1. > * @sw_done_sel: software done selector, PDM need enable software done > feature > * in mcu_2_sai/sai_2_mcu script. > * Bit31: sw_done eanbled or not > * Bit16~Bit0: selector > * For example: 0x80000000 means sw_done enabled for done0 > * sector which is for PDM on i.mx8mm. > */ > struct sdma_audio_config { > u8 src_fifo_num; > u8 dst_fifo_num; > u8 src_fifo_off; > u8 dst_fifo_off; > u8 words_per_fifo; > u32 sw_done_sel; > }; > best regards > wang shengjiu > > > References > > Visible links > 1. mailto:s.hauer@pengutronix.de > 2. mailto:s.hauer@pengutronix.de -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |

1 0

RE: [PATCH 10/19] dma: imx-sdma: Add multi fifo support
by S.J. Wang 17 Mar '22

17 Mar '22

Hi Sascha > --- > drivers/dma/imx-sdma.c | 54 +++++++++++++++++++++++++++ > include/linux/platform_data/dma-imx.h | 7 ++++ > 2 files changed, 61 insertions(+) > > diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index > 1038f6bc7f846..21e1cec2ffde9 100644 > --- a/drivers/dma/imx-sdma.c > +++ b/drivers/dma/imx-sdma.c > @@ -14,6 +14,7 @@ > #include <linux/iopoll.h> > #include <linux/module.h> > #include <linux/types.h> > +#include <linux/bitfield.h> > #include <linux/bitops.h> > #include <linux/mm.h> > #include <linux/interrupt.h> > @@ -73,6 +74,7 @@ > #define SDMA_CHNENBL0_IMX35 0x200 > #define SDMA_CHNENBL0_IMX31 0x080 > #define SDMA_CHNPRI_0 0x100 > +#define SDMA_DONE0_CONFIG 0x1000 > > /* > * Buffer descriptor status values. > @@ -180,6 +182,12 @@ > BIT(DMA_MEM_TO_DEV) | \ > BIT(DMA_DEV_TO_DEV)) > > +#define SDMA_WATERMARK_LEVEL_N_FIFOS GENMASK(15, 12) > +#define SDMA_WATERMARK_LEVEL_SW_DONE BIT(23) > + > +#define SDMA_DONE0_CONFIG_DONE_SEL BIT(7) > +#define SDMA_DONE0_CONFIG_DONE_DIS BIT(6) > + > /** > * struct sdma_script_start_addrs - SDMA script start pointers > * > @@ -441,6 +449,11 @@ struct sdma_channel { > struct work_struct terminate_worker; > struct list_head terminated; > bool is_ram_script; > + unsigned int n_fifos; > + unsigned int n_fifos_src; > + unsigned int n_fifos_dst; > + bool sw_done; > + u32 sw_done_sel; > }; > > #define IMX_DMA_SG_LOOP BIT(0) > @@ -773,6 +786,14 @@ static void sdma_event_enable(struct > sdma_channel *sdmac, unsigned int event) > val = readl_relaxed(sdma->regs + chnenbl); > __set_bit(channel, &val); > writel_relaxed(val, sdma->regs + chnenbl); > + > + /* Set SDMA_DONEx_CONFIG is sw_done enabled */ > + if (sdmac->sw_done) { > + val = readl_relaxed(sdma->regs + SDMA_DONE0_CONFIG); > + val |= SDMA_DONE0_CONFIG_DONE_SEL; > + val &= ~SDMA_DONE0_CONFIG_DONE_DIS; > + writel_relaxed(val, sdma->regs + SDMA_DONE0_CONFIG); > + } > } > > static void sdma_event_disable(struct sdma_channel *sdmac, unsigned int > event) @@ -1022,6 +1043,10 @@ static int sdma_get_pc(struct > sdma_channel *sdmac, > case IMX_DMATYPE_IPU_MEMORY: > emi_2_per = sdma->script_addrs->ext_mem_2_ipu_addr; > break; > + case IMX_DMATYPE_MULTI_SAI: > + per_2_emi = sdma->script_addrs->sai_2_mcu_addr; > + emi_2_per = sdma->script_addrs->mcu_2_sai_addr; > + break; > default: > dev_err(sdma->dev, "Unsupported transfer type %d\n", > peripheral_type); @@ -1198,6 +1223,15 @@ static void > sdma_set_watermarklevel_for_p2p(struct sdma_channel *sdmac) > sdmac->watermark_level |= SDMA_WATERMARK_LEVEL_CONT; } > > +static void sdma_set_watermarklevel_for_sais(struct sdma_channel > +*sdmac) { > + if (sdmac->sw_done) > + sdmac->watermark_level |= > SDMA_WATERMARK_LEVEL_SW_DONE; > + > + sdmac->watermark_level |= > + FIELD_PREP(SDMA_WATERMARK_LEVEL_N_FIFOS, > +sdmac->n_fifos); } > + > static int sdma_config_channel(struct dma_chan *chan) { > struct sdma_channel *sdmac = to_sdma_chan(chan); @@ -1234,6 > +1268,10 @@ static int sdma_config_channel(struct dma_chan *chan) > sdmac->peripheral_type == IMX_DMATYPE_ASRC) > sdma_set_watermarklevel_for_p2p(sdmac); > } else { > + if (sdmac->peripheral_type == > + IMX_DMATYPE_MULTI_SAI) > + sdma_set_watermarklevel_for_sais(sdmac); > + > __set_bit(sdmac->event_id0, sdmac->event_mask); > } > > @@ -1669,6 +1707,7 @@ static int sdma_config_write(struct dma_chan > *chan, > sdmac->watermark_level = dmaengine_cfg->src_maxburst * > dmaengine_cfg->src_addr_width; > sdmac->word_size = dmaengine_cfg->src_addr_width; > + sdmac->n_fifos = sdmac->n_fifos_src; > } else if (direction == DMA_DEV_TO_DEV) { > sdmac->per_address2 = dmaengine_cfg->src_addr; > sdmac->per_address = dmaengine_cfg->dst_addr; @@ -1682,6 > +1721,7 @@ static int sdma_config_write(struct dma_chan *chan, > sdmac->watermark_level = dmaengine_cfg->dst_maxburst * > dmaengine_cfg->dst_addr_width; > sdmac->word_size = dmaengine_cfg->dst_addr_width; > + sdmac->n_fifos = sdmac->n_fifos_dst; > } > sdmac->direction = direction; > return sdma_config_channel(chan); @@ -1691,9 +1731,23 @@ static int > sdma_config(struct dma_chan *chan, > struct dma_slave_config *dmaengine_cfg) { > struct sdma_channel *sdmac = to_sdma_chan(chan); > + struct sdma_engine *sdma = sdmac->sdma; > > memcpy(&sdmac->slave_config, dmaengine_cfg, > sizeof(*dmaengine_cfg)); > > + if (dmaengine_cfg->peripheral_config) { > + struct sdma_peripheral_config *sdmacfg = dmaengine_cfg- > >peripheral_config; > + if (dmaengine_cfg->peripheral_size != sizeof(struct > sdma_peripheral_config)) { > + dev_err(sdma->dev, "Invalid peripheral size %zu, > expected %zu\n", > + dmaengine_cfg->peripheral_size, > + sizeof(struct sdma_peripheral_config)); > + return -EINVAL; > + } > + sdmac->n_fifos_src = sdmacfg->n_fifos_src; > + sdmac->n_fifos_dst = sdmacfg->n_fifos_dst; > + sdmac->sw_done = sdmacfg->sw_done; > + } > + > /* Set ENBLn earlier to make sure dma request triggered after that */ > if (sdmac->event_id0 >= sdmac->sdma->drvdata->num_events) > return -EINVAL; > diff --git a/include/linux/platform_data/dma-imx.h > b/include/linux/platform_data/dma-imx.h > index 281adbb26e6bd..4a43a048e1b4d 100644 > --- a/include/linux/platform_data/dma-imx.h > +++ b/include/linux/platform_data/dma-imx.h > @@ -39,6 +39,7 @@ enum sdma_peripheral_type { > IMX_DMATYPE_SSI_DUAL, /* SSI Dual FIFO */ > IMX_DMATYPE_ASRC_SP, /* Shared ASRC */ > IMX_DMATYPE_SAI, /* SAI */ > + IMX_DMATYPE_MULTI_SAI, /* MULTI FIFOs For Audio */ > }; > > enum imx_dma_prio { > @@ -65,4 +66,10 @@ static inline int imx_dma_is_general_purpose(struct > dma_chan *chan) > !strcmp(chan->device->dev->driver->name, "imx-dma"); } > > +struct sdma_peripheral_config { > + int n_fifos_src; > + int n_fifos_dst; > + bool sw_done; > +}; > + Seems there is issue with my gmail, I resend the comments again. This is our internal definition for this sdma_peripheral_config. Could you please adopt this? /** * struct sdma_audio_config - special sdma config for audio case * @src_fifo_num: source fifo number for mcu_2_sai/sai_2_mcu script * For example, if there are 4 fifos, sdma will fetch * fifos one by one and roll back to the first fifo after * the 4th fifo fetch. * @dst_fifo_num: similar as src_fifo_num, but dest fifo instead. * @src_fifo_off: source fifo offset, 0 means all fifos are continuous, 1 * means 1 word offset between fifos. All offset between * fifos should be same. * @dst_fifo_off: dst fifo offset, similar as @src_fifo_off. * @words_per_fifo: numbers of words per fifo fetch/fill, 0 means * one channel per fifo, 1 means 2 channels per fifo.. * If 'src_fifo_num = 4' and 'chans_per_fifo = 1', it * means the first two words(channels) fetch from fifo1 * and then jump to fifo2 for next two words, and so on * after the last fifo4 fetched, roll back to fifo1. * @sw_done_sel: software done selector, PDM need enable software done feature * in mcu_2_sai/sai_2_mcu script. * Bit31: sw_done eanbled or not * Bit16~Bit0: selector * For example: 0x80000000 means sw_done enabled for done0 * sector which is for PDM on i.mx8mm. */ struct sdma_audio_config { u8 src_fifo_num; u8 dst_fifo_num; u8 src_fifo_off; u8 dst_fifo_off; u8 words_per_fifo; u32 sw_done_sel; }; Best regards Wang shengjiu

1 0

[PATCH v2 0/5] ASoC: mediatek: Add support for MT8195 sound card with max98390 and rt5682
by Trevor Wu 17 Mar '22

17 Mar '22

This series of patches adds support for mt8195 board with mt6359, max98390 and rt5682. To prevent from copy-paste components, mt8195 machine drivers and dt-bindings are merged in the patch. Patches are based on broonie tree "for-next" branch. Changes since v1: - remove merged patches about reset controller - propose a common machine driver instead of machine driver common code - propose a common dt-bindings for mt8195 sound card Trevor Wu (5): ASoC: mediatek: mt8195: merge machine driver ASoC: dt-bindings: mediatek: mt8195: merge mt8195 machine yaml ASoC: mediatek: mt8195: rename card controls ASoC: mediatek: mt8195: add machine support for max98390 and rt5682 ASoC: dt-bindings: mediatek: mt8195: support mt8195-mt6359-max98390-rt5682 .../sound/mt8195-mt6359-rt1011-rt5682.yaml | 51 - ...-rt1019-rt5682.yaml => mt8195-mt6359.yaml} | 9 +- sound/soc/mediatek/Kconfig | 26 +- sound/soc/mediatek/mt8195/Makefile | 3 +- .../mt8195/mt8195-mt6359-rt1011-rt5682.c | 1198 ----------------- ...mt6359-rt1019-rt5682.c => mt8195-mt6359.c} | 984 +++++++++----- 6 files changed, 634 insertions(+), 1637 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1011-rt5682.yaml rename Documentation/devicetree/bindings/sound/{mt8195-mt6359-rt1019-rt5682.yaml => mt8195-mt6359.yaml} (84%) delete mode 100644 sound/soc/mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c rename sound/soc/mediatek/mt8195/{mt8195-mt6359-rt1019-rt5682.c => mt8195-mt6359.c} (76%) -- 2.18.0

2 7

[PATCH 00/18] Introduce IPC abstraction for SOF topology parsing
by Ranjani Sridharan 16 Mar '22

16 Mar '22

This patchset makes the topology parsing layer in the SOF driver IPC-agnostic in preparation for supporting the new IPC version introduced in the SOF firmware. These patches purely contain abstraction changes for the current IPC version (IPC3) supported and do not introduce any functional changes. Ranjani Sridharan (18): ASoC: SOF: Introduce struct snd_sof_dai_link ASoC: SOF: IPC: Introduce IPC ops ASoC: SOF: topology: Add helper function for processing tuple arrays ASoC: SOF: Introduce IPC3 ops ASoC: SOF: topology: Make scheduler widget parsing IPC agnostic ASoC: SOF: topology: Make buffer widget parsing IPC agnostic ASoC: SOF: topology: Make pga widget parsing IPC agnostic ASoC: SOF: topology: Make mixer widget parsing IPC agnostic ASoC: SOF: topology: Make mux/demux widget parsing IPC agnostic ASoC: SOF: topology: Make src widget parsing IPC agnostic ASoC: SOF: topology: Make asrc widget parsing IPC agnostic ASoC: SOF: topology: Make siggen widget parsing IPC agnostic ASoC: SOF: topology: Make effect widget parsing IPC agnostic ASoC: SOF: topology: Make route setup IPC agnostic ASoC: SOF: topology: Make DAI widget parsing IPC agnostic ASoC: SOF: topology: Make control parsing IPC agnostic ASoC: SOF: topology: Make widget binding IPC agnostic ASoC: SOF: topology: remove snd_sof_complete_pipeline() sound/soc/sof/Makefile | 3 +- sound/soc/sof/control.c | 26 +- sound/soc/sof/core.c | 1 + sound/soc/sof/ipc.c | 14 +- sound/soc/sof/ipc3-topology.c | 2019 ++++++++++++++++++++++ sound/soc/sof/sof-audio.c | 66 +- sound/soc/sof/sof-audio.h | 135 +- sound/soc/sof/sof-priv.h | 16 + sound/soc/sof/topology.c | 3060 ++++++++------------------------- 9 files changed, 2941 insertions(+), 2399 deletions(-) create mode 100644 sound/soc/sof/ipc3-topology.c -- 2.25.1

2 21

[PATCH] ASoC: codecs: Fix misplaced lpass_macro_pds_exit call
by Srinivasa Rao Mandadapu 16 Mar '22

16 Mar '22

Update power domains exit function calling from runtime resume to remove function which was wrongly placed and causing crash in device suspend and resume. Fixes: 9e3d83c52844 ("ASoC: codecs: Add power domains support in digital macro codecs") Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam(a)quicinc.com> Co-developed-by: Venkata Prasad Potturu <quic_potturu(a)quicinc.com> Signed-off-by: Venkata Prasad Potturu <quic_potturu(a)quicinc.com> --- sound/soc/codecs/lpass-tx-macro.c | 4 ++-- sound/soc/codecs/lpass-va-macro.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/lpass-tx-macro.c b/sound/soc/codecs/lpass-tx-macro.c index b492d598..714a411 100644 --- a/sound/soc/codecs/lpass-tx-macro.c +++ b/sound/soc/codecs/lpass-tx-macro.c @@ -1920,6 +1920,8 @@ static int tx_macro_remove(struct platform_device *pdev) clk_disable_unprepare(tx->npl); clk_disable_unprepare(tx->fsgen); + lpass_macro_pds_exit(tx->pds); + return 0; } @@ -1964,8 +1966,6 @@ static int __maybe_unused tx_macro_runtime_resume(struct device *dev) regcache_sync(tx->regmap); tx->reset_swr = true; - lpass_macro_pds_exit(tx->pds); - return 0; err_fsgen: clk_disable_unprepare(tx->npl); diff --git a/sound/soc/codecs/lpass-va-macro.c b/sound/soc/codecs/lpass-va-macro.c index 300f4f6..f3cb596 100644 --- a/sound/soc/codecs/lpass-va-macro.c +++ b/sound/soc/codecs/lpass-va-macro.c @@ -1503,6 +1503,8 @@ static int va_macro_remove(struct platform_device *pdev) clk_disable_unprepare(va->dcodec); clk_disable_unprepare(va->macro); + lpass_macro_pds_exit(va->pds); + return 0; } @@ -1532,8 +1534,6 @@ static int __maybe_unused va_macro_runtime_resume(struct device *dev) regcache_cache_only(va->regmap, false); regcache_sync(va->regmap); - lpass_macro_pds_exit(va->pds); - return 0; } -- 2.7.4

2 1

[PATCH] ASoC: msm8916-wcd-analog: Fix error handling in pm8916_wcd_analog_spmi_probe
by Miaoqian Lin 16 Mar '22

16 Mar '22

In the error handling path, the clk_prepare_enable() function call should be balanced by a corresponding 'clk_disable_unprepare()' call , as already done in the remove function. Fixes: de66b3455023 ("ASoC: codecs: msm8916-wcd-analog: add MBHC support") Signed-off-by: Miaoqian Lin <linmq006(a)gmail.com> --- sound/soc/codecs/msm8916-wcd-analog.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/msm8916-wcd-analog.c b/sound/soc/codecs/msm8916-wcd-analog.c index 485cda46dbb9..e52a559c52d6 100644 --- a/sound/soc/codecs/msm8916-wcd-analog.c +++ b/sound/soc/codecs/msm8916-wcd-analog.c @@ -1222,8 +1222,10 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev) } irq = platform_get_irq_byname(pdev, "mbhc_switch_int"); - if (irq < 0) - return irq; + if (irq < 0) { + ret = irq; + goto err_disable_clk; + } ret = devm_request_threaded_irq(dev, irq, NULL, pm8916_mbhc_switch_irq_handler, @@ -1235,8 +1237,10 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev) if (priv->mbhc_btn_enabled) { irq = platform_get_irq_byname(pdev, "mbhc_but_press_det"); - if (irq < 0) - return irq; + if (irq < 0) { + ret = irq; + goto err_disable_clk; + } ret = devm_request_threaded_irq(dev, irq, NULL, mbhc_btn_press_irq_handler, @@ -1247,8 +1251,10 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev) dev_err(dev, "cannot request mbhc button press irq\n"); irq = platform_get_irq_byname(pdev, "mbhc_but_rel_det"); - if (irq < 0) - return irq; + if (irq < 0) { + ret = irq; + goto err_disable_clk; + } ret = devm_request_threaded_irq(dev, irq, NULL, mbhc_btn_release_irq_handler, @@ -1265,6 +1271,10 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev) return devm_snd_soc_register_component(dev, &pm8916_wcd_analog, pm8916_wcd_analog_dai, ARRAY_SIZE(pm8916_wcd_analog_dai)); + +err_disable_clk: + clk_disable_unprepare(priv->mclk); + return ret; } static int pm8916_wcd_analog_spmi_remove(struct platform_device *pdev) -- 2.17.1

2 1