| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <76814cba-3613-4c3e-afb5-aacf5f5db06c@collabora.com>
Date: Mon, 20 May 2024 12:27:14 +0200
From: AngeloGioacchino Del Regno <angelogioacchino.delregno@...labora.com>
To: Alexandre Mergnat <amergnat@...libre.com>,
Liam Girdwood <lgirdwood@...il.com>, Mark Brown <broonie@...nel.org>,
Rob Herring <robh+dt@...nel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@...aro.org>,
Conor Dooley <conor+dt@...nel.org>, Matthias Brugger
<matthias.bgg@...il.com>, Lee Jones <lee@...nel.org>,
Flora Fu <flora.fu@...iatek.com>, Jaroslav Kysela <perex@...ex.cz>,
Takashi Iwai <tiwai@...e.com>, Sumit Semwal <sumit.semwal@...aro.org>,
Christian König <christian.koenig@....com>,
Catalin Marinas <catalin.marinas@....com>, Will Deacon <will@...nel.org>,
Rob Herring <robh@...nel.org>, Krzysztof Kozlowski <krzk+dt@...nel.org>
Cc: linux-sound@...r.kernel.org, devicetree@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
linux-mediatek@...ts.infradead.org, linux-media@...r.kernel.org,
dri-devel@...ts.freedesktop.org, linaro-mm-sig@...ts.linaro.org
Subject: Re: [PATCH v4 08/16] ASoC: mediatek: mt8365: Add DMIC DAI support
Il 26/04/24 19:22, Alexandre Mergnat ha scritto:
> Add Digital Micro Device Audio Interface support for MT8365 SoC.
>
> Signed-off-by: Alexandre Mergnat <amergnat@...libre.com>
> ---
> sound/soc/mediatek/mt8365/mt8365-dai-dmic.c | 347 ++++++++++++++++++++++++++++
> 1 file changed, 347 insertions(+)
>
> diff --git a/sound/soc/mediatek/mt8365/mt8365-dai-dmic.c b/sound/soc/mediatek/mt8365/mt8365-dai-dmic.c
> new file mode 100644
> index 000000000000..0dd606274d8e
> --- /dev/null
> +++ b/sound/soc/mediatek/mt8365/mt8365-dai-dmic.c
> @@ -0,0 +1,347 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Mediatek 8365 ALSA SoC Audio DAI DMIC Control
> + *
> + * Copyright (c) 2024 MediaTek Inc.
> + * Authors: Jia Zeng <jia.zeng@...iatek.com>
> + * Alexandre Mergnat <amergnat@...libre.com>
> + */
> +
> +#include <linux/bitops.h>
> +#include <linux/regmap.h>
> +#include <sound/pcm_params.h>
> +#include "mt8365-afe-clk.h"
> +#include "mt8365-afe-common.h"
> +
> +struct mt8365_dmic_data {
> + bool two_wire_mode;
> + unsigned int clk_phase_sel_ch1;
> + unsigned int clk_phase_sel_ch2;
> + bool iir_on;
> + unsigned int irr_mode;
> + unsigned int dmic_mode;
> + unsigned int dmic_channel;
> +};
> +
> +static int get_chan_reg(unsigned int channel)
> +{
> + switch (channel) {
> + case 8:
> + fallthrough;
> + case 7:
> + return AFE_DMIC3_UL_SRC_CON0;
> + case 6:
> + fallthrough;
> + case 5:
> + return AFE_DMIC2_UL_SRC_CON0;
> + case 4:
> + fallthrough;
> + case 3:
> + return AFE_DMIC1_UL_SRC_CON0;
> + case 2:
> + fallthrough;
> + case 1:
> + return AFE_DMIC0_UL_SRC_CON0;
> + default:
> + return -EINVAL;
> + }
> +}
> +
> +/* DAI Drivers */
> +
> +static void audio_dmic_adda_enable(struct mtk_base_afe *afe)
> +{
> + mt8365_dai_enable_adda_on(afe);
> + regmap_update_bits(afe->regmap, AFE_ADDA_UL_DL_CON0,
> + AFE_ADDA_UL_DL_DMIC_CLKDIV_ON,
> + AFE_ADDA_UL_DL_DMIC_CLKDIV_ON);
> +}
> +
> +static void audio_dmic_adda_disable(struct mtk_base_afe *afe)
> +{
> + regmap_update_bits(afe->regmap, AFE_ADDA_UL_DL_CON0,
> + AFE_ADDA_UL_DL_DMIC_CLKDIV_ON,
> + ~AFE_ADDA_UL_DL_DMIC_CLKDIV_ON);
> + mt8365_dai_disable_adda_on(afe);
> +}
> +
> +static void mt8365_dai_enable_dmic(struct mtk_base_afe *afe,
> + struct snd_pcm_substream *substream,
> + struct snd_soc_dai *dai)
> +{
> + struct mt8365_afe_private *afe_priv = afe->platform_priv;
> + struct mt8365_dmic_data *dmic_data = afe_priv->dai_priv[MT8365_AFE_IO_DMIC];
> + unsigned int val_mask;
> + int reg = get_chan_reg(dmic_data->dmic_channel);
> +
> + if (reg < 0)
> + return;
> +
> + /* val and mask will be always same to enable */
> + val_mask = DMIC_TOP_CON_CH1_ON |
> + DMIC_TOP_CON_CH2_ON |
> + DMIC_TOP_CON_SRC_ON;
> +
> + regmap_update_bits(afe->regmap, reg, val_mask, val_mask);
> +}
> +
> +static void mt8365_dai_disable_dmic(struct mtk_base_afe *afe,
> + struct snd_pcm_substream *substream,
> + struct snd_soc_dai *dai)
> +{
> + struct mt8365_afe_private *afe_priv = afe->platform_priv;
> + struct mt8365_dmic_data *dmic_data = afe_priv->dai_priv[MT8365_AFE_IO_DMIC];
> + unsigned int mask;
> + int reg = get_chan_reg(dmic_data->dmic_channel);
> +
> + if (reg < 0)
> + return;
> +
> + dev_info(afe->dev, "%s dmic_channel %d\n",
> + __func__, dmic_data->dmic_channel);
Please, either remove this print, or use dev_dbg().
In case you're not removing it, fits in one line.
> +
> + mask = DMIC_TOP_CON_CH1_ON |
> + DMIC_TOP_CON_CH2_ON |
> + DMIC_TOP_CON_SRC_ON |
> + DMIC_TOP_CON_SDM3_LEVEL_MODE;
> +
> + /* Set all masked values to 0 */
> + regmap_update_bits(afe->regmap, reg, mask, 0);
> +}
> +
> +static const struct reg_sequence mt8365_dmic_iir_coeff[] = {
> + { AFE_DMIC0_IIR_COEF_02_01, 0x00000000 },
> + { AFE_DMIC0_IIR_COEF_04_03, 0x00003FB8 },
> + { AFE_DMIC0_IIR_COEF_06_05, 0x3FB80000 },
> + { AFE_DMIC0_IIR_COEF_08_07, 0x3FB80000 },
> + { AFE_DMIC0_IIR_COEF_10_09, 0x0000C048 },
> + { AFE_DMIC1_IIR_COEF_02_01, 0x00000000 },
> + { AFE_DMIC1_IIR_COEF_04_03, 0x00003FB8 },
> + { AFE_DMIC1_IIR_COEF_06_05, 0x3FB80000 },
> + { AFE_DMIC1_IIR_COEF_08_07, 0x3FB80000 },
> + { AFE_DMIC1_IIR_COEF_10_09, 0x0000C048 },
> + { AFE_DMIC2_IIR_COEF_02_01, 0x00000000 },
> + { AFE_DMIC2_IIR_COEF_04_03, 0x00003FB8 },
> + { AFE_DMIC2_IIR_COEF_06_05, 0x3FB80000 },
> + { AFE_DMIC2_IIR_COEF_08_07, 0x3FB80000 },
> + { AFE_DMIC2_IIR_COEF_10_09, 0x0000C048 },
> + { AFE_DMIC3_IIR_COEF_02_01, 0x00000000 },
> + { AFE_DMIC3_IIR_COEF_04_03, 0x00003FB8 },
> + { AFE_DMIC3_IIR_COEF_06_05, 0x3FB80000 },
> + { AFE_DMIC3_IIR_COEF_08_07, 0x3FB80000 },
> + { AFE_DMIC3_IIR_COEF_10_09, 0x0000C048 },
> +};
> +
> +static int mt8365_dai_load_dmic_iir_coeff_table(struct mtk_base_afe *afe)
> +{
> + return regmap_multi_reg_write(afe->regmap,
> + mt8365_dmic_iir_coeff,
> + ARRAY_SIZE(mt8365_dmic_iir_coeff));
> +}
> +
> +static int mt8365_dai_configure_dmic(struct mtk_base_afe *afe,
> + struct snd_pcm_substream *substream,
> + struct snd_soc_dai *dai)
> +{
> + struct mt8365_afe_private *afe_priv = afe->platform_priv;
> + struct mt8365_dmic_data *dmic_data = afe_priv->dai_priv[MT8365_AFE_IO_DMIC];
> + bool two_wire_mode = dmic_data->two_wire_mode;
> + unsigned int clk_phase_sel_ch1 = dmic_data->clk_phase_sel_ch1;
> + unsigned int clk_phase_sel_ch2 = dmic_data->clk_phase_sel_ch2;
> + unsigned int val = 0;
> + unsigned int mask = 0;
> + unsigned int rate = dai->rate;
> + int reg = get_chan_reg(dai->channels);
> +
> + if (reg < 0)
> + return -EINVAL;
> +
> + dmic_data->dmic_channel = dai->channels;
> +
> + val |= DMIC_TOP_CON_SDM3_LEVEL_MODE;
> + mask |= DMIC_TOP_CON_SDM3_LEVEL_MODE;
> +
> + if (two_wire_mode) {
> + val |= DMIC_TOP_CON_TWO_WIRE_MODE;
> + mask |= DMIC_TOP_CON_TWO_WIRE_MODE;
> + } else {
> + val |= FIELD_PREP(DMIC_TOP_CON_CK_PHASE_SEL_CH1,
> + clk_phase_sel_ch1);
> + val |= FIELD_PREP(DMIC_TOP_CON_CK_PHASE_SEL_CH2,
> + clk_phase_sel_ch2);
> + mask |= DMIC_TOP_CON_CK_PHASE_SEL_CH1;
> + mask |= DMIC_TOP_CON_CK_PHASE_SEL_CH2;
> + }
> +
> + switch (rate) {
> + case 48000:
> + val |= DMIC_TOP_CON_VOICE_MODE_48K;
> + break;
> + case 32000:
> + val |= DMIC_TOP_CON_VOICE_MODE_32K;
> + break;
> + case 16000:
> + val |= DMIC_TOP_CON_VOICE_MODE_16K;
> + break;
> + case 8000:
> + val |= DMIC_TOP_CON_VOICE_MODE_8K;
> + break;
> + default:
> + return -EINVAL;
> + }
> + mask |= DMIC_TOP_CON_VOICE_MODE_MASK;
You initialize the mask...
> +
> + regmap_update_bits(afe->regmap, reg, DMIC_TOP_CON_CONFIG_MASK, val);
..but then you don't use it? :-)
> +
> + return 0;
> +}
Cheers,
Angelo
Powered by blists - more mailing lists