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

[PATCH] soundwire: intel: Initialize clock stop timeout
by Bard Liao 11 Nov '22

11 Nov '22

From: Sjoerd Simons <sjoerd(a)collabora.com> The bus->clk_stop_timeout member is only initialized to a non-zero value during the codec driver probe. This can lead to corner cases where this value remains pegged at zero when the bus suspends, which results in an endless loop in sdw_bus_wait_for_clk_prep_deprep(). Corner cases include configurations with no codecs described in the firmware, or delays in probing codec drivers. Initializing the default timeout to the smallest non-zero value avoid this problem and allows for the existing logic to be preserved: the bus->clk_stop_timeout is set as the maximum required by all codecs connected on the bus. Fixes: 1f2dcf3a154ac ("soundwire: intel: set dev_num_ida_min") Signed-off-by: Sjoerd Simons <sjoerd(a)collabora.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Chao Song <chao.song(a)intel.com> Signed-off-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> --- drivers/soundwire/intel.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c index 25ec9c272239..78d35bb4852c 100644 --- a/drivers/soundwire/intel.c +++ b/drivers/soundwire/intel.c @@ -1311,6 +1311,7 @@ static int intel_link_probe(struct auxiliary_device *auxdev, bus->link_id = auxdev->id; bus->dev_num_ida_min = INTEL_DEV_NUM_IDA_MIN; + bus->clk_stop_timeout = 1; sdw_cdns_probe(cdns); -- 2.25.1

3 4

[PATCH] ASoC: tegra: Fix spelling mistake "fliter" -> "filter"
by Colin Ian King 10 Nov '22

10 Nov '22

There is a spelling mistake in struct member fliter_structure. Fix it. Signed-off-by: Colin Ian King <colin.i.king(a)gmail.com> --- sound/soc/tegra/tegra210_mbdrc.c | 4 ++-- sound/soc/tegra/tegra210_mbdrc.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/tegra/tegra210_mbdrc.c b/sound/soc/tegra/tegra210_mbdrc.c index d786daa6aba6..eeacb1220268 100644 --- a/sound/soc/tegra/tegra210_mbdrc.c +++ b/sound/soc/tegra/tegra210_mbdrc.c @@ -54,7 +54,7 @@ static const struct tegra210_mbdrc_config mbdrc_init_config = { .mode = 0, /* Bypass */ .rms_off = 48, .peak_rms_mode = 1, /* PEAK */ - .fliter_structure = 0, /* All-pass tree */ + .filter_structure = 0, /* All-pass tree */ .shift_ctrl = 30, .frame_size = 32, .channel_mask = 0x3, @@ -819,7 +819,7 @@ int tegra210_mbdrc_component_init(struct snd_soc_component *cmpnt) regmap_update_bits(ope->mbdrc_regmap, TEGRA210_MBDRC_CFG, TEGRA210_MBDRC_CFG_FILTER_STRUCTURE_MASK, - conf->fliter_structure << + conf->filter_structure << TEGRA210_MBDRC_CFG_FILTER_STRUCTURE_SHIFT); regmap_update_bits(ope->mbdrc_regmap, TEGRA210_MBDRC_CFG, diff --git a/sound/soc/tegra/tegra210_mbdrc.h b/sound/soc/tegra/tegra210_mbdrc.h index 4c48da0e1dea..76e443a7934e 100644 --- a/sound/soc/tegra/tegra210_mbdrc.h +++ b/sound/soc/tegra/tegra210_mbdrc.h @@ -199,7 +199,7 @@ struct tegra210_mbdrc_config { unsigned int mode; unsigned int rms_off; unsigned int peak_rms_mode; - unsigned int fliter_structure; + unsigned int filter_structure; unsigned int shift_ctrl; unsigned int frame_size; unsigned int channel_mask; -- 2.38.1

3 2

[PATCH] ASoC: sgtl5000: Reset the CHIP_CLK_CTRL reg on remove
by Detlev Casanova 10 Nov '22

10 Nov '22

Since commit bf2aebccddef ("ASoC: sgtl5000: Fix noise on shutdown/remove"), the device power control registers are reset when the driver is removed/shutdown. This is an issue when the device is configured to use the PLL clock. The device will stop responding if it is still configured to use the PLL clock but the PLL clock is powered down. When rebooting linux, the probe function will show: sgtl5000 0-000a: Error reading chip id -11 Make sure that the CHIP_CLK_CTRL is reset to its default value before powering down the device. Fixes: bf2aebccddef ("ASoC: sgtl5000: Fix noise on shutdown/remove") Signed-off-by: Detlev Casanova <detlev.casanova(a)collabora.com> --- sound/soc/codecs/sgtl5000.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index 4b2135eba74d..a916f4619ea3 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -1794,6 +1794,7 @@ static void sgtl5000_i2c_remove(struct i2c_client *client) { struct sgtl5000_priv *sgtl5000 = i2c_get_clientdata(client); + regmap_write(sgtl5000->regmap, SGTL5000_CHIP_CLK_CTRL, SGTL5000_CHIP_CLK_CTRL_DEFAULT); regmap_write(sgtl5000->regmap, SGTL5000_CHIP_DIG_POWER, SGTL5000_DIG_POWER_DEFAULT); regmap_write(sgtl5000->regmap, SGTL5000_CHIP_ANA_POWER, SGTL5000_ANA_POWER_DEFAULT); -- 2.38.1

3 2

[PATCH] ASoC: stm32: i2s: remove irqf_oneshot flag
by Olivier Moysan 10 Nov '22

10 Nov '22

The IRQF_ONESHOT flag allows to ensure that the interrupt is not unmasked after the hard interrupt context handler has been executed and the thread has been woken. The interrupt line is unmasked after the thread handler function has been executed. The STM32 I2S driver does not implement a threaded IRQ handler. So, the IRQF_ONESHOT flag is not useful in I2S driver. Remove this flag to allow the interrupt routine to be managed as a thread in RT mode. Signed-off-by: Olivier Moysan <olivier.moysan(a)foss.st.com> --- sound/soc/stm/stm32_i2s.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/stm/stm32_i2s.c b/sound/soc/stm/stm32_i2s.c index ce7f6942308f..f3dd9f8e621c 100644 --- a/sound/soc/stm/stm32_i2s.c +++ b/sound/soc/stm/stm32_i2s.c @@ -1077,7 +1077,7 @@ static int stm32_i2s_parse_dt(struct platform_device *pdev, if (irq < 0) return irq; - ret = devm_request_irq(&pdev->dev, irq, stm32_i2s_isr, IRQF_ONESHOT, + ret = devm_request_irq(&pdev->dev, irq, stm32_i2s_isr, 0, dev_name(&pdev->dev), i2s); if (ret) { dev_err(&pdev->dev, "irq request returned %d\n", ret); -- 2.25.1

2 1

[PATCH] ASoC: hdac_hda: fix hda pcm buffer overflow issue
by Junxiao Chang 10 Nov '22

10 Nov '22

When KASAN is enabled, below log might be dumped with Intel EHL hardware: [ 48.583597] ================================================================== [ 48.585921] BUG: KASAN: slab-out-of-bounds in hdac_hda_dai_hw_params+0x20a/0x22b [snd_soc_hdac_hda] [ 48.587995] Write of size 4 at addr ffff888103489708 by task pulseaudio/759 [ 48.589237] CPU: 2 PID: 759 Comm: pulseaudio Tainted: G U E 5.15.71-intel-ese-standard-lts #9 [ 48.591272] Hardware name: Intel Corporation Elkhart Lake Embedded Platform/ElkhartLake LPDDR4x T3 CRB, BIOS EHLSFWI1.R00.4251.A01.2206130432 06/13/2022 [ 48.593010] Call Trace: [ 48.593648] <TASK> [ 48.593852] dump_stack_lvl+0x34/0x48 [ 48.594404] print_address_description.constprop.0+0x1f/0x140 [ 48.595174] ? hdac_hda_dai_hw_params+0x20a/0x22b [snd_soc_hdac_hda] [ 48.595868] ? hdac_hda_dai_hw_params+0x20a/0x22b [snd_soc_hdac_hda] [ 48.596519] kasan_report.cold+0x7f/0x11b [ 48.597003] ? hdac_hda_dai_hw_params+0x20a/0x22b [snd_soc_hdac_hda] [ 48.597885] hdac_hda_dai_hw_params+0x20a/0x22b [snd_soc_hdac_hda] HDAC_LAST_DAI_ID is last index id, pcm buffer array size should be +1 to avoid out of bound access. Fixes: 608b8c36c371 ("ASoC: hdac_hda: add support for HDMI/DP as a HDA codec") Reviewed-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Signed-off-by: Junxiao Chang <junxiao.chang(a)intel.com> Signed-off-by: Furong Zhou <furong.zhou(a)intel.com> --- sound/soc/codecs/hdac_hda.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/hdac_hda.h b/sound/soc/codecs/hdac_hda.h index fc19c34ca00e5..b65560981abb2 100644 --- a/sound/soc/codecs/hdac_hda.h +++ b/sound/soc/codecs/hdac_hda.h @@ -14,7 +14,7 @@ enum { HDAC_HDMI_1_DAI_ID, HDAC_HDMI_2_DAI_ID, HDAC_HDMI_3_DAI_ID, - HDAC_LAST_DAI_ID = HDAC_HDMI_3_DAI_ID, + HDAC_DAI_ID_NUM }; struct hdac_hda_pcm { @@ -24,7 +24,7 @@ struct hdac_hda_pcm { struct hdac_hda_priv { struct hda_codec *codec; - struct hdac_hda_pcm pcm[HDAC_LAST_DAI_ID]; + struct hdac_hda_pcm pcm[HDAC_DAI_ID_NUM]; bool need_display_power; }; -- 2.25.1

2 1

[PATCH v2] ASoC: wm8962: Wait for updated value of WM8962_CLOCKING1 register
by Chancel Liu 10 Nov '22

10 Nov '22

DSPCLK_DIV field in WM8962_CLOCKING1 register is used to generate correct frequency of LRCLK and BCLK. Sometimes the read-only value can't be updated timely after enabling SYSCLK. This results in wrong calculation values. Delay is introduced here to wait for newest value from register. The time of the delay should be at least 500~1000us according to test. Signed-off-by: Chancel Liu <chancel.liu(a)nxp.com> --- sound/soc/codecs/wm8962.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index b4b4355c6728..b901e4c65e8a 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -2503,6 +2503,14 @@ static void wm8962_configure_bclk(struct snd_soc_component *component) snd_soc_component_update_bits(component, WM8962_CLOCKING2, WM8962_SYSCLK_ENA_MASK, WM8962_SYSCLK_ENA); + /* DSPCLK_DIV field in WM8962_CLOCKING1 register is used to generate + * correct frequency of LRCLK and BCLK. Sometimes the read-only value + * can't be updated timely after enabling SYSCLK. This results in wrong + * calculation values. Delay is introduced here to wait for newest + * value from register. The time of the delay should be at least + * 500~1000us according to test. + */ + usleep_range(500, 1000); dspclk = snd_soc_component_read(component, WM8962_CLOCKING1); if (snd_soc_component_get_bias_level(component) != SND_SOC_BIAS_ON) -- 2.25.1

3 2

[PATCH 0/9] ASoC: mediatek: Register machine drivers to module device table
by Nícolas F. R. A. Prado 10 Nov '22

10 Nov '22

Some ASoC machine drivers for MediaTek platforms were not being registered to the module device table, preventing them to be automatically loaded when built as modules. This series adds the missing registration to the drivers. Nícolas F. R. A. Prado (9): ASoC: mediatek: mt2701-cs42448: Register to module device table ASoC: mediatek: mt2701-wm8960: Register to module device table ASoC: mediatek: mt6797-mt6351: Register to module device table ASoC: mediatek: mt8183-da7219: Register to module device table ASoC: mediatek: mt8183-mt6358: Register to module device table ASoC: mediatek: mt8186-da7219: Register to module device table ASoC: mediatek: mt8186-rt5682: Register to module device table ASoC: mediatek: mt8192-mt6359: Register to module device table ASoC: mediatek: mt8195-mt6359: Register to module device table sound/soc/mediatek/mt2701/mt2701-cs42448.c | 1 + sound/soc/mediatek/mt2701/mt2701-wm8960.c | 1 + sound/soc/mediatek/mt6797/mt6797-mt6351.c | 1 + sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 1 + sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c | 1 + sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c | 1 + sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c | 1 + sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 1 + sound/soc/mediatek/mt8195/mt8195-mt6359.c | 1 + 9 files changed, 9 insertions(+) -- 2.38.1

4 21

[PATCH 0/3] ASoC: SOF: get pipeline instance id from pipe_widget->instance_id
by Bard Liao 10 Nov '22

10 Nov '22

Currently we set pipeline instance id = swidget->pipeline_id, but pipeline_id is from topology and can be any number. In fact, the number of pipelines is limited. This patch use ida to allocate pipeline instance id and will be used for pipeline instance id in the IPC message. Bard Liao (3): ASoC: SOF: ipc4-topology: rename sof_ipc4_widget_free_comp ASoC: SOF: ipc4-loader: get max pipeline number ASoC: SOF: ipc4: get pipeline instance id from pipe_widget->instance_id sound/soc/sof/intel/hda-dai.c | 12 ++++++------ sound/soc/sof/ipc4-loader.c | 11 +++++++++++ sound/soc/sof/ipc4-pcm.c | 4 ++-- sound/soc/sof/ipc4-priv.h | 2 ++ sound/soc/sof/ipc4-topology.c | 30 ++++++++++++++++++++++++------ 5 files changed, 45 insertions(+), 14 deletions(-) -- 2.25.1

2 4

[PATCH 0/3] ASoC: SOF: Intel: update D0i3 registers for MTL
by Pierre-Louis Bossart 10 Nov '22

10 Nov '22

MeteorLake relies on a different register for D0i3 configuration, add a platform-specific callback to abstract the differences. Rander Wang (3): ASoC: SOF: Intel: add d0i3 definition for MTL ASoC: SOF: Intel: add d0i3_offset in chip_info ASoC: SOF: Intel: set d0i3 register with d0i3_offset sound/soc/sof/intel/apl.c | 1 + sound/soc/sof/intel/cnl.c | 2 ++ sound/soc/sof/intel/hda-dsp.c | 21 ++++++++++++++------- sound/soc/sof/intel/icl.c | 1 + sound/soc/sof/intel/mtl.c | 1 + sound/soc/sof/intel/mtl.h | 2 ++ sound/soc/sof/intel/shim.h | 1 + sound/soc/sof/intel/tgl.c | 4 ++++ 8 files changed, 26 insertions(+), 7 deletions(-) -- 2.34.1

2 4

[PATCH 0/3] ASoC: SOF: ipc4-topology: Add widget queue support
by Peter Ujfalusi 10 Nov '22

10 Nov '22

Hi, with SOF topology2 for IPC4, widgets might have mutliple queues they can be connected. The queues to use between components are descibed in the topology file. This series adds widget queue support (specify which pin to connect) for ipc4-topology with topology2. Note: currently queue 0 of a widget is used as hardwired default. Regards, Peter --- Chao Song (3): ASoC: SOF: Add support for parsing the number of sink/source pins ASoC: SOF: Add support to parse pin binding array from topology ASoC: SOF: topology: Add helper to get/put widget queue id include/uapi/sound/sof/tokens.h | 9 ++ sound/soc/sof/ipc4-topology.c | 133 +++++++++++++++++++++--- sound/soc/sof/sof-audio.h | 42 ++++++++ sound/soc/sof/topology.c | 177 ++++++++++++++++++++++++++++++-- 4 files changed, 340 insertions(+), 21 deletions(-) -- 2.38.1

2 4