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

[PATCH] ASoC: SOF: Intel: MTL: Reduce the DSP init timeout
by Peter Ujfalusi 16 Sep '23

16 Sep '23

From: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> 20s seems unnecessarily large for the DSP init timeout. This coupled with multiple FW boot attempts causes an excessive delay in the error path when booting in recovery mode. Reduce it to 0.5s and use the existing HDA_DSP_INIT_TIMEOUT_US. Link: https://github.com/thesofproject/linux/issues/4565 Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Reviewed-by: Péter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> --- sound/soc/sof/intel/mtl.c | 2 +- sound/soc/sof/intel/mtl.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/sof/intel/mtl.c b/sound/soc/sof/intel/mtl.c index b84ca58da9d5..f9412517eaf2 100644 --- a/sound/soc/sof/intel/mtl.c +++ b/sound/soc/sof/intel/mtl.c @@ -460,7 +460,7 @@ int mtl_dsp_cl_init(struct snd_sof_dev *sdev, int stream_tag, bool imr_boot) /* step 3: wait for IPC DONE bit from ROM */ ret = snd_sof_dsp_read_poll_timeout(sdev, HDA_DSP_BAR, chip->ipc_ack, status, ((status & chip->ipc_ack_mask) == chip->ipc_ack_mask), - HDA_DSP_REG_POLL_INTERVAL_US, MTL_DSP_PURGE_TIMEOUT_US); + HDA_DSP_REG_POLL_INTERVAL_US, HDA_DSP_INIT_TIMEOUT_US); if (ret < 0) { if (hda->boot_iteration == HDA_FW_BOOT_ATTEMPTS) dev_err(sdev->dev, "timeout waiting for purge IPC done\n"); diff --git a/sound/soc/sof/intel/mtl.h b/sound/soc/sof/intel/mtl.h index 02181490f12a..95696b3d7c4c 100644 --- a/sound/soc/sof/intel/mtl.h +++ b/sound/soc/sof/intel/mtl.h @@ -62,7 +62,6 @@ #define MTL_DSP_IRQSTS_IPC BIT(0) #define MTL_DSP_IRQSTS_SDW BIT(6) -#define MTL_DSP_PURGE_TIMEOUT_US 20000000 /* 20s */ #define MTL_DSP_REG_POLL_INTERVAL_US 10 /* 10 us */ /* Memory windows */ -- 2.42.0

2 1

[PATCH 00/19] ASoC: Intel: machine driver update
by Bard Liao 16 Sep '23

16 Sep '23

Some cleanups from Brent Lu for I2S platforms. And minor additions for RVPs and Chromebooks. Balamurugan C (1): ASoC: Intel: sof_rt5682: add HDMI_In capture feature support for RPL. Brent Lu (16): ASoC: Intel: sof_rt5682: cleanup unnecessary quirk flag ASoC: Intel: ssp-common: support codec detection ASoC: Intel: use ACPI HID definition in ssp-common ASoC: Intel: sof_rt5682: use ssp-common module to detect codec ASoC: Intel: sof_cs42l42: use ssp-common module to detect codec ASoC: Intel: sof_ssp_amp: use ssp-common module to detect codec ASoC: Intel: sof_nau8825: use ssp-common module to detect codec ASoC: Intel: sof_rt5682: add adl_rt5650 board config ASoC: Intel: sof_ssp_amp: do not create amp link for nocodec board ASoC: Intel: nuvoton-common: support nau8318 amplifier ASoC: Intel: sof_nau8825: use nuvoton-common module ASoC: Intel: sof_nau8825: use realtek-common module ASoC: Intel: sof_da7219: rename driver file and kernel option ASoC: Intel: sof_da7219: use maxim-common module ASoC: Intel: sof_da7219: add adl_mx98360_da7219 board config ASoC: Intel: sof_da7219: use ssp-common module to detect codec Uday M Bhat (2): ASoC: Intel: sof_rt5682: Add support for Rex with discrete BT offload. ASoC: Intel: sof_rt5682: Modify number of HDMI to 3 for MTL/Rex devices sound/soc/intel/boards/Kconfig | 24 +- sound/soc/intel/boards/Makefile | 10 +- sound/soc/intel/boards/sof_cirrus_common.h | 9 +- sound/soc/intel/boards/sof_cs42l42.c | 55 +- .../{sof_da7219_max98373.c => sof_da7219.c} | 361 ++++++++----- sound/soc/intel/boards/sof_maxim_common.h | 13 +- sound/soc/intel/boards/sof_nau8825.c | 168 +++---- sound/soc/intel/boards/sof_nuvoton_common.c | 73 +++ sound/soc/intel/boards/sof_nuvoton_common.h | 22 + sound/soc/intel/boards/sof_realtek_common.h | 37 +- sound/soc/intel/boards/sof_rt5682.c | 473 ++++++++++-------- sound/soc/intel/boards/sof_ssp_amp.c | 114 +++-- sound/soc/intel/boards/sof_ssp_common.c | 101 ++++ sound/soc/intel/boards/sof_ssp_common.h | 71 +++ .../intel/common/soc-acpi-intel-adl-match.c | 19 + .../intel/common/soc-acpi-intel-jsl-match.c | 12 +- .../intel/common/soc-acpi-intel-rpl-match.c | 7 + 17 files changed, 1008 insertions(+), 561 deletions(-) rename sound/soc/intel/boards/{sof_da7219_max98373.c => sof_da7219.c} (56%) create mode 100644 sound/soc/intel/boards/sof_nuvoton_common.c create mode 100644 sound/soc/intel/boards/sof_nuvoton_common.h create mode 100644 sound/soc/intel/boards/sof_ssp_common.c create mode 100644 sound/soc/intel/boards/sof_ssp_common.h -- 2.25.1

2 20

[PATCH] ASoC: SOF: core: Only call sof_ops_free() on remove if the probe was successful
by Peter Ujfalusi 16 Sep '23

16 Sep '23

All the fail paths during probe will free up the ops, on remove we should only free it if the probe was successful. Fixes: bc433fd76fae ("ASoC: SOF: Add ops_free") Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Reviewed-by: Rander Wang <rander.wang(a)intel.com> --- sound/soc/sof/core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c index 30db685cc5f4..2d1616b81485 100644 --- a/sound/soc/sof/core.c +++ b/sound/soc/sof/core.c @@ -486,10 +486,9 @@ int snd_sof_device_remove(struct device *dev) snd_sof_ipc_free(sdev); snd_sof_free_debug(sdev); snd_sof_remove(sdev); + sof_ops_free(sdev); } - sof_ops_free(sdev); - /* release firmware */ snd_sof_fw_unload(sdev); -- 2.42.0

2 1

[PATCH 1/1] ASoC: Intel: common: add ACPI matching tables for Arrow Lake
by Bard Liao 16 Sep '23

16 Sep '23

From: Arun T <arun.t(a)intel.com> Initial support for ARL w/ RT711 Signed-off-by: Arun T <arun.t(a)intel.com> Reviewed-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Signed-off-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> --- include/sound/soc-acpi-intel-match.h | 2 + sound/soc/intel/common/Makefile | 1 + .../intel/common/soc-acpi-intel-arl-match.c | 51 +++++++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 sound/soc/intel/common/soc-acpi-intel-arl-match.c diff --git a/include/sound/soc-acpi-intel-match.h b/include/sound/soc-acpi-intel-match.h index e49b97d9e3ff..845e7608ac37 100644 --- a/include/sound/soc-acpi-intel-match.h +++ b/include/sound/soc-acpi-intel-match.h @@ -32,6 +32,7 @@ extern struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[]; extern struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[]; extern struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_machines[]; extern struct snd_soc_acpi_mach snd_soc_acpi_intel_lnl_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_machines[]; extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_sdw_machines[]; extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cfl_sdw_machines[]; @@ -42,6 +43,7 @@ extern struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_sdw_machines[]; extern struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_sdw_machines[]; extern struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[]; extern struct snd_soc_acpi_mach snd_soc_acpi_intel_lnl_sdw_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_sdw_machines[]; /* * generic table used for HDA codec-based platforms, possibly with diff --git a/sound/soc/intel/common/Makefile b/sound/soc/intel/common/Makefile index 07aa37dd90e9..f7370e5b4e9e 100644 --- a/sound/soc/intel/common/Makefile +++ b/sound/soc/intel/common/Makefile @@ -10,6 +10,7 @@ snd-soc-acpi-intel-match-objs := soc-acpi-intel-byt-match.o soc-acpi-intel-cht-m soc-acpi-intel-tgl-match.o soc-acpi-intel-ehl-match.o \ soc-acpi-intel-jsl-match.o soc-acpi-intel-adl-match.o \ soc-acpi-intel-rpl-match.o soc-acpi-intel-mtl-match.o \ + soc-acpi-intel-arl-match.o \ soc-acpi-intel-lnl-match.o \ soc-acpi-intel-hda-match.o \ soc-acpi-intel-sdw-mockup-match.o diff --git a/sound/soc/intel/common/soc-acpi-intel-arl-match.c b/sound/soc/intel/common/soc-acpi-intel-arl-match.c new file mode 100644 index 000000000000..e52797aae6e6 --- /dev/null +++ b/sound/soc/intel/common/soc-acpi-intel-arl-match.c @@ -0,0 +1,51 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * soc-apci-intel-arl-match.c - tables and support for ARL ACPI enumeration. + * + * Copyright (c) 2023 Intel Corporation. + */ + +#include <sound/soc-acpi.h> +#include <sound/soc-acpi-intel-match.h> + +static const struct snd_soc_acpi_endpoint single_endpoint = { + .num = 0, + .aggregated = 0, + .group_position = 0, + .group_id = 0, +}; + +static const struct snd_soc_acpi_adr_device rt711_0_adr[] = { + { + .adr = 0x000020025D071100ull, + .num_endpoints = 1, + .endpoints = &single_endpoint, + .name_prefix = "rt711" + } +}; + +static const struct snd_soc_acpi_link_adr arl_rvp[] = { + { + .mask = BIT(0), + .num_adr = ARRAY_SIZE(rt711_0_adr), + .adr_d = rt711_0_adr, + }, + {} +}; + +struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_machines[] = { + {}, +}; +EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_arl_machines); + +/* this table is used when there is no I2S codec present */ +struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_sdw_machines[] = { + { + .link_mask = 0x1, /* link0 required */ + .links = arl_rvp, + .drv_name = "sof_sdw", + .sof_tplg_filename = "sof-arl-rt711.tplg", + }, + {}, +}; +EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_arl_sdw_machines); -- 2.25.1

2 1

[PATCH 0/4] ASoC: intel: sof_sdw: Remove large global CPUs array
by Bard Liao 16 Sep '23

16 Sep '23

Rather than keeping a single array of CPU dai link components allocate a smaller one for each DAI link, this reduces the amount of state that needs to be passed back and forth in the driver. Charles Keepax (4): ASoC: intel: sof_sdw: Move sdw_pin_index into private struct ASoC: intel: sof_sdw: Add simple DAI link creation helper ASoC: intel: sof_sdw: Make create_sdw_dailink allocate link components ASoC: intel: sof_sdw: Increment be_id in init_dai_link sound/soc/intel/boards/sof_sdw.c | 244 ++++++++++-------------- sound/soc/intel/boards/sof_sdw_common.h | 4 + 2 files changed, 101 insertions(+), 147 deletions(-) -- 2.25.1

2 5

[PATCH 0/4] ASoC: SOF: ipc4/Intel: Implement split fw library loading
by Peter Ujfalusi 16 Sep '23

16 Sep '23

Hi, This series implements support for split library loading to comply with the HDA DMA programming sequence recommendation, which is: 1. DSP side DMA programming and GEN bit set to 1 2. host side DMA programming and RUN bit set to 1 The SOF support for library loading is based on this sequence, backwards compatibility with older reference firmware is supported (where only the LOAD_LIBRARY message is supported). Regards, Peter --- Peter Ujfalusi (4): ASoC: SOF: ipc4: Convert status code 2 and 15 to -EOPNOTSUPP ASoC: SOF: Intel: hda: Add definition for SDxFIFOS.FIFOS mask ASoC: SOF: ipc4: Add new message type: SOF_IPC4_GLB_LOAD_LIBRARY_PREPARE ASoC: SOF: Intel: hda-loader: Add support for split library loading include/sound/sof/ipc4/header.h | 15 +++++++++--- sound/soc/sof/intel/hda-loader.c | 42 ++++++++++++++++++++++++++++++-- sound/soc/sof/intel/hda-stream.c | 2 +- sound/soc/sof/intel/hda.h | 3 +++ sound/soc/sof/ipc4.c | 5 ++++ 5 files changed, 60 insertions(+), 7 deletions(-) -- 2.42.0

2 5

[PATCH 0/2] ASoC: SOF: ipc4: Fixup dailink format based on copier
by Peter Ujfalusi 16 Sep '23

16 Sep '23

Hi, If the copier supports a single format on the DAI side we should fixup the BE dailink to use this single format. Regards, Peter --- Bard Liao (2): ASoC: SOF: ipc4-topology: export sof_ipc4_copier_is_single_format ASoC: SOF: ipc4-pcm: fixup dailink based on copier format sound/soc/sof/ipc4-pcm.c | 55 ++++++++++++++++++++++++++++++----- sound/soc/sof/ipc4-topology.c | 8 ++--- sound/soc/sof/ipc4-topology.h | 3 ++ 3 files changed, 54 insertions(+), 12 deletions(-) -- 2.42.0

2 3

[PATCH] ASoC: rt1015: fix the first word being cut off
by shumingf＠realtek.com 16 Sep '23

16 Sep '23

From: Shuming Fan <shumingf(a)realtek.com> This patch adds a control that there are four options to control the digital volume output. The user could select "immediate" to make volume updates immediately. In default, the driver selects the volume update with "zero detection + soft inc/dec change". Signed-off-by: Shuming Fan <shumingf(a)realtek.com> --- sound/soc/codecs/rt1015.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sound/soc/codecs/rt1015.c b/sound/soc/codecs/rt1015.c index 99ec0f9a8362..1250cfaf2adc 100644 --- a/sound/soc/codecs/rt1015.c +++ b/sound/soc/codecs/rt1015.c @@ -546,6 +546,16 @@ static int rt1015_bypass_boost_put(struct snd_kcontrol *kcontrol, return 0; } +static const char * const rt1015_dac_output_vol_select[] = { + "immediate", + "zero detection + immediate change", + "zero detection + inc/dec change", + "zero detection + soft inc/dec change", +}; + +static SOC_ENUM_SINGLE_DECL(rt1015_dac_vol_ctl_enum, + RT1015_DAC3, 2, rt1015_dac_output_vol_select); + static const struct snd_kcontrol_new rt1015_snd_controls[] = { SOC_SINGLE_TLV("DAC Playback Volume", RT1015_DAC1, RT1015_DAC_VOL_SFT, 127, 0, dac_vol_tlv), @@ -556,6 +566,9 @@ static const struct snd_kcontrol_new rt1015_snd_controls[] = { SOC_ENUM("Mono LR Select", rt1015_mono_lr_sel), SOC_SINGLE_EXT("Bypass Boost", SND_SOC_NOPM, 0, 1, 0, rt1015_bypass_boost_get, rt1015_bypass_boost_put), + + /* DAC Output Volume Control */ + SOC_ENUM("DAC Output Control", rt1015_dac_vol_ctl_enum), }; static int rt1015_is_sys_clk_from_pll(struct snd_soc_dapm_widget *source, -- 2.34.1

2 1

[PATCH] ASoC: amd: ps: Fix -Wformat-truncation warning
by Takashi Iwai 16 Sep '23

16 Sep '23

The compile warning with -Wformat-truncation at sdw_amd_scan_controller() is false-positive; the max loop size is AMD_SDW_MAX_MANAGERS (= 2), hence it fits with the given size. For suppressing the warning, replace snprintf() with scnprintf(). As stated in the above, truncation doesn't matter. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/soc/amd/ps/pci-ps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/amd/ps/pci-ps.c b/sound/soc/amd/ps/pci-ps.c index 4af3c3665387..7e4c0ec9e56c 100644 --- a/sound/soc/amd/ps/pci-ps.c +++ b/sound/soc/amd/ps/pci-ps.c @@ -274,7 +274,7 @@ static int sdw_amd_scan_controller(struct device *dev) dev_dbg(dev, "ACPI reports %d SoundWire Manager devices\n", count); acp_data->sdw_manager_count = count; for (index = 0; index < count; index++) { - snprintf(name, sizeof(name), "mipi-sdw-link-%d-subproperties", index); + scnprintf(name, sizeof(name), "mipi-sdw-link-%d-subproperties", index); link = fwnode_get_named_child_node(acp_data->sdw_fw_node, name); if (!link) { dev_err(dev, "Manager node %s not found\n", name); -- 2.35.3

2 1

[PATCH 0/3] ASoC: cs35l56: Define and export I2C/SPI pm_ops only if needed
by Richard Fitzgerald 16 Sep '23

16 Sep '23

These 3 patches update the pm_ops for I2C/SPI so that they are only built and exported if they are needed. Richard Fitzgerald (3): ASoC: cs35l56: Use pm_ptr() ASoC: cs35l56: Use new export macro for dev_pm_ops ASoC: cs35l56: Omit cs35l56_pm_ops_i2c_spi if I2C/SPI not enabled sound/soc/codecs/cs35l56-i2c.c | 2 +- sound/soc/codecs/cs35l56-sdw.c | 2 +- sound/soc/codecs/cs35l56-spi.c | 2 +- sound/soc/codecs/cs35l56.c | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) -- 2.30.2

2 4