- Sound-open-firmware - mailman.alsa-project.org

[Sound-open-firmware] [PATCH 1/2] ASoC: SOF: Prevent NULL dereference in sof_pcm_dai_link_fixup()
by Dan Carpenter 20 Mar '22

20 Mar '22

The "dia" pointer can be NULL, so handle that condition first before storing "dia->private". Fixes: 839e484f9e17 ("ASoC: SOF: make struct snd_sof_dai IPC agnostic") Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> --- sound/soc/sof/pcm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/sof/pcm.c b/sound/soc/sof/pcm.c index 1661b0bc6f12..71f5bce0c4c7 100644 --- a/sound/soc/sof/pcm.c +++ b/sound/soc/sof/pcm.c @@ -702,7 +702,7 @@ int sof_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_pa struct snd_sof_dai *dai = snd_sof_find_dai(component, (char *)rtd->dai_link->name); struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component); - struct sof_dai_private_data *private = dai->private; + struct sof_dai_private_data *private; struct snd_soc_dpcm *dpcm; /* no topology exists for this BE, try a common configuration */ @@ -727,6 +727,7 @@ int sof_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_pa /* read format from topology */ snd_mask_none(fmt); + private = dai->private; switch (private->comp_dai->config.frame_fmt) { case SOF_IPC_FRAME_S16_LE: snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S16_LE); -- 2.20.1

4 5

[Sound-open-firmware] [RESEND v6 0/1] firmware: mtk: add adsp ipc protocol for sof
by Allen-KH Cheng 18 Mar '22

18 Mar '22

This patch provides mtk adsp ipc support for sof. ADSP IPC protocol offers (send/recv) interfaces using mediatek-mailbox APIs. This was tested and confirmed on MT8195 cherry board with sof. Based on linux-next changes since v5: - fix WARNING: modpost: missing MODULE_LICENSE() in drivers/mailbox /mtk-adsp-mailbox.o. Add MODULE_LICENSE in the last line. - Due to WARNING: Missing or malformed SPDX-License-Identifier tag in line 1 in checkpatch, we don't remove SPDX-License in line 1. changes since v4: - add error message for wrong mbox chan changes since v3: - rebase on v5.16-rc8 - update reviewers changes since v2: - add out tag for two memory free phases changes since v1: - add comments for mtk_adsp_ipc_send and mtk_adsp_ipc_recv - remove useless MODULE_LICENSE - change label name to out_free Allen-KH Cheng (1): firmware: mediatek: add adsp ipc protocol interface drivers/firmware/Kconfig | 1 + drivers/firmware/Makefile | 1 + drivers/firmware/mediatek/Kconfig | 9 + drivers/firmware/mediatek/Makefile | 2 + drivers/firmware/mediatek/mtk-adsp-ipc.c | 161 ++++++++++++++++++ .../linux/firmware/mediatek/mtk-adsp-ipc.h | 65 +++++++ 6 files changed, 239 insertions(+) create mode 100644 drivers/firmware/mediatek/Kconfig create mode 100644 drivers/firmware/mediatek/Makefile create mode 100644 drivers/firmware/mediatek/mtk-adsp-ipc.c create mode 100644 include/linux/firmware/mediatek/mtk-adsp-ipc.h -- 2.18.0

2 2

Re: [Sound-open-firmware] [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

Re: [Sound-open-firmware] [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: [Sound-open-firmware] [PATCH 1/2] ASoC: SOF: amd: Remove unneeded semicolon
by Mark Brown 10 Mar '22

10 Mar '22

On Wed, 9 Mar 2022 08:49:29 +0800, Jiapeng Chong wrote: > Fix the following coccicheck warnings: > > ./sound/soc/sof/amd/acp.c:280:3-4: Unneeded semicolon. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/2] ASoC: SOF: amd: Remove unneeded semicolon commit: 5af07dad696422d48368409461a754990faa713c [2/2] ASoC: SOF: amd: Remove unneeded semicolon commit: 5af07dad696422d48368409461a754990faa713c 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

Re: [Sound-open-firmware] [PATCH] ASoC: SOF: Add missing of_node_put() in imx8m_probe
by Mark Brown 08 Mar '22

08 Mar '22

On Tue, 8 Mar 2022 02:33:23 +0000, Miaoqian Lin wrote: > The device_node pointer is returned by of_parse_phandle() with refcount > incremented. We should use of_node_put() on it when done. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: SOF: Add missing of_node_put() in imx8m_probe commit: 5575f7f49134c7386a684335c9007737c606d3b5 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

[Sound-open-firmware] [PATCH v18 0/2] mtk: add ADSP mailbox controller for MT8195
by Allen-KH Cheng 05 Mar '22

05 Mar '22

Mediatek ADSP IPC is used to send notification or short message between processors with dsp. It will place the message to the share buffer and will access the ADSP mailbox registers to kick dsp. Two mailboxes used to send notification or short message between processors with dsp. This patchset was tested and confirmed on MT8195 cherry board. Based on tag: next-20220223, linux-next/master changes since v17: - remove description and add maxItems for reg and interrupts in mtk,adsp-mbox.yaml changes since v16: - fix WARNING: modpost: missing MODULE_LICENSE() in drivers/mailbox /mtk-adsp-mailbox.o. Add MODULE_LICENSE in the last line. - Due to WARNING: Missing or malformed SPDX-License-Identifier tag in line 1 in checkpatch, we don't remove SPDX-License in line 1. changes since v15: - add paragraphs to describe the config symbols fully changes since v14: - add inline for get_mtk_adsp_mbox_priv changes since v13: - rebase on v5.16-rc8 - add back ptr check from of_device_get_match_data changes since v12: - remove of_device_get_match_data ptr check: of_device_get_match_data(dev) will never going to return NULL. driver probe with compatible mediatek,mt8195-adsp-mbox. changes since v11: - remove useless MODULE_LICENSE changes since v10: - split up v9 into two separate submissions changes since v9: - rename adsp_mbox_chan_ops to mtk_adsp_mbox_chan_ops changes since v8: - remove struct adsp_mbox_ch_info - add get_mtk_adsp_mbox_priv - use mtk_adsp_mbox_priv va_mboxreg address in adsp mbox driver - add struct mtk_adsp_mbox_cfg for DSP mbox register offset - remove adsp mbox register offset hard code define - remove mtk-adsp-ipc.h reference in adsp mbox driver changes since v7: - add mtk prefix for adsp ipc functions - rename adsp_mbox_ch_info to mtk_adsp_mbox_ch_info - remove incorrect reviewers in commit message changes since v6: - dt-bindings: change example dtsi node. - rename config MTK_ADSP_IPC_MBOX to MTK_ADSP_MBOX - remove unused variable - add reviewers changes since v5: - remove some redundant code changes since v4: - use switch ... case in adsp_ipc_recv - add error handling path for chan_name pointer - refine some code to be concise changes since v3: - reorder MTK_ADSP_IPC_MBOX config - remove some redundant code - remove lock in mtk-adsp-mailbox changes since v2: - separate adsp_mailbox into two instances changes since v1: - fix dt_binding_check error Allen-KH Cheng (2): dt-bindings: mailbox: mtk,adsp-mbox: add mtk adsp-mbox document mailbox: mediatek: add support for adsp mailbox controller .../bindings/mailbox/mtk,adsp-mbox.yaml | 50 +++++ drivers/mailbox/Kconfig | 9 + drivers/mailbox/Makefile | 2 + drivers/mailbox/mtk-adsp-mailbox.c | 176 ++++++++++++++++++ 4 files changed, 237 insertions(+) create mode 100644 Documentation/devicetree/bindings/mailbox/mtk,adsp-mbox.yaml create mode 100644 drivers/mailbox/mtk-adsp-mailbox.c -- 2.18.0

2 3

[Sound-open-firmware] [RESEND v17 0/2] mtk: add ADSP mailbox controller for MT8195
by Allen-KH Cheng 25 Feb '22

25 Feb '22

Mediatek ADSP IPC is used to send notification or short message between processors with dsp. It will place the message to the share buffer and will access the ADSP mailbox registers to kick dsp. Two mailboxes used to send notification or short message between processors with dsp. This patchset was tested and confirmed on MT8195 cherry board. Based on tag: next-20220223, linux-next/master changes since v16: - fix WARNING: modpost: missing MODULE_LICENSE() in drivers/mailbox /mtk-adsp-mailbox.o. Add MODULE_LICENSE in the last line. - Due to WARNING: Missing or malformed SPDX-License-Identifier tag in line 1 in checkpatch, we don't remove SPDX-License in line 1. changes since v15: - add paragraphs to describe the config symbols fully changes since v14: - add inline for get_mtk_adsp_mbox_priv changes since v13: - rebase on v5.16-rc8 - add back ptr check from of_device_get_match_data changes since v12: - remove of_device_get_match_data ptr check: of_device_get_match_data(dev) will never going to return NULL. driver probe with compatible mediatek,mt8195-adsp-mbox. changes since v11: - remove useless MODULE_LICENSE changes since v10: - split up v9 into two separate submissions changes since v9: - rename adsp_mbox_chan_ops to mtk_adsp_mbox_chan_ops changes since v8: - remove struct adsp_mbox_ch_info - add get_mtk_adsp_mbox_priv - use mtk_adsp_mbox_priv va_mboxreg address in adsp mbox driver - add struct mtk_adsp_mbox_cfg for DSP mbox register offset - remove adsp mbox register offset hard code define - remove mtk-adsp-ipc.h reference in adsp mbox driver changes since v7: - add mtk prefix for adsp ipc functions - rename adsp_mbox_ch_info to mtk_adsp_mbox_ch_info - remove incorrect reviewers in commit message changes since v6: - dt-bindings: change example dtsi node. - rename config MTK_ADSP_IPC_MBOX to MTK_ADSP_MBOX - remove unused variable - add reviewers changes since v5: - remove some redundant code changes since v4: - use switch ... case in adsp_ipc_recv - add error handling path for chan_name pointer - refine some code to be concise changes since v3: - reorder MTK_ADSP_IPC_MBOX config - remove some redundant code - remove lock in mtk-adsp-mailbox changes since v2: - separate adsp_mailbox into two instances changes since v1: - fix dt_binding_check error Allen-KH Cheng (2): dt-bindings: mailbox: mtk,adsp-mbox: add mtk adsp-mbox document mailbox: mediatek: add support for adsp mailbox controller .../bindings/mailbox/mtk,adsp-mbox.yaml | 52 ++++++ drivers/mailbox/Kconfig | 9 + drivers/mailbox/Makefile | 2 + drivers/mailbox/mtk-adsp-mailbox.c | 176 ++++++++++++++++++ 4 files changed, 239 insertions(+) create mode 100644 Documentation/devicetree/bindings/mailbox/mtk,adsp-mbox.yaml create mode 100644 drivers/mailbox/mtk-adsp-mailbox.c -- 2.18.0

3 4

Re: [Sound-open-firmware] [PATCH v4] ASoC: SOF: Intel: Fix NULL ptr dereference when ENOMEM
by Mark Brown 25 Feb '22

25 Feb '22

On Fri, 25 Feb 2022 01:58:36 +0700, Ammar Faizi wrote: > Do not call snd_dma_free_pages() when snd_dma_alloc_pages() returns > -ENOMEM because it leads to a NULL pointer dereference bug. > > The dmesg says: > > [ T1387] sof-audio-pci-intel-tgl 0000:00:1f.3: error: memory alloc failed: -12 > [ T1387] BUG: kernel NULL pointer dereference, address: 0000000000000000 > [ T1387] #PF: supervisor read access in kernel mode > [ T1387] #PF: error_code(0x0000) - not-present page > [ T1387] PGD 0 P4D 0 > [ T1387] Oops: 0000 [#1] PREEMPT SMP NOPTI > [ T1387] CPU: 6 PID: 1387 Comm: alsa-sink-HDA A Tainted: G W 5.17.0-rc4-superb-owl-00055-g80d47f5de5e3 > [ T1387] Hardware name: HP HP Laptop 14s-dq2xxx/87FD, BIOS F.15 09/15/2021 > [ T1387] RIP: 0010:dma_free_noncontiguous+0x37/0x80 > [ T1387] Code: [... snip ...] > [ T1387] RSP: 0000:ffffc90002b87770 EFLAGS: 00010246 > [ T1387] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 > [ T1387] RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff888101db30d0 > [ T1387] RBP: 00000000fffffff4 R08: 0000000000000000 R09: 0000000000000000 > [ T1387] R10: 0000000000000000 R11: ffffc90002b874d0 R12: 0000000000000001 > [ T1387] R13: 0000000000058000 R14: ffff888105260c68 R15: ffff888105260828 > [ T1387] FS: 00007f42e2ffd640(0000) GS:ffff888466b80000(0000) knlGS:0000000000000000 > [ T1387] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > [ T1387] CR2: 0000000000000000 CR3: 000000014acf0003 CR4: 0000000000770ee0 > [ T1387] PKRU: 55555554 > [ T1387] Call Trace: > [ T1387] <TASK> > [ T1387] cl_stream_prepare+0x10a/0x120 [snd_sof_intel_hda_common 146addf995b9279ae7f509621078cccbe4f875e1] > [... snip ...] > [ T1387] </TASK> > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-linus Thanks! [1/1] ASoC: SOF: Intel: Fix NULL ptr dereference when ENOMEM commit: b7fb0ae09009d076964afe4c1a2bde1ee2bd88a9 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

Re: [Sound-open-firmware] [PATCH v3] ASoC: SOF: Intel: Fix NULL ptr dereference when ENOMEM
by Mark Brown 25 Feb '22

25 Feb '22

On Fri, 25 Feb 2022 01:28:18 +0700, Ammar Faizi wrote: > From: Ammar Faizi <ammarfaizi2(a)gnuweeb.org> > > Do not call snd_dma_free_pages() when snd_dma_alloc_pages() returns > -ENOMEM because it leads to a NULL pointer dereference bug. > > The dmesg says: > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-linus Thanks! [1/1] ASoC: SOF: Intel: Fix NULL ptr dereference when ENOMEM commit: b7fb0ae09009d076964afe4c1a2bde1ee2bd88a9 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