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

[GIT PULL] ASoC fixes for v6.1-rc6
by Mark Brown 23 Nov '22

23 Nov '22

The following changes since commit 7d945b046be3d2605dbb1806e73095aadd7ae129: ASoC: stm32: dfsdm: manage cb buffers cleanup (2022-11-09 17:56:37 +0000) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v6.1-rc6 for you to fetch changes up to db8f91d424fe0ea6db337aca8bc05908bbce1498: ASoC: soc-pcm: Add NULL check in BE reparenting (2022-11-22 12:23:00 +0000) ---------------------------------------------------------------- ASoC: Fixes for v6.1 A clutch of small fixes that have come in in the past week, people seem to have been unusually active for this late in the release cycle. The most critical one here is the fix to renumber the SOF DAI types in order to restore ABI compatibility which was broken by the addition of AMD support. ---------------------------------------------------------------- Chancel Liu (1): ASoC: wm8962: Wait for updated value of WM8962_CLOCKING1 register Detlev Casanova (1): ASoC: sgtl5000: Reset the CHIP_CLK_CTRL reg on remove Jiasheng Jiang (1): ASoC: max98373: Add checks for devm_kcalloc Junxiao Chang (1): ASoC: hdac_hda: fix hda pcm buffer overflow issue Olivier Moysan (1): ASoC: stm32: i2s: remove irqf_oneshot flag Pierre-Louis Bossart (1): ASoC: SOF: dai: move AMD_HS to end of list to restore backwards-compatibility Richard Fitzgerald (1): ASoC: soc-pcm: Don't zero TDM masks in __soc_pcm_open() Shuming Fan (1): ASoC: rt711-sdca: fix the latency time of clock stop prepare state machine transitions Srinivasa Rao Mandadapu (1): ASoC: soc-pcm: Add NULL check in BE reparenting include/sound/sof/dai.h | 2 +- sound/soc/codecs/hdac_hda.h | 4 ++-- sound/soc/codecs/max98373-i2c.c | 4 ++++ sound/soc/codecs/rt711-sdca-sdw.c | 2 +- sound/soc/codecs/sgtl5000.c | 1 + sound/soc/codecs/wm8962.c | 8 ++++++++ sound/soc/soc-pcm.c | 7 ++----- sound/soc/stm/stm32_i2s.c | 2 +- 8 files changed, 20 insertions(+), 10 deletions(-)

2 1

[PATCH v2 1/9] sound: sdw: Add hw_params to SoundWire config helper function
by Charles Keepax 23 Nov '22

23 Nov '22

The vast majority of the current users of the SoundWire framework have almost identical code for converting from hw_params to SoundWire configuration. Whilst complex devices might require more, it is very likely that most new devices will follow the same pattern. Save a little code by factoring this out into a helper function. Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- I was a little bit two minds about whether to make this an inline or not, so any thoughts on that would be super welcome. The function does very little, especially given that SNDRV_PCM_STREAM_PLAYBACK == SDW_DATA_DIR_RX so the if is also really just an assignment. Thanks, Charles Changes since v1: - Correct spelling error in commit message include/sound/sdw.h | 49 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 include/sound/sdw.h diff --git a/include/sound/sdw.h b/include/sound/sdw.h new file mode 100644 index 0000000000000..6dcdb3228dba6 --- /dev/null +++ b/include/sound/sdw.h @@ -0,0 +1,49 @@ +/* SPDX-License-Identifier: GPL-2.0 + * + * linux/sound/sdw.h -- SoundWire helpers for ALSA/ASoC + * + * Copyright (c) 2022 Cirrus Logic Inc. + * + * Author: Charles Keepax <ckeepax(a)opensource.cirrus.com> + */ + +#include <linux/soundwire/sdw.h> +#include <sound/asound.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> + +#ifndef __INCLUDE_SOUND_SDW_H +#define __INCLUDE_SOUND_SDW_H + +/** + * snd_sdw_params_to_config() - Conversion from hw_params to SoundWire config + * + * @substream: Pointer to the PCM substream structure + * @params: Pointer to the hardware params structure + * @stream_config: Stream configuration for the SoundWire audio stream + * @port_config: Port configuration for the SoundWire audio stream + * + * This function provides a basic conversion from the hw_params structure to + * SoundWire configuration structures. The user will at a minimum need to also + * set the port number in the port config, but may also override more of the + * setup, or in the case of a complex user, not use this helper at all and + * open-code everything. + */ +static inline void snd_sdw_params_to_config(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct sdw_stream_config *stream_config, + struct sdw_port_config *port_config) +{ + stream_config->frame_rate = params_rate(params); + stream_config->ch_count = params_channels(params); + stream_config->bps = snd_pcm_format_width(params_format(params)); + + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + stream_config->direction = SDW_DATA_DIR_RX; + else + stream_config->direction = SDW_DATA_DIR_TX; + + port_config->ch_mask = GENMASK(stream_config->ch_count - 1, 0); +} + +#endif -- 2.30.2

1 8

[PATCH 0/2] soundwire: revisit support for clock registers
by Bard Liao 23 Nov '22

23 Nov '22

SoundWire clock base and scale registers are only supported for SDCA devices. That's fine, but that leaves SoundWire 1.2 with optional registers not supported. This is a corner case that needs to be supported. Pierre-Louis Bossart (2): soundwire: remove is_sdca boolean property soundwire: enable optional clock registers for SoundWire 1.2 devices drivers/soundwire/bus.c | 11 ++++++----- include/linux/soundwire/sdw.h | 6 ++++-- sound/soc/codecs/rt1316-sdw.c | 1 - sound/soc/codecs/rt711-sdca-sdw.c | 1 - 4 files changed, 10 insertions(+), 9 deletions(-) -- 2.25.1

2 3

[PATCH 0/7] soundwire: intel: introduce hw_ops and move auxdevice handling to dedicated file
by Bard Liao 23 Nov '22

23 Nov '22

This series adds yet another set of cleanups a) all the helpers are now exposed as hw_ops callbacks b) the auxiliary device code is now completely generic. This will allow for easier introduction of new hw_ops implementations in the future without throwing away all the goodness of the auxiliary device handling. Since there will be a tighter coupling with HDaudio, it's likely that future hw_ops are implemented in the SOF driver directly. Pierre-Louis Bossart (7): soundwire: intel: start using hw_ops soundwire: intel: add debugfs callbacks in hw_ops soundwire: intel: add register_dai callback in hw_ops soundwire: intel: add bus management callbacks in hw_ops soundwire: intel: add link power management callbacks in hw_ops soundwire: intel: add in-band wake callbacks in hw_ops soundwire: intel: split auxdevice to different file drivers/soundwire/Makefile | 2 +- drivers/soundwire/intel.c | 658 +-------------------------- drivers/soundwire/intel.h | 96 +++- drivers/soundwire/intel_auxdevice.c | 678 ++++++++++++++++++++++++++++ drivers/soundwire/intel_auxdevice.h | 18 + drivers/soundwire/intel_init.c | 2 + include/linux/soundwire/sdw_intel.h | 44 ++ sound/soc/sof/intel/hda.c | 2 + 8 files changed, 853 insertions(+), 647 deletions(-) create mode 100644 drivers/soundwire/intel_auxdevice.c create mode 100644 drivers/soundwire/intel_auxdevice.h -- 2.25.1

3 9

[PATCH v3 0/2] ASoC: Intel: avs: DSP recovery and resume fixes
by Cezary Rojewski 23 Nov '22

23 Nov '22

Two fixes that are result of the recent discussions [1][2]. First adds missing locking around snd_pcm_stop() while the second fix sets substream state to DISCONNECTED if any suspend/resume related operation fails so that userspace has means to be aware that something went wrong during said operation. Changes in v3: - added a comment why non-_irq() locking is used around snd_pcm_stop() Changes in v2: - __snd_pcm_set_state() replaced direct assignments of PCM state [1]: https://lore.kernel.org/alsa-devel/73e6425f-8e51-e26f-ad83-ccc5df517a43@int… [2]: https://lore.kernel.org/alsa-devel/20221104131244.3920179-1-cezary.rojewski… Cezary Rojewski (2): ASoC: Intel: avs: Lock substream before snd_pcm_stop() ASoC: Intel: avs: Disconnect substream if suspend or resume fails sound/soc/intel/avs/ipc.c | 3 +++ sound/soc/intel/avs/pcm.c | 10 ++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) -- 2.25.1

2 3

[PATCH] ASoC: soc-dai: Do not call snd_soc_link_be_hw_params_fixup() twice
by Richard Fitzgerald 23 Nov '22

23 Nov '22

For a BE link snd_soc_link_be_hw_params_fixup() is called by dpcm_be_dai_hw_params() to initialize the params before it passes them to __soc_pcm_hw_params(). Then __soc_pcm_hw_params() refines params to match the BE codec and passes that to snd_soc_dai_hw_params(). The second call of snd_soc_link_be_hw_params_fixup() within snd_soc_dai_hw_params() was overwriting the refined params with the original BE CPU DAI params. This would then lead to various problems, for example passing an invalid number of channels to the codec driver hw_params(), or enabling more AIF widgets on the codec than are actually mapped by TDM slots. These errors may not be noticed on a simple 1:1 link between one CPU DAI and one codec DAI, because most likely they have the same DAI config (though this is not necessarily true, for example if the CPU end has dummy TDM slots to achieve a desirable BCLK). For 1:N mappings there are likely to be multiple codecs using different subsets of the TDM slots and this overwriting of the refined params can cause incorrect configuration of each codec on the link. The erroneous extra call to the BE fixup function() was introduced by: commit a655de808cbd ("ASoC: core: Allow topology to override machine driver FE DAI link config.") at that time, the call to the BE fixup was already done by dpcm_be_dai_hw_params(), which was introduced several years earlier by: commit 01d7584cd2e5 ("ASoC: dpcm: Add Dynamic PCM core operations.") The erroneous code has changed and moved to a different source file since the patch that introduced it, so this fix patch won't directly apply as a fix on top of code older than: commit 8b4ba1d31771 ("ASoC: soc-dai: fix up hw params only if it is needed") though it can be applied with some minor adjustment to code before that patch but after: commit aa6166c2ac28 ("ASoC: soc-dai: mv soc_dai_hw_params() to soc-dai") On any tree older than that the code is in soc-pcm.c. Signed-off-by: Richard Fitzgerald <rf(a)opensource.cirrus.com> --- sound/soc/soc-dai.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c index 49752af0e205..29a75fdf90e0 100644 --- a/sound/soc/soc-dai.c +++ b/sound/soc/soc-dai.c @@ -386,23 +386,16 @@ int snd_soc_dai_hw_params(struct snd_soc_dai *dai, struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); int ret = 0; if (dai->driver->ops && - dai->driver->ops->hw_params) { - /* perform any topology hw_params fixups before DAI */ - ret = snd_soc_link_be_hw_params_fixup(rtd, params); - if (ret < 0) - goto end; - + dai->driver->ops->hw_params) ret = dai->driver->ops->hw_params(substream, params, dai); - } /* mark substream if succeeded */ if (ret == 0) soc_dai_mark_push(dai, substream, hw_params); -end: + return soc_dai_ret(dai, ret); } -- 2.30.2

2 1

[PATCH 00/12] Add support for the Cirrus Logic CS48L32 audio codecs
by Richard Fitzgerald 23 Nov '22

23 Nov '22

The CS48L32 is a high-performance low-power audio DSP for smartphones and other portable audio devices. It has various digital audio I/O, a programmable Halo Core DSP, fixed-function audio processors, configurable GPIO and microphone bias regulators. The CS48L31 and CS48L33 were derivatives of the CS48L32. Piotr Stankiewicz (2): mfd: cs48l32: Add support for CS48L31/32/33 codecs pinctrl: cirrus: Add support for CS48L31/32/33 codecs Richard Fitzgerald (9): dt-bindings: mfd: Add Cirrus Logic CS48L32 audio codec mfd: cs48l32: Add register definitions for Cirrus Logic CS48L31/32/33 dt-bindings: pinctrl: Add Cirrus Logic CS48L31/32/33 regulator: arizona-micsupp: Don't hardcode use of ARIZONA defines regulator: arizona-micsupp: Don't use a common regulator name regulator: arizona-micsupp: Support Cirrus Logic CS48L31/32/33 irqchip: cirrus: Add driver for Cirrus Logic CS48L31/32/33 codecs ASoC: wm_adsp: Allow client to hook into pre_run callback dt-bindings: sound: Add Cirrus Logic CS48L31/32/33 codecs Stuart Henderson (1): ASoC: cs48l32: Add codec driver for Cirrus Logic CS48L31/32/33 .../bindings/mfd/cirrus,cs48l32.yaml | 166 + .../bindings/pinctrl/cirrus,cs48l32.yaml | 98 + .../bindings/sound/cirrus,cs48l32.yaml | 96 + MAINTAINERS | 12 +- drivers/irqchip/Kconfig | 3 + drivers/irqchip/Makefile | 1 + drivers/irqchip/irq-cirrus-cs48l32.c | 281 ++ drivers/irqchip/irq-cirrus-cs48l32.h | 74 + drivers/mfd/Kconfig | 13 + drivers/mfd/Makefile | 2 + drivers/mfd/cs48l32-tables.c | 541 ++++ drivers/mfd/cs48l32.c | 434 +++ drivers/mfd/cs48l32.h | 28 + drivers/pinctrl/cirrus/Kconfig | 5 + drivers/pinctrl/cirrus/Makefile | 2 + drivers/pinctrl/cirrus/pinctrl-cs48l32.c | 932 ++++++ drivers/pinctrl/cirrus/pinctrl-cs48l32.h | 62 + drivers/regulator/Kconfig | 8 +- drivers/regulator/arizona-micsupp.c | 78 +- include/dt-bindings/sound/cs48l32.h | 25 + include/linux/irqchip/irq-cirrus-cs48l32.h | 101 + include/linux/mfd/cs48l32/core.h | 49 + include/linux/mfd/cs48l32/registers.h | 509 +++ include/sound/cs48l32.h | 89 + sound/soc/codecs/Kconfig | 9 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/cs48l32-core.c | 2782 +++++++++++++++++ sound/soc/codecs/cs48l32.c | 1211 +++++++ sound/soc/codecs/cs48l32.h | 386 +++ sound/soc/codecs/wm_adsp.c | 11 + sound/soc/codecs/wm_adsp.h | 1 + 31 files changed, 7997 insertions(+), 14 deletions(-) create mode 100644 Documentation/devicetree/bindings/mfd/cirrus,cs48l32.yaml create mode 100644 Documentation/devicetree/bindings/pinctrl/cirrus,cs48l32.yaml create mode 100644 Documentation/devicetree/bindings/sound/cirrus,cs48l32.yaml create mode 100644 drivers/irqchip/irq-cirrus-cs48l32.c create mode 100644 drivers/irqchip/irq-cirrus-cs48l32.h create mode 100644 drivers/mfd/cs48l32-tables.c create mode 100644 drivers/mfd/cs48l32.c create mode 100644 drivers/mfd/cs48l32.h create mode 100644 drivers/pinctrl/cirrus/pinctrl-cs48l32.c create mode 100644 drivers/pinctrl/cirrus/pinctrl-cs48l32.h create mode 100644 include/dt-bindings/sound/cs48l32.h create mode 100644 include/linux/irqchip/irq-cirrus-cs48l32.h create mode 100644 include/linux/mfd/cs48l32/core.h create mode 100644 include/linux/mfd/cs48l32/registers.h create mode 100644 include/sound/cs48l32.h create mode 100644 sound/soc/codecs/cs48l32-core.c create mode 100644 sound/soc/codecs/cs48l32.c create mode 100644 sound/soc/codecs/cs48l32.h -- 2.30.2

9 48

[PATCH AUTOSEL 5.4 03/15] ASoC: Intel: soc-acpi: add ES83x6 support to IceLake
by Sasha Levin 23 Nov '22

23 Nov '22

From: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> [ Upstream commit 9a1d248bb4beaf1b43d17ba12481ee0629fa29b9 ] Missing entry to find a machine driver for ES83x6-based platforms. Link: https://github.com/thesofproject/linux/issues/3873 Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Link: https://lore.kernel.org/r/20221031195836.250193-1-pierre-louis.bossart@linu… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/intel/common/soc-acpi-intel-icl-match.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sound/soc/intel/common/soc-acpi-intel-icl-match.c b/sound/soc/intel/common/soc-acpi-intel-icl-match.c index 38977669b576..4f5229b196ec 100644 --- a/sound/soc/intel/common/soc-acpi-intel-icl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-icl-match.c @@ -10,6 +10,11 @@ #include <sound/soc-acpi-intel-match.h> #include "../skylake/skl.h" +static const struct snd_soc_acpi_codecs essx_83x6 = { + .num_codecs = 3, + .codecs = { "ESSX8316", "ESSX8326", "ESSX8336"}, +}; + static struct skl_machine_pdata icl_pdata = { .use_tplg_pcm = true, }; @@ -29,6 +34,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_icl_machines[] = { .sof_fw_filename = "sof-icl.ri", .sof_tplg_filename = "sof-icl-rt5682.tplg", }, + { + .comp_ids = &essx_83x6, + .drv_name = "sof-essx8336", + .sof_tplg_filename = "sof-icl-es8336", /* the tplg suffix is added at run time */ + .tplg_quirk_mask = SND_SOC_ACPI_TPLG_INTEL_SSP_NUMBER | + SND_SOC_ACPI_TPLG_INTEL_SSP_MSB | + SND_SOC_ACPI_TPLG_INTEL_DMIC_NUMBER, + }, {}, }; EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_icl_machines); -- 2.35.1

1 0

[PATCH AUTOSEL 5.4 02/15] ASoC: Intel: bytcht_es8316: Add quirk for the Nanote UMPC-01
by Sasha Levin 23 Nov '22

23 Nov '22

From: Hans de Goede <hdegoede(a)redhat.com> [ Upstream commit 8bb0ac0e6f64ebdf15d963c26b028de391c9bcf9 ] The Nanote UMPC-01 mini laptop has stereo speakers, while the default bytcht_es8316 settings assume a mono speaker setup. Add a quirk for this. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> Acked-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Link: https://lore.kernel.org/r/20221025140942.509066-1-hdegoede@redhat.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/intel/boards/bytcht_es8316.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c index ed332177b0f9..57d6d0b48068 100644 --- a/sound/soc/intel/boards/bytcht_es8316.c +++ b/sound/soc/intel/boards/bytcht_es8316.c @@ -446,6 +446,13 @@ static const struct dmi_system_id byt_cht_es8316_quirk_table[] = { | BYT_CHT_ES8316_INTMIC_IN2_MAP | BYT_CHT_ES8316_JD_INVERTED), }, + { /* Nanote UMPC-01 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "RWC CO.,LTD"), + DMI_MATCH(DMI_PRODUCT_NAME, "UMPC-01"), + }, + .driver_data = (void *)BYT_CHT_ES8316_INTMIC_IN1_MAP, + }, { /* Teclast X98 Plus II */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "TECLAST"), -- 2.35.1

1 0

[PATCH AUTOSEL 5.10 04/22] ASoC: hda: intel-dsp-config: add ES83x6 quirk for IceLake
by Sasha Levin 23 Nov '22

23 Nov '22

From: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> [ Upstream commit 5d73263f9e7c54ccb20814dc50809b9deb9e2bc7 ] Yet another hardware variant we need to handle. Link: https://github.com/thesofproject/linux/issues/3873 Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Reviewed-by: Takashi Iwai <tiwai(a)suse.de> Link: https://lore.kernel.org/r/20221031195639.250062-1-pierre-louis.bossart@linu… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/hda/intel-dsp-config.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c index 2a5ba9dca6b0..7fd5c819ec36 100644 --- a/sound/hda/intel-dsp-config.c +++ b/sound/hda/intel-dsp-config.c @@ -302,6 +302,11 @@ static const struct config_entry config_table[] = { {} } }, + { + .flags = FLAG_SOF, + .device = 0x34c8, + .codec_hid = &essx_83x6, + }, { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, .device = 0x34c8, -- 2.35.1

1 0