December 2021 - Alsa-devel - mailman.alsa-project.org

[PATCH] ASoC: rt1011: revert 'I2S Reference' to SOC_ENUM_EXT
by Jack Yu 01 Dec '21

01 Dec '21

Revert 'I2S Reference' to SOC_ENUM_EXT because the settings are specific for some platforms, the default setting for 'I2S Reference' does nothing, only some SoC platform need to configure it. Previous 'I2S Reference' in SOC_ENUM format only toggles one bit of RT1011_TDM1_SET_1 register, which isn't enough for specific platform. Signed-off-by: Jack Yu <jack.yu(a)realtek.com> --- sound/soc/codecs/rt1011.c | 55 ++++++++++++++++++++++++++++++++++----- sound/soc/codecs/rt1011.h | 7 +++++ 2 files changed, 56 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/rt1011.c b/sound/soc/codecs/rt1011.c index 297af7ff824c..b62301a6281f 100644 --- a/sound/soc/codecs/rt1011.c +++ b/sound/soc/codecs/rt1011.c @@ -1311,13 +1311,54 @@ static int rt1011_r0_load_info(struct snd_kcontrol *kcontrol, .put = rt1011_r0_load_mode_put \ } -static const char * const rt1011_i2s_ref_texts[] = { - "Left Channel", "Right Channel" +static const char * const rt1011_i2s_ref[] = { + "None", "Left Channel", "Right Channel" }; -static SOC_ENUM_SINGLE_DECL(rt1011_i2s_ref_enum, - RT1011_TDM1_SET_1, 7, - rt1011_i2s_ref_texts); +static SOC_ENUM_SINGLE_DECL(rt1011_i2s_ref_enum, 0, 0, + rt1011_i2s_ref); + +static int rt1011_i2s_ref_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *component = + snd_soc_kcontrol_component(kcontrol); + struct rt1011_priv *rt1011 = + snd_soc_component_get_drvdata(component); + + rt1011->i2s_ref = ucontrol->value.enumerated.item[0]; + switch (rt1011->i2s_ref) { + case RT1011_I2S_REF_LEFT_CH: + regmap_write(rt1011->regmap, RT1011_TDM_TOTAL_SET, 0x0240); + regmap_write(rt1011->regmap, RT1011_TDM1_SET_2, 0x8); + regmap_write(rt1011->regmap, RT1011_TDM1_SET_1, 0x1022); + regmap_write(rt1011->regmap, RT1011_ADCDAT_OUT_SOURCE, 0x4); + break; + case RT1011_I2S_REF_RIGHT_CH: + regmap_write(rt1011->regmap, RT1011_TDM_TOTAL_SET, 0x0240); + regmap_write(rt1011->regmap, RT1011_TDM1_SET_2, 0x8); + regmap_write(rt1011->regmap, RT1011_TDM1_SET_1, 0x10a2); + regmap_write(rt1011->regmap, RT1011_ADCDAT_OUT_SOURCE, 0x4); + break; + default: + dev_info(component->dev, "I2S Reference: Do nothing\n"); + } + + return 0; +} + +static int rt1011_i2s_ref_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *component = + snd_soc_kcontrol_component(kcontrol); + struct rt1011_priv *rt1011 = + snd_soc_component_get_drvdata(component); + + ucontrol->value.enumerated.item[0] = rt1011->i2s_ref; + + return 0; +} static const struct snd_kcontrol_new rt1011_snd_controls[] = { /* I2S Data In Selection */ @@ -1358,7 +1399,8 @@ static const struct snd_kcontrol_new rt1011_snd_controls[] = { SOC_SINGLE("R0 Temperature", RT1011_STP_INITIAL_RESISTANCE_TEMP, 2, 255, 0), /* I2S Reference */ - SOC_ENUM("I2S Reference", rt1011_i2s_ref_enum), + SOC_ENUM_EXT("I2S Reference", rt1011_i2s_ref_enum, + rt1011_i2s_ref_get, rt1011_i2s_ref_put), }; static int rt1011_is_sys_clk_from_pll(struct snd_soc_dapm_widget *source, @@ -2017,6 +2059,7 @@ static int rt1011_probe(struct snd_soc_component *component) schedule_work(&rt1011->cali_work); + rt1011->i2s_ref = 0; rt1011->bq_drc_params = devm_kcalloc(component->dev, RT1011_ADVMODE_NUM, sizeof(struct rt1011_bq_drc_params *), GFP_KERNEL); diff --git a/sound/soc/codecs/rt1011.h b/sound/soc/codecs/rt1011.h index 68fadc15fa8c..4d6e7492d99c 100644 --- a/sound/soc/codecs/rt1011.h +++ b/sound/soc/codecs/rt1011.h @@ -654,6 +654,12 @@ enum { RT1011_AIFS }; +enum { + RT1011_I2S_REF_NONE, + RT1011_I2S_REF_LEFT_CH, + RT1011_I2S_REF_RIGHT_CH, +}; + /* BiQual & DRC related settings */ #define RT1011_BQ_DRC_NUM 128 struct rt1011_bq_drc_params { @@ -692,6 +698,7 @@ struct rt1011_priv { unsigned int r0_reg, cali_done; unsigned int r0_calib, temperature_calib; int recv_spk_mode; + int i2s_ref; }; #endif /* end of _RT1011_H_ */ -- 2.33.0

3 5

ALC1220 Broken Front Panel
by GitHub issues - opened 01 Dec '21

01 Dec '21

alsa-project/alsa-ucm-conf issue #123 was opened from vs49688: Since upgrading from v1.2.4 -> v1.2.5.1, I can no longer get any input/output from my front-panel. I've bisected the issue to 5947daef124c84fae511233248196576dfbfab7c. Reverting fixes it, but this may break other cards. The hardware is an "AX370-Gaming K7", with a ALC1220 chip. ##### alsa-info Before revert [alsainfo_before.txt](https://github.com/alsa-project/alsa-ucm-conf/files/76… ##### alsa-info After revert [alsainfo_after.txt](https://github.com/alsa-project/alsa-ucm-conf/files/763… ##### Relevant dmesg output: ``` [ 11.455796] snd_hda_intel 0000:0b:00.3: enabling device (0000 -> 0002) [ 11.532977] snd_hda_codec_realtek hdaudioC1D0: autoconfig for ALC1220: line_outs=3 (0x14/0x15/0x16/0x0/0x0) type:line [ 11.532980] snd_hda_codec_realtek hdaudioC1D0: speaker_outs=0 (0x0/0x0/0x0/0x0/0x0) [ 11.532981] snd_hda_codec_realtek hdaudioC1D0: hp_outs=0 (0x0/0x0/0x0/0x0/0x0) [ 11.532982] snd_hda_codec_realtek hdaudioC1D0: mono: mono_out=0x0 [ 11.532983] snd_hda_codec_realtek hdaudioC1D0: dig-out=0x1e/0x0 [ 11.532984] snd_hda_codec_realtek hdaudioC1D0: inputs: [ 11.532985] snd_hda_codec_realtek hdaudioC1D0: Rear Mic=0x18 [ 11.532986] snd_hda_codec_realtek hdaudioC1D0: Line=0x1a [ 11.543432] snd_hda_codec_realtek hdaudioC1D1: autoconfig for ALC1220: line_outs=1 (0x14/0x0/0x0/0x0/0x0) type:hp [ 11.543434] snd_hda_codec_realtek hdaudioC1D1: speaker_outs=0 (0x0/0x0/0x0/0x0/0x0) [ 11.543435] snd_hda_codec_realtek hdaudioC1D1: hp_outs=0 (0x0/0x0/0x0/0x0/0x0) [ 11.543436] snd_hda_codec_realtek hdaudioC1D1: mono: mono_out=0x0 [ 11.543436] snd_hda_codec_realtek hdaudioC1D1: inputs: [ 11.543437] snd_hda_codec_realtek hdaudioC1D1: Front Mic=0x1a [ 11.548516] input: HD-Audio Generic Rear Mic as /devices/pci0000:00/0000:00:08.1/0000:0b:00.3/sound/card1/input19 [ 11.548554] input: HD-Audio Generic Line as /devices/pci0000:00/0000:00:08.1/0000:0b:00.3/sound/card1/input20 [ 11.548583] input: HD-Audio Generic Line Out Front as /devices/pci0000:00/0000:00:08.1/0000:0b:00.3/sound/card1/input21 [ 11.548613] input: HD-Audio Generic Line Out Surround as /devices/pci0000:00/0000:00:08.1/0000:0b:00.3/sound/card1/input22 [ 11.548641] input: HD-Audio Generic Line Out CLFE as /devices/pci0000:00/0000:00:08.1/0000:0b:00.3/sound/card1/input23 [ 11.548669] input: HD-Audio Generic Front Mic as /devices/pci0000:00/0000:00:08.1/0000:0b:00.3/sound/card1/input24 [ 11.548695] input: HD-Audio Generic Front Headphone as /devices/pci0000:00/0000:00:08.1/0000:0b:00.3/sound/card1/input25 ``` ##### pavucontrol Before revert (doesn't work): ![ssbad](https://user-images.githubusercontent.com/4423262/144226384-0d338bef-9cda-439c-9bba-cc0cb63551eb.png) ##### pavucontrol After revert (works): Appears the same as it did on v1.2.4: ![ssgood](https://user-images.githubusercontent.com/4423262/144226410-14e3cd07-b179-4ce3-a224-17e7a35ae1dd.png) Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/123 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH 00/21] ASoC: SOF: Platform updates for AMD and Mediatek
by Daniel Baluta 01 Dec '21

01 Dec '21

From: Daniel Baluta <daniel.baluta(a)nxp.com> This patchseries adds Renoir ACP HW support and Mediatek MT8195 platform. Notes: - I first send the meditatek support in a previous emails but it failed to apply because there are some dependencies on AMD patches related to DAI ids. Ajit Kumar Pandey (12): ASoC: SOF: amd: Add Renoir ACP HW support ASoC: SOF: amd: Add helper callbacks for ACP's DMA configuration ASoC: SOF: amd: Add fw loader and renoir dsp ops to load firmware ASoC: SOF: amd: Add IPC support for ACP IP block ASoC: SOF: amd: Add dai driver dsp ops callback for Renoir ASoC: SOF: amd: Add PCM stream callback for Renoir dai's ASoC: amd: Add module to determine ACP configuration ASoC: SOF: amd: Add machine driver dsp ops for Renoir platform ASoC: SOF: amd: Add Renoir PCI driver interface ASoC: amd: acp-config: Remove legacy acpi based machine struct ASoC: SOF: topology: Add support for AMD ACP DAIs ASoC: SOF: amd: Add support for SOF firmware authentication V sujith kumar Reddy (1): ASoC: SOF: amd: Add trace logger support YC Hung (8): ASoC: SOF: mediatek: Add mt8195 hardware support ASoC: SOF: tokens: add token for Mediatek AFE ASoC: SOF: topology: Add support for Mediatek AFE DAI ASoC: SOF: mediatek: Add fw loader and mt8195 dsp ops to load firmware ASoC: SOF: Add mt8195 device descriptor ASoC: SOF: mediatek: Add dai driver dsp ops callback for mt8195 ASoC: SOF: mediatek: Add mt8195 dsp clock support ASoC: SOF: mediatek: Add DSP system PM callback for mt8195 include/sound/sof/dai-amd.h | 21 + include/sound/sof/dai-mediatek.h | 23 + include/sound/sof/dai.h | 10 + include/uapi/sound/sof/tokens.h | 5 + sound/soc/amd/Kconfig | 6 + sound/soc/amd/Makefile | 2 + sound/soc/amd/acp-config.c | 71 +++ sound/soc/amd/mach-config.h | 28 ++ sound/soc/sof/Kconfig | 4 +- sound/soc/sof/Makefile | 2 + sound/soc/sof/amd/Kconfig | 33 ++ sound/soc/sof/amd/Makefile | 11 + sound/soc/sof/amd/acp-dsp-offset.h | 78 +++ sound/soc/sof/amd/acp-ipc.c | 187 ++++++++ sound/soc/sof/amd/acp-loader.c | 199 ++++++++ sound/soc/sof/amd/acp-pcm.c | 82 ++++ sound/soc/sof/amd/acp-stream.c | 181 +++++++ sound/soc/sof/amd/acp-trace.c | 84 ++++ sound/soc/sof/amd/acp.c | 446 ++++++++++++++++++ sound/soc/sof/amd/acp.h | 226 +++++++++ sound/soc/sof/amd/pci-rn.c | 165 +++++++ sound/soc/sof/amd/renoir.c | 185 ++++++++ sound/soc/sof/mediatek/Kconfig | 33 ++ sound/soc/sof/mediatek/Makefile | 2 + sound/soc/sof/mediatek/adsp_helper.h | 49 ++ sound/soc/sof/mediatek/mediatek-ops.h | 8 + sound/soc/sof/mediatek/mt8195/Makefile | 3 + sound/soc/sof/mediatek/mt8195/mt8195-clk.c | 158 +++++++ sound/soc/sof/mediatek/mt8195/mt8195-clk.h | 28 ++ sound/soc/sof/mediatek/mt8195/mt8195-loader.c | 56 +++ sound/soc/sof/mediatek/mt8195/mt8195.c | 437 +++++++++++++++++ sound/soc/sof/mediatek/mt8195/mt8195.h | 158 +++++++ sound/soc/sof/pcm.c | 48 ++ sound/soc/sof/sof-of-dev.c | 13 + sound/soc/sof/topology.c | 168 +++++++ 35 files changed, 3209 insertions(+), 1 deletion(-) create mode 100644 include/sound/sof/dai-amd.h create mode 100644 include/sound/sof/dai-mediatek.h create mode 100644 sound/soc/amd/acp-config.c create mode 100644 sound/soc/amd/mach-config.h create mode 100644 sound/soc/sof/amd/Kconfig create mode 100644 sound/soc/sof/amd/Makefile create mode 100644 sound/soc/sof/amd/acp-dsp-offset.h create mode 100644 sound/soc/sof/amd/acp-ipc.c create mode 100644 sound/soc/sof/amd/acp-loader.c create mode 100644 sound/soc/sof/amd/acp-pcm.c create mode 100644 sound/soc/sof/amd/acp-stream.c create mode 100644 sound/soc/sof/amd/acp-trace.c create mode 100644 sound/soc/sof/amd/acp.c create mode 100644 sound/soc/sof/amd/acp.h create mode 100644 sound/soc/sof/amd/pci-rn.c create mode 100644 sound/soc/sof/amd/renoir.c create mode 100644 sound/soc/sof/mediatek/Kconfig create mode 100644 sound/soc/sof/mediatek/Makefile create mode 100644 sound/soc/sof/mediatek/adsp_helper.h create mode 100644 sound/soc/sof/mediatek/mediatek-ops.h create mode 100644 sound/soc/sof/mediatek/mt8195/Makefile create mode 100644 sound/soc/sof/mediatek/mt8195/mt8195-clk.c create mode 100644 sound/soc/sof/mediatek/mt8195/mt8195-clk.h create mode 100644 sound/soc/sof/mediatek/mt8195/mt8195-loader.c create mode 100644 sound/soc/sof/mediatek/mt8195/mt8195.c create mode 100644 sound/soc/sof/mediatek/mt8195/mt8195.h -- 2.27.0

7 32

[PATCH -next] ALSA: oss: fix compile error when OSS_DEBUG is enabled
by Bixuan Cui 01 Dec '21

01 Dec '21

Fix compile error when OSS_DEBUG is enabled: sound/core/oss/pcm_oss.c: In function 'snd_pcm_oss_set_trigger': sound/core/oss/pcm_oss.c:2055:10: error: 'substream' undeclared (first use in this function); did you mean 'csubstream'? pcm_dbg(substream->pcm, "pcm_oss: trigger = 0x%x\n", trigger); ^ Fixes: 61efcee8608c ("ALSA: oss: Use standard printk helpers") Signed-off-by: Bixuan Cui <cuibixuan(a)linux.alibaba.com> --- sound/core/oss/pcm_oss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c index 82a8187..bb37665 100644 --- a/sound/core/oss/pcm_oss.c +++ b/sound/core/oss/pcm_oss.c @@ -2052,7 +2052,7 @@ static int snd_pcm_oss_set_trigger(struct snd_pcm_oss_file *pcm_oss_file, int tr int err, cmd; #ifdef OSS_DEBUG - pcm_dbg(substream->pcm, "pcm_oss: trigger = 0x%x\n", trigger); + pr_debug("pcm_oss: trigger = 0x%x\n", trigger); #endif psubstream = pcm_oss_file->streams[SNDRV_PCM_STREAM_PLAYBACK]; -- 1.8.3.1

2 1

[PATCH -next] ALSA: Fix oversized kvmalloc() calls
by Bixuan Cui 01 Dec '21

01 Dec '21

The commit 7661809d493b ("mm: don't allow oversized kvmalloc() calls") limits the max allocatable memory via kvzalloc() to MAX_INT. Reported-by: syzbot+bb348e9f9a954d42746f(a)syzkaller.appspotmail.com Signed-off-by: Bixuan Cui <cuibixuan(a)linux.alibaba.com> --- sound/core/oss/pcm_plugin.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/core/oss/pcm_plugin.c b/sound/core/oss/pcm_plugin.c index 061ba06..61fccb5 100644 --- a/sound/core/oss/pcm_plugin.c +++ b/sound/core/oss/pcm_plugin.c @@ -68,6 +68,10 @@ static int snd_pcm_plugin_alloc(struct snd_pcm_plugin *plugin, snd_pcm_uframes_t size /= 8; if (plugin->buf_frames < frames) { kvfree(plugin->buf); + + if (size > INT_MAX) + return -ENOMEM; + plugin->buf = kvzalloc(size, GFP_KERNEL); plugin->buf_frames = frames; } -- 1.8.3.1

2 5

[PATCH 0/3] ALSA: pcm: oss: various fixes
by Takashi Iwai 01 Dec '21

01 Dec '21

Hi, here is a patch set to cover several corner-cases that are found in PCM OSS layer. Mostly for addressing the missing error handlings, but also limit the period size to a reasonable value. Takashi === Takashi Iwai (3): ALSA: pcm: oss: Fix negative period/buffer sizes ALSA: pcm: oss: Limit the period size to 16MB ALSA: pcm: oss: Handle missing errors in snd_pcm_oss_change_params*() sound/core/oss/pcm_oss.c | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) -- 2.31.1

1 3