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

Re: [PATCH] ASoC: cs35l45: Relicense to GPL only
by James Schulman 15 May '23

15 May '23

On 10/05/2023 10:25, Charles Keepax wrote: > Cirrus never intended to upstream dual licensed code, convert to > GPL only. > > Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> > --- > > Apologies for this but this was never our intention and I believe that > it can be a little legally involved maintaining dual licensed kernel code. > Fortunately not that many people outside of Cirrus have contributed to > the files in question. I have CCed everyone who has contributed both > internally and externally. > > Thanks, > Charles > > sound/soc/codecs/cs35l45-i2c.c | 4 ++-- > sound/soc/codecs/cs35l45-spi.c | 4 ++-- > sound/soc/codecs/cs35l45-tables.c | 2 +- > sound/soc/codecs/cs35l45.c | 4 ++-- > sound/soc/codecs/cs35l45.h | 2 +- > 5 files changed, 8 insertions(+), 8 deletions(-) > Reviewed-by: James Schulman <james.schulman(a)cirrus.com>

1 0

[PATCH 0/9] ASoC: SOF: ipc4-topology: Improve the audio format selection logic
by Peter Ujfalusi 15 May '23

15 May '23

Hi, Improve the logic to account for the current restrictions in topology while making it extensible for future topology modifications. The current topology definitions assume that input/output formats come in pairs. For example even if there's only 1 output format for a module, we add 3 output formats to match that of the input format count with the same parameters. This is unnecessary but we have to deal with it until the topologies are modified. Additionally, choosing the input/output audio format should depend only on the pipeline params or the runtime FE hw_params depending on where the module is in the pipeline. This PR modifies the logic for selection based on this and removes unnecessary dependencies between the input and output formats. Regards, Peter --- Ranjani Sridharan (9): ASoC: SOF: ipc4-topology: Handle input/output audio format special case ASoC: SOF: ipc4-topology: Add a helper function for output format selection ASoC: SOF: ipc4-topology: Move the call to init output format ASoC: SOF: ipc4-topology: Rename sof_ipc4_init_audio_fmt() ASoC: SOF: ipc4-topology: Handle output format special case ASoC: SOF: ipc4-topology: Add a new helper function to get the valid bits ASoC: SOF: ipc4-topology: Modify the output format selection logic ASoC: SOF: ipc4-topology: New helper to check if all output formats are the same ASoC: SOF: ipc4-topology: Modify input audio format selection logic sound/soc/sof/ipc4-topology.c | 358 ++++++++++++++++++++++------------ 1 file changed, 237 insertions(+), 121 deletions(-) -- 2.40.1

2 10

[PATCH v4 0/9] ASoC: mediatek: mt8188: revise AFE driver
by Trevor Wu 15 May '23

15 May '23

The series of patches consists of four major changes. First, remove redundant supply for ADDA DAI dirver. Second, revise ETDM control including APLL dynamic switch via DAPM, so APLL can be enabled when it is really required. Third, update AFE probe function. Bus protection change was dropped at the previous patch because the dependent change was not accepted at that time. Finally, correct some binding errors and add required clocks. Changes since v3: - correct errors in binding file - add required clocks which are possibly used in the future Changes since v2: - remove required properties in dt-binding file Changes since v1: - replace unnecessary dev_info with dev_dbg - fix dt-binging ABI breaking behavior Trevor Wu (9): ASoC: mediatek: mt8188: remove supply AUDIO_HIRES ASoC: mediatek: mt8188: complete set_tdm_slot function ASoC: mediatek: mt8188: revise ETDM control flow ASoC: mediatek: mt8188: refine APLL control ASoC: mediatek: mt8188: combine afe component registration ASoC: mediatek: mt8188: add bus protection ASoC: mediatek: mt8188: add required clocks ASoC: dt-bindings: mediatek,mt8188-afe: correct clock name ASoC: dt-bindings: mediatek,mt8188-afe: add audio properties .../bindings/sound/mediatek,mt8188-afe.yaml | 66 +- sound/soc/mediatek/mt8188/mt8188-afe-clk.c | 142 ++- sound/soc/mediatek/mt8188/mt8188-afe-clk.h | 15 + sound/soc/mediatek/mt8188/mt8188-afe-pcm.c | 113 ++- sound/soc/mediatek/mt8188/mt8188-dai-adda.c | 37 - sound/soc/mediatek/mt8188/mt8188-dai-etdm.c | 922 ++++++++++-------- sound/soc/mediatek/mt8188/mt8188-reg.h | 2 + 7 files changed, 795 insertions(+), 502 deletions(-) -- 2.18.0

3 12

[PATCH 0/2] ASoC: SOF: Intel/ipc4: Do not reset BE DAI pipeline during stop/suspend
by Peter Ujfalusi 15 May '23

15 May '23

Hi, Do not reset pipelines during the stop/suspend triggers in the BE DAI ops as the BE DAI pipeline needs to be left in the PAUSED state. It should only be reset during hw_free. This simplification is already done for the FE pipelines and the DAI trigger only toggles the states between PAUSED and RUNNING. Regards Peter --- Ranjani Sridharan (2): ASoC: SOF: Intel: hda-dai-ops: Split the get_hext_stream() op for IPC4 ASoC: SOF: ipc4-pcm: reset all pipelines during FE DAI hw_free sound/soc/sof/intel/hda-dai-ops.c | 69 +++++++++++++++++++++++-------- sound/soc/sof/ipc4-pcm.c | 4 +- sound/soc/sof/ipc4-topology.c | 1 - 3 files changed, 53 insertions(+), 21 deletions(-) -- 2.40.1

2 3

[PATCH] ASoC: SOF: ipc4-topology: Use set_get_data() to send LARGE_CONFIG message
by Peter Ujfalusi 15 May '23

15 May '23

Instead of open coding the sending of sink format of the copier with LARGE_CONFIG_SET message, use the proper function to do so. 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> Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> --- sound/soc/sof/ipc4-topology.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/sound/soc/sof/ipc4-topology.c b/sound/soc/sof/ipc4-topology.c index 059eebf0a687..73a45437a3a1 100644 --- a/sound/soc/sof/ipc4-topology.c +++ b/sound/soc/sof/ipc4-topology.c @@ -2271,11 +2271,11 @@ static int sof_ipc4_set_copier_sink_format(struct snd_sof_dev *sdev, int sink_id) { struct sof_ipc4_copier_config_set_sink_format format; + const struct sof_ipc_ops *iops = sdev->ipc->ops; struct sof_ipc4_base_module_cfg *src_config; const struct sof_ipc4_audio_format *pin_fmt; struct sof_ipc4_fw_module *fw_module; struct sof_ipc4_msg msg = {{ 0 }}; - u32 header, extension; dev_dbg(sdev->dev, "%s set copier sink %d format\n", src_widget->widget->name, sink_id); @@ -2305,22 +2305,15 @@ static int sof_ipc4_set_copier_sink_format(struct snd_sof_dev *sdev, msg.data_size = sizeof(format); msg.data_ptr = &format; - header = fw_module->man4_module_entry.id; - header |= SOF_IPC4_MOD_INSTANCE(src_widget->instance_id); - header |= SOF_IPC4_MSG_TYPE_SET(SOF_IPC4_MOD_LARGE_CONFIG_SET); - header |= SOF_IPC4_MSG_DIR(SOF_IPC4_MSG_REQUEST); - header |= SOF_IPC4_MSG_TARGET(SOF_IPC4_MODULE_MSG); + msg.primary = fw_module->man4_module_entry.id; + msg.primary |= SOF_IPC4_MOD_INSTANCE(src_widget->instance_id); + msg.primary |= SOF_IPC4_MSG_DIR(SOF_IPC4_MSG_REQUEST); + msg.primary |= SOF_IPC4_MSG_TARGET(SOF_IPC4_MODULE_MSG); - extension = SOF_IPC4_MOD_EXT_MSG_SIZE(msg.data_size); - extension |= + msg.extension = SOF_IPC4_MOD_EXT_MSG_PARAM_ID(SOF_IPC4_COPIER_MODULE_CFG_PARAM_SET_SINK_FORMAT); - extension |= SOF_IPC4_MOD_EXT_MSG_LAST_BLOCK(1); - extension |= SOF_IPC4_MOD_EXT_MSG_FIRST_BLOCK(1); - - msg.primary = header; - msg.extension = extension; - return sof_ipc_tx_message_no_reply(sdev->ipc, &msg, msg.data_size); + return iops->set_get_data(sdev, &msg, msg.data_size, true); } static int sof_ipc4_route_setup(struct snd_sof_dev *sdev, struct snd_sof_route *sroute) -- 2.40.1

2 1

[PATCH 0/9] ASoC: SOF: Intel: hda-dai: prepare LNL support
by Pierre-Louis Bossart 15 May '23

15 May '23

The HDAudio support has not changed much since CometLake/2019: the code was reshuffled for IPC4 support and we used hdac_hda for external and Display Audio codec, but the hda-dai code was only used for HDAudio codecs. In the LunarLake architecture, all endpoints (HDaudio, SSP, DMIC, SoundWire) are handled with the HDaudio DMA, which requires us to revisit the definitions of HDA_LINK, and remove the mutual exclusion between NOCODEC and HDA_LINK: we do want the ability to test SSP/DMIC in NOCODEC mode even with an HDA DMA. This code change exposed a number of issues, with a useless .prepare callback, a DAI number mismatch and the need to support SoundWire which is handled by a different component in drivers/soundwire/intel_ace2.c. Pierre-Louis Bossart (9): ASoC: SOF: Intel: hda-dai: simplify .prepare callback ASoC: SOF: Intel: hda-dai: remove use of cpu_dai->component drvdata ASoC: SOF: Intel: fix DAI number mismatch ASoC: SOF: Intel: clarify initialization when HDA_AUDIO_CODEC is not used ASoC: SOF: Intel: Kconfig: move selection of PROBE_WORK_QUEUE ASoC: SOF: Intel: hda-dai: move hda_dai_prepare() code ASoC: SOF: Intel: hda-dai: mark functions as __maybe_unused ASoC: SOF: Intel: hda-dai: use HDA_LINK instead of HDA_AUDIO_CODEC ASoC: SOF: Intel: remove mutual exclusion between NOCODEC and HDA_LINK sound/soc/sof/intel/Kconfig | 3 +- sound/soc/sof/intel/hda-bus.c | 11 +++- sound/soc/sof/intel/hda-dai-ops.c | 4 +- sound/soc/sof/intel/hda-dai.c | 104 +++++++++++++++--------------- sound/soc/sof/intel/hda.h | 2 +- 5 files changed, 63 insertions(+), 61 deletions(-) -- 2.37.2

2 10

[PATCH 0/8] ASoC: Intel: machine driver updates
by Pierre-Louis Bossart 15 May '23

15 May '23

Several updates for RPL/MTL/LNL, and one fix for SoundWire TGL device. Bard Liao (3): ASoC: Intel: sof_sdw: remove SOF_SDW_TGL_HDMI for MeteorLake devices ASoC: Intel: sof_sdw: add quirk for MTL RVP ASoC: Intel: sof_sdw: start set codec init function with an adr index Chao Song (1): ASoC: Intel: soc-acpi: add support for MTL SDCA boards Peter Ujfalusi (1): ASoC: Intel: sof_sdw: add quirk for LNL RVP Pierre-Louis Bossart (2): ASoC: Intel: sof_sdw: add new mapping for HP Spectre x360 ASoC: Intel: soc-acpi: add tables for LunarLake Terry Cheong (1): ASoC: Intel: Add rpl_max98373_8825 driver include/sound/soc-acpi-intel-match.h | 2 + sound/soc/intel/boards/sof_nau8825.c | 10 +++ sound/soc/intel/boards/sof_sdw.c | 49 +++++++++++-- sound/soc/intel/common/Makefile | 1 + .../intel/common/soc-acpi-intel-lnl-match.c | 72 +++++++++++++++++++ .../intel/common/soc-acpi-intel-mtl-match.c | 57 +++++++++++++++ .../intel/common/soc-acpi-intel-rpl-match.c | 12 ++++ 7 files changed, 197 insertions(+), 6 deletions(-) create mode 100644 sound/soc/intel/common/soc-acpi-intel-lnl-match.c -- 2.37.2

2 9

[PATCH] ASoC: SOF: Simplify the calculation of variables
by Jiapeng Chong 15 May '23

15 May '23

./sound/soc/sof/pcm.c:372:27-29: WARNING !A || A && B is equivalent to !A || B. Reported-by: Abaci Robot <abaci(a)linux.alibaba.com> Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=4938 Signed-off-by: Jiapeng Chong <jiapeng.chong(a)linux.alibaba.com> --- sound/soc/sof/pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sof/pcm.c b/sound/soc/sof/pcm.c index 567db32173a8..d14e7fd2c2ee 100644 --- a/sound/soc/sof/pcm.c +++ b/sound/soc/sof/pcm.c @@ -369,7 +369,7 @@ static int sof_pcm_trigger(struct snd_soc_component *component, case SNDRV_PCM_TRIGGER_PAUSE_PUSH: case SNDRV_PCM_TRIGGER_STOP: /* invoke platform trigger to stop DMA even if pcm_ops isn't set or if it failed */ - if (!pcm_ops || (pcm_ops && !pcm_ops->platform_stop_during_hw_free)) + if (!pcm_ops || !pcm_ops->platform_stop_during_hw_free) snd_sof_pcm_platform_trigger(sdev, substream, cmd); break; default: -- 2.20.1.7.g153144c

3 2

[PATCH] ASoC: SOF: Separate the tokens for input and output pin index
by Peter Ujfalusi 15 May '23

15 May '23

From: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Using the same token ID for both input and output format pin index results in collisions and incorrect pin index getting parsed from topology. 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> Reviewed-by: Paul Olaru <paul.olaru(a)oss.nxp.com> Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> --- include/uapi/sound/sof/tokens.h | 3 ++- sound/soc/sof/ipc4-topology.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/uapi/sound/sof/tokens.h b/include/uapi/sound/sof/tokens.h index bbc37877aaff..e9ec7e4eb982 100644 --- a/include/uapi/sound/sof/tokens.h +++ b/include/uapi/sound/sof/tokens.h @@ -183,7 +183,7 @@ #define SOF_TKN_CAVS_AUDIO_FORMAT_IN_INTERLEAVING_STYLE 1906 #define SOF_TKN_CAVS_AUDIO_FORMAT_IN_FMT_CFG 1907 #define SOF_TKN_CAVS_AUDIO_FORMAT_IN_SAMPLE_TYPE 1908 -#define SOF_TKN_CAVS_AUDIO_FORMAT_PIN_INDEX 1909 +#define SOF_TKN_CAVS_AUDIO_FORMAT_INPUT_PIN_INDEX 1909 /* intentional token numbering discontinuity, reserved for future use */ #define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_RATE 1930 #define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_BIT_DEPTH 1931 @@ -194,6 +194,7 @@ #define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_INTERLEAVING_STYLE 1936 #define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_FMT_CFG 1937 #define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_SAMPLE_TYPE 1938 +#define SOF_TKN_CAVS_AUDIO_FORMAT_OUTPUT_PIN_INDEX 1939 /* intentional token numbering discontinuity, reserved for future use */ #define SOF_TKN_CAVS_AUDIO_FORMAT_IBS 1970 #define SOF_TKN_CAVS_AUDIO_FORMAT_OBS 1971 diff --git a/sound/soc/sof/ipc4-topology.c b/sound/soc/sof/ipc4-topology.c index 059eebf0a687..5abe616a2054 100644 --- a/sound/soc/sof/ipc4-topology.c +++ b/sound/soc/sof/ipc4-topology.c @@ -59,7 +59,7 @@ static const struct sof_topology_token ipc4_in_audio_format_tokens[] = { audio_fmt.interleaving_style)}, {SOF_TKN_CAVS_AUDIO_FORMAT_IN_FMT_CFG, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32, offsetof(struct sof_ipc4_pin_format, audio_fmt.fmt_cfg)}, - {SOF_TKN_CAVS_AUDIO_FORMAT_PIN_INDEX, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32, + {SOF_TKN_CAVS_AUDIO_FORMAT_INPUT_PIN_INDEX, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32, offsetof(struct sof_ipc4_pin_format, pin_index)}, {SOF_TKN_CAVS_AUDIO_FORMAT_IBS, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32, offsetof(struct sof_ipc4_pin_format, buffer_size)}, @@ -79,7 +79,7 @@ static const struct sof_topology_token ipc4_out_audio_format_tokens[] = { audio_fmt.interleaving_style)}, {SOF_TKN_CAVS_AUDIO_FORMAT_OUT_FMT_CFG, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32, offsetof(struct sof_ipc4_pin_format, audio_fmt.fmt_cfg)}, - {SOF_TKN_CAVS_AUDIO_FORMAT_PIN_INDEX, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32, + {SOF_TKN_CAVS_AUDIO_FORMAT_OUTPUT_PIN_INDEX, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32, offsetof(struct sof_ipc4_pin_format, pin_index)}, {SOF_TKN_CAVS_AUDIO_FORMAT_OBS, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32, offsetof(struct sof_ipc4_pin_format, buffer_size)}, -- 2.40.1

2 1

[PATCH] ASoC: SOF: topology: Fix tuples array allocation
by Peter Ujfalusi 15 May '23

15 May '23

From: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> The memory allocated for the tuples array assumes that there's 1 instance of all tokens already. So for those tokens that have multiple instances in topology, we need to exclude the initial instance that has already been accounted for. Fixes: 4fdef47a44d6 ("ASoC: SOF: ipc4-topology: Add new tokens for input/output pin format count") 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> Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> --- sound/soc/sof/topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index b80566570512..f160dc454b44 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -1265,7 +1265,7 @@ static int sof_widget_parse_tokens(struct snd_soc_component *scomp, struct snd_s if (num_sets > 1) { struct snd_sof_tuple *new_tuples; - num_tuples += token_list[object_token_list[i]].count * num_sets; + num_tuples += token_list[object_token_list[i]].count * (num_sets - 1); new_tuples = krealloc(swidget->tuples, sizeof(*new_tuples) * num_tuples, GFP_KERNEL); if (!new_tuples) { -- 2.40.1

2 1