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

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

18 Mar '22

On Fri, Mar 18, 2022 at 01:42:51PM +0800, Shengjiu Wang wrote: > Hi > On Thu, Mar 17, 2022 at 4:28 PM Sascha Hauer <[1]s.hauer(a)pengutronix.de> > wrote: > > Signed-off-by: Sascha Hauer <[2]s.hauer(a)pengutronix.de> > --- > 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; > > "sw_done_sel" is not used, and may not be needed. Ok, will drop. > And can we just add 'struct sdma_peripheral_config *pconfig' > to replace each item here ('n_fifos_src', 'n_fifos_dst', > 'sw_done')? I rather do not access the pointer to the peripheral_config outside of sdma_config because I know nothing about the lifetime of that structure. > the pconfig can point to the struct in dma_slave_config. > And 'n_fifos' can be moved to locally function in > sdma_set_watermarklevel_for_sais(), then use sdmac->direction > to select 'n_fifos_dst' or 'n_fifos_src'. Ok. 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

[PATCH] ASoC: fsl_spdif: Add new registers included on i.MX8ULP
by Shengjiu Wang 17 Mar '22

17 Mar '22

There are some new registers added on i.MX8ULP, they are the SPDIF transmit Professional C channel registers, 192bit SPDIF receive C channel registers, and 192bit SPDIF transmit C channel registers. There are two output lines, SPDIF_OUT1 and SPDIF_OUT2, the original REG_SPDIF_STCSCH and REG_SPDIF_STCSCL are used for SPDIF_OUT1, the new REG_SPDIF_STCSPH and REG_SPDIF_STCSPL are used for SPDIF_OUT2, the 192bit SPDIF C channel registers are used for both. Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- sound/soc/fsl/fsl_spdif.c | 52 ++++++++++++++++++++++++++++++++++++++- sound/soc/fsl/fsl_spdif.h | 14 +++++++++++ 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c index b502e7c3c04d..42d11aca38a1 100644 --- a/sound/soc/fsl/fsl_spdif.c +++ b/sound/soc/fsl/fsl_spdif.c @@ -50,6 +50,7 @@ static u8 srpc_dpll_locked[] = { 0x0, 0x1, 0x2, 0x3, 0x4, 0xa, 0xb }; * @shared_root_clock: flag of sharing a clock source with others; * so the driver shouldn't set root clock rate * @raw_capture_mode: if raw capture mode support + * @cchannel_192b: if there are registers for 192bits C channel data * @interrupts: interrupt number * @tx_burst: tx maxburst size * @rx_burst: rx maxburst size @@ -59,6 +60,7 @@ struct fsl_spdif_soc_data { bool imx; bool shared_root_clock; bool raw_capture_mode; + bool cchannel_192b; u32 interrupts; u32 tx_burst; u32 rx_burst; @@ -196,6 +198,7 @@ static struct fsl_spdif_soc_data fsl_spdif_imx8ulp = { .tx_burst = 2, /* Applied for EDMA */ .rx_burst = 2, /* Applied for EDMA */ .tx_formats = SNDRV_PCM_FMTBIT_S24_LE, /* Applied for EDMA */ + .cchannel_192b = true, }; /* Check if clk is a root clock that does not share clock source with others */ @@ -441,6 +444,23 @@ static void spdif_write_channel_status(struct fsl_spdif_priv *spdif_priv) regmap_write(regmap, REG_SPDIF_STCSCL, ch_status); dev_dbg(&pdev->dev, "STCSCL: 0x%06x\n", ch_status); + + if (spdif_priv->soc->cchannel_192b) { + ch_status = (bitrev8(ctrl->ch_status[0]) << 24) | + (bitrev8(ctrl->ch_status[1]) << 16) | + (bitrev8(ctrl->ch_status[2]) << 8) | + bitrev8(ctrl->ch_status[3]); + + regmap_update_bits(regmap, REG_SPDIF_SCR, 0x1000000, 0x1000000); + + /* + * The first 32bit should be in REG_SPDIF_STCCA_31_0 register, + * but here we need to set REG_SPDIF_STCCA_191_160 on 8ULP + * then can get correct result with HDMI analyzer capture. + * There is a hardware bug here. + */ + regmap_write(regmap, REG_SPDIF_STCCA_191_160, ch_status); + } } /* Set SPDIF PhaseConfig register for rx clock */ @@ -1229,6 +1249,8 @@ static const struct reg_default fsl_spdif_reg_defaults[] = { {REG_SPDIF_STR, 0x00000000}, {REG_SPDIF_STCSCH, 0x00000000}, {REG_SPDIF_STCSCL, 0x00000000}, + {REG_SPDIF_STCSPH, 0x00000000}, + {REG_SPDIF_STCSPL, 0x00000000}, {REG_SPDIF_STC, 0x00020f00}, }; @@ -1248,8 +1270,22 @@ static bool fsl_spdif_readable_reg(struct device *dev, unsigned int reg) case REG_SPDIF_SRQ: case REG_SPDIF_STCSCH: case REG_SPDIF_STCSCL: + case REG_SPDIF_STCSPH: + case REG_SPDIF_STCSPL: case REG_SPDIF_SRFM: case REG_SPDIF_STC: + case REG_SPDIF_SRCCA_31_0: + case REG_SPDIF_SRCCA_63_32: + case REG_SPDIF_SRCCA_95_64: + case REG_SPDIF_SRCCA_127_96: + case REG_SPDIF_SRCCA_159_128: + case REG_SPDIF_SRCCA_191_160: + case REG_SPDIF_STCCA_31_0: + case REG_SPDIF_STCCA_63_32: + case REG_SPDIF_STCCA_95_64: + case REG_SPDIF_STCCA_127_96: + case REG_SPDIF_STCCA_159_128: + case REG_SPDIF_STCCA_191_160: return true; default: return false; @@ -1268,6 +1304,12 @@ static bool fsl_spdif_volatile_reg(struct device *dev, unsigned int reg) case REG_SPDIF_SRU: case REG_SPDIF_SRQ: case REG_SPDIF_SRFM: + case REG_SPDIF_SRCCA_31_0: + case REG_SPDIF_SRCCA_63_32: + case REG_SPDIF_SRCCA_95_64: + case REG_SPDIF_SRCCA_127_96: + case REG_SPDIF_SRCCA_159_128: + case REG_SPDIF_SRCCA_191_160: return true; default: return false; @@ -1286,7 +1328,15 @@ static bool fsl_spdif_writeable_reg(struct device *dev, unsigned int reg) case REG_SPDIF_STR: case REG_SPDIF_STCSCH: case REG_SPDIF_STCSCL: + case REG_SPDIF_STCSPH: + case REG_SPDIF_STCSPL: case REG_SPDIF_STC: + case REG_SPDIF_STCCA_31_0: + case REG_SPDIF_STCCA_63_32: + case REG_SPDIF_STCCA_95_64: + case REG_SPDIF_STCCA_127_96: + case REG_SPDIF_STCCA_159_128: + case REG_SPDIF_STCCA_191_160: return true; default: return false; @@ -1298,7 +1348,7 @@ static const struct regmap_config fsl_spdif_regmap_config = { .reg_stride = 4, .val_bits = 32, - .max_register = REG_SPDIF_STC, + .max_register = REG_SPDIF_STCCA_191_160, .reg_defaults = fsl_spdif_reg_defaults, .num_reg_defaults = ARRAY_SIZE(fsl_spdif_reg_defaults), .readable_reg = fsl_spdif_readable_reg, diff --git a/sound/soc/fsl/fsl_spdif.h b/sound/soc/fsl/fsl_spdif.h index bff8290e71f2..75b42a692c90 100644 --- a/sound/soc/fsl/fsl_spdif.h +++ b/sound/soc/fsl/fsl_spdif.h @@ -31,9 +31,23 @@ #define REG_SPDIF_STR 0x30 /* SPDIFTxRight Register */ #define REG_SPDIF_STCSCH 0x34 /* SPDIFTxCChannelCons_h Register */ #define REG_SPDIF_STCSCL 0x38 /* SPDIFTxCChannelCons_l Register */ +#define REG_SPDIF_STCSPH 0x3C /* SPDIFTxCChannel_Prof_h Register */ +#define REG_SPDIF_STCSPL 0x40 /* SPDIFTxCChannel_Prof_l Register */ #define REG_SPDIF_SRFM 0x44 /* FreqMeas Register */ #define REG_SPDIF_STC 0x50 /* SPDIFTxClk Register */ +#define REG_SPDIF_SRCCA_31_0 0x60 /* SPDIF receive C channel register, bits 31-0 */ +#define REG_SPDIF_SRCCA_63_32 0x64 /* SPDIF receive C channel register, bits 63-32 */ +#define REG_SPDIF_SRCCA_95_64 0x68 /* SPDIF receive C channel register, bits 95-64 */ +#define REG_SPDIF_SRCCA_127_96 0x6C /* SPDIF receive C channel register, bits 127-96 */ +#define REG_SPDIF_SRCCA_159_128 0x70 /* SPDIF receive C channel register, bits 159-128 */ +#define REG_SPDIF_SRCCA_191_160 0x74 /* SPDIF receive C channel register, bits 191-160 */ +#define REG_SPDIF_STCCA_31_0 0x78 /* SPDIF transmit C channel register, bits 31-0 */ +#define REG_SPDIF_STCCA_63_32 0x7C /* SPDIF transmit C channel register, bits 63-32 */ +#define REG_SPDIF_STCCA_95_64 0x80 /* SPDIF transmit C channel register, bits 95-64 */ +#define REG_SPDIF_STCCA_127_96 0x84 /* SPDIF transmit C channel register, bits 127-96 */ +#define REG_SPDIF_STCCA_159_128 0x88 /* SPDIF transmit C channel register, bits 159-128 */ +#define REG_SPDIF_STCCA_191_160 0x8C /* SPDIF transmit C channel register, bits 191-160 */ /* SPDIF Configuration register */ #define SCR_RXFIFO_CTL_OFFSET 23 -- 2.17.1

2 1

Re: [PATCH] ASoC: SOF: topology: Use kmemdup() to replace kzalloc + memcpy
by Mark Brown 17 Mar '22

17 Mar '22

On Thu, 17 Mar 2022 02:38:41 -0700, 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 > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: SOF: topology: Use kmemdup() to replace kzalloc + memcpy commit: b26f965f7c83464f60d5af411ef9a03079e41800 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark

1 0

[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