Linaro-mm-sig June 2024

linaro-mm-sig@lists.linaro.org

26 participants
62 discussions

Re: [PATCH RESEND v5 04/16] ASoC: mediatek: mt8365: Add common header

by AngeloGioacchino Del Regno

Il 14/06/24 09:27, Alexandre Mergnat ha scritto: > Add header files for register definition and structure. > > Signed-off-by: Alexandre Mergnat <amergnat(a)baylibre.com> > --- > sound/soc/mediatek/mt8365/mt8365-afe-common.h | 491 +++++++++++++ > sound/soc/mediatek/mt8365/mt8365-reg.h | 991 ++++++++++++++++++++++++++ > 2 files changed, 1482 insertions(+) > > diff --git a/sound/soc/mediatek/mt8365/mt8365-afe-common.h b/sound/soc/mediatek/mt8365/mt8365-afe-common.h > new file mode 100644 > index 000000000000..4d8f8c4b19e3 > --- /dev/null > +++ b/sound/soc/mediatek/mt8365/mt8365-afe-common.h > @@ -0,0 +1,491 @@ > +/* SPDX-License-Identifier: GPL-2.0 > + * > + * Mediatek 8365 audio driver common definitions > + * > + * Copyright (c) 2024 MediaTek Inc. > + * Authors: Jia Zeng <jia.zeng(a)mediatek.com> > + * Alexandre Mergnat <amergnat(a)baylibre.com> > + */ > + > +#ifndef _MT8365_AFE_COMMON_H_ > +#define _MT8365_AFE_COMMON_H_ > + > +#define COMMON_CLOCK_FRAMEWORK_API > +#define IDLE_TASK_DRIVER_API > +#define ENABLE_AFE_APLL_TUNER Those three definitions do not exist upstream. Please remove. > + > +#include <linux/clk.h> > +#include <linux/list.h> > +#include <linux/regmap.h> > +#include <sound/soc.h> > +#include <sound/asound.h> > +#include "../common/mtk-base-afe.h" > +#include "mt8365-reg.h" > + > +#define ENUM_TO_STR(enum) #enum Unused definition > + > +#define snd_soc_dai_stream_active_playback(dai) \ > + snd_soc_dai_stream_active(dai, SNDRV_PCM_STREAM_PLAYBACK) > +#define snd_soc_dai_stream_active_capture(dai) \ > + snd_soc_dai_stream_active(dai, SNDRV_PCM_STREAM_CAPTURE) > + Those are used only once and only in mt8365-dai-pcm.c, and I just noticed that. Can you please just remove those two and directly call snd_soc_dai_stream_active() with the right params in function mt8365_dai_pcm1_prepare()? > +enum { > + MT8365_AFE_MEMIF_DL1, > + MT8365_AFE_MEMIF_DL2, > + MT8365_AFE_MEMIF_TDM_OUT, ..snip.. > + > +#ifdef CONFIG_MTK_HIFIXDSP_SUPPORT This configuration option doesn't exist. Please remove the ifdef and the enclosed code entirely, as it's unused. > +struct mt8365_adsp_data { > + /* information adsp supply */ > + bool adsp_on; > + int (*hostless_active)(void); > + /* information afe supply */ > + int (*set_afe_memif)(struct mtk_base_afe *afe, > + int memif_id, > + unsigned int rate, > + unsigned int channels, > + snd_pcm_format_t format); > + int (*set_afe_memif_enable)(struct mtk_base_afe *afe, > + int memif_id, > + unsigned int rate, > + unsigned int period_size, > + int enable); > + void (*get_afe_memif_sram)(struct mtk_base_afe *afe, > + int memif_id, > + unsigned int *paddr, > + unsigned int *size); > + void (*set_afe_init)(struct mtk_base_afe *afe); > + void (*set_afe_uninit)(struct mtk_base_afe *afe); > +}; > +#endif > + > +struct mt8365_afe_private { > + struct clk *clocks[MT8365_CLK_NUM]; > + struct regmap *topckgen; > + struct mt8365_fe_dai_data fe_data[MT8365_AFE_MEMIF_NUM]; > + struct mt8365_be_dai_data be_data[MT8365_AFE_BACKEND_NUM]; > + struct mt8365_control_data ctrl_data; > + struct mt8365_gasrc_data gasrc_data[MT8365_TDM_ASRC_NUM]; > +#ifdef CONFIG_MTK_HIFIXDSP_SUPPORT > + struct mt8365_adsp_data adsp_data; ditto > +#endif > + int afe_on_ref_cnt; > + int top_cg_ref_cnt[MT8365_TOP_CG_NUM]; > + void __iomem *afe_sram_vir_addr; > + unsigned int afe_sram_phy_addr; > + unsigned int afe_sram_size; > + /* locks */ > + spinlock_t afe_ctrl_lock; > + struct mutex afe_clk_mutex; /* Protect & sync APLL TUNER registers access*/ > +#ifdef CONFIG_DEBUG_FS > + struct dentry *debugfs_dentry[MT8365_AFE_DEBUGFS_NUM]; > +#endif > + int apll_tuner_ref_cnt[MT8365_AFE_APLL_NUM]; > + unsigned int tdm_out_mode; > + unsigned int cm2_mux_input; > + > + /* dai */ > + bool dai_on[MT8365_AFE_BACKEND_END]; > + void *dai_priv[MT8365_AFE_BACKEND_END]; > +}; > + .... > +#ifdef CONFIG_MTK_HIFIXDSP_SUPPORT same > +struct mtk_base_afe *mt8365_afe_pcm_get_info(void); > +#endif > + > +int mt8365_dai_i2s_register(struct mtk_base_afe *afe); > +int mt8365_dai_set_priv(struct mtk_base_afe *afe, > + int id, > + int priv_size, > + const void *priv_data); > + Everything else looks good. After applying the proposed cleanups, Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com> Cheers, Angelo

3 months, 1 week

Re: [PATCH RESEND v5 13/16] ASoC: mediatek: Add MT8365 support

by AngeloGioacchino Del Regno

Il 14/06/24 09:27, Alexandre Mergnat ha scritto: > - Add specific config to enable: > - MT8365 sound support > - MT6357 audio codec support > - Add the mt8365 directory and all drivers under it. > > Signed-off-by: Alexandre Mergnat <amergnat(a)baylibre.com> > --- > sound/soc/mediatek/Kconfig | 20 ++++++++++++++++++++ > sound/soc/mediatek/Makefile | 1 + > sound/soc/mediatek/mt8365/Makefile | 15 +++++++++++++++ > 3 files changed, 36 insertions(+) > > diff --git a/sound/soc/mediatek/Kconfig b/sound/soc/mediatek/Kconfig > index 5a8476e1ecca..c1c86ecc0601 100644 > --- a/sound/soc/mediatek/Kconfig > +++ b/sound/soc/mediatek/Kconfig > @@ -298,3 +298,23 @@ config SND_SOC_MT8195_MT6359 > boards with the MT6359 and other I2S audio codecs. > Select Y if you have such device. > If unsure select "N". > + > +config SND_SOC_MT8365 > + tristate "ASoC support for Mediatek MT8365 chip" > + depends on ARCH_MEDIATEK > + select SND_SOC_MEDIATEK > + help > + This adds ASoC platform driver support for Mediatek MT8365 chip > + that can be used with other codecs. > + Select Y if you have such device. > + If unsure select "N". > + > +config SND_SOC_MT8365_MT6357 > + tristate "ASoC Audio driver for MT8365 with MT6357 codec" > + depends on SND_SOC_MT8365 && MTK_PMIC_WRAP > + select SND_SOC_MT6357 > + help > + This adds support for ASoC machine driver for Mediatek MT8365 s/Mediatek/MediaTek/g (here and everywhere else in other commits as well) > + boards with the MT6357 codec. MT6357 PMIC codec after which Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com>

3 months, 1 week

Re: [PATCH RESEND v5 01/16] ASoC: dt-bindings: mediatek,mt8365-afe: Add audio afe document

by AngeloGioacchino Del Regno

Il 14/06/24 09:27, Alexandre Mergnat ha scritto: > Add MT8365 audio front-end bindings > > Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> > Signed-off-by: Alexandre Mergnat <amergnat(a)baylibre.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com>

3 months, 1 week

Re: [PATCH RESEND v5 02/16] ASoC: dt-bindings: mediatek,mt8365-mt6357: Add audio sound card document

by AngeloGioacchino Del Regno

Il 14/06/24 09:27, Alexandre Mergnat ha scritto: > Add soundcard bindings for the MT8365 SoC with the MT6357 audio codec. > > Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> > Signed-off-by: Alexandre Mergnat <amergnat(a)baylibre.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com>

3 months, 1 week

Re: [PATCH RESEND v5 05/16] ASoC: mediatek: mt8365: Add audio clock control support

by AngeloGioacchino Del Regno

Il 14/06/24 09:27, Alexandre Mergnat ha scritto: > Add audio clock wrapper and audio tuner control. > > Signed-off-by: Alexandre Mergnat <amergnat(a)baylibre.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com>

3 months, 1 week

Re: [PATCH RESEND v5 06/16] ASoC: mediatek: mt8365: Add I2S DAI support

by AngeloGioacchino Del Regno

Il 14/06/24 09:27, Alexandre Mergnat ha scritto: > Add I2S Device Audio Interface support for MT8365 SoC. > > Signed-off-by: Alexandre Mergnat <amergnat(a)baylibre.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com>

3 months, 1 week

Re: [PATCH RESEND v5 08/16] ASoC: mediatek: mt8365: Add DMIC DAI support

by AngeloGioacchino Del Regno

Il 14/06/24 09:27, Alexandre Mergnat ha scritto: > Add Digital Micro Device Audio Interface support for MT8365 SoC. > > Signed-off-by: Alexandre Mergnat <amergnat(a)baylibre.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com>

3 months, 1 week

Re: [PATCH RESEND v5 07/16] ASoC: mediatek: mt8365: Add ADDA DAI support

by AngeloGioacchino Del Regno

Il 14/06/24 09:27, Alexandre Mergnat ha scritto: > Add ADDA Device Audio Interface support for MT8365 SoC. > > Signed-off-by: Alexandre Mergnat <amergnat(a)baylibre.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com>

3 months, 1 week

Re: [PATCH] media: videobuf2: sync caches for dmabuf memory

by Tomasz Figa

Hi TaoJiang, On Tue, Jun 18, 2024 at 4:30 PM TaoJiang <tao.jiang_2(a)nxp.com> wrote: > > From: Ming Qian <ming.qian(a)nxp.com> > > When the memory type is VB2_MEMORY_DMABUF, the v4l2 device can't know > whether the dma buffer is coherent or synchronized. > > The videobuf2-core will skip cache syncs as it think the DMA exporter > should take care of cache syncs > > But in fact it's likely that the client doesn't > synchronize the dma buf before qbuf() or after dqbuf(). and it's > difficult to find this type of error directly. > > I think it's helpful that videobuf2-core can call > dma_buf_end_cpu_access() and dma_buf_begin_cpu_access() to handle the > cache syncs. > > Signed-off-by: Ming Qian <ming.qian(a)nxp.com> > Signed-off-by: TaoJiang <tao.jiang_2(a)nxp.com> > --- > .../media/common/videobuf2/videobuf2-core.c | 22 +++++++++++++++++++ > 1 file changed, 22 insertions(+) > Sorry, that patch is incorrect. I believe you're misunderstanding the way DMA-buf buffers should be managed in the userspace. It's the userspace responsibility to call the DMA_BUF_IOCTL_SYNC ioctl [1] to signal start and end of CPU access to the kernel and imply necessary cache synchronization. [1] https://docs.kernel.org/driver-api/dma-buf.html#dma-buffer-ioctls So, really sorry, but it's a NAK. Best regards, Tomasz > diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c > index 358f1fe42975..4734ff9cf3ce 100644 > --- a/drivers/media/common/videobuf2/videobuf2-core.c > +++ b/drivers/media/common/videobuf2/videobuf2-core.c > @@ -340,6 +340,17 @@ static void __vb2_buf_mem_prepare(struct vb2_buffer *vb) > vb->synced = 1; > for (plane = 0; plane < vb->num_planes; ++plane) > call_void_memop(vb, prepare, vb->planes[plane].mem_priv); > + > + if (vb->memory != VB2_MEMORY_DMABUF) > + return; > + for (plane = 0; plane < vb->num_planes; ++plane) { > + struct dma_buf *dbuf = vb->planes[plane].dbuf; > + > + if (!dbuf) > + continue; > + > + dma_buf_end_cpu_access(dbuf, vb->vb2_queue->dma_dir); > + } > } > > /* > @@ -356,6 +367,17 @@ static void __vb2_buf_mem_finish(struct vb2_buffer *vb) > vb->synced = 0; > for (plane = 0; plane < vb->num_planes; ++plane) > call_void_memop(vb, finish, vb->planes[plane].mem_priv); > + > + if (vb->memory != VB2_MEMORY_DMABUF) > + return; > + for (plane = 0; plane < vb->num_planes; ++plane) { > + struct dma_buf *dbuf = vb->planes[plane].dbuf; > + > + if (!dbuf) > + continue; > + > + dma_buf_begin_cpu_access(dbuf, vb->vb2_queue->dma_dir); > + } > } > > /* > -- > 2.43.0-rc1 >

3 months, 1 week

Re: [PATCH RESEND v5 00/16] Add audio support for the MediaTek Genio 350-evk board

by AngeloGioacchino Del Regno

Il 17/06/24 10:05, Alexandre Mergnat ha scritto: > > > On 14/06/2024 11:31, Mark Brown wrote: >> On Fri, Jun 14, 2024 at 09:27:43AM +0200, Alexandre Mergnat wrote: >>> This serie aim to add the following audio support for the Genio 350-evk: >>> - Playback >>> - 2ch Headset Jack (Earphone) >>> - 1ch Line-out Jack (Speaker) >>> - 8ch HDMI Tx >> >> I seem to remember you had review comments that needed addressing from >> AngeloGioacchino, why resend without addressing those? > > I don't see any comment: > https://lore.kernel.org/lkml/20240226-audio-i350-v5-0-e7e2569df481@baylibre… > Mark, the review comments were on the v4 of this series :-) I'll review this version probably tomorrow, or anyway this week. Cheers, Angelo

3 months, 1 week

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

Linaro-mm-sig June 2024