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

[PATCH v1 0/15] Patches to update for rockchip i2s
by Sugar Zhang 24 Aug '21

24 Aug '21

These patches fixup or update for rockchip i2s. Sugar Zhang (13): ASoC: rockchip: i2s: Add support for set bclk ratio ASoC: rockchip: i2s: Fixup clk div error ASoC: rockchip: i2s: Improve dma data transfer efficiency ASoC: rockchip: i2s: Fix regmap_ops hang ASoC: rockchip: i2s: Fix concurrency between tx/rx ASoC: rockchip: i2s: Reset the controller if soft reset failed ASoC: dt-bindings: rockchip: Document reset property for i2s ASoC: rockchip: i2s: Add property to specify play/cap capability ASoC: dt-bindings: rockchip: i2s: Document property for playback/capture ASoC: rockchip: i2s: Add compatible for more SoCs ASoC: dt-bindings: rockchip: Add compatible strings for more SoCs ASoC: rockchip: i2s: Add support for frame inversion ASoC: dt-bindings: rockchip: i2s: Document property 'clk-trcm' Xiaotan Luo (1): ASoC: rockchip: i2s: Fixup config for DAIFMT_DSP_A/B Xing Zheng (1): ASoC: rockchip: i2s: Add support for 'rockchip,clk-trcm' property .../devicetree/bindings/sound/rockchip-i2s.yaml | 30 ++++ sound/soc/rockchip/rockchip_i2s.c | 153 ++++++++++++++++----- sound/soc/rockchip/rockchip_i2s.h | 10 +- 3 files changed, 157 insertions(+), 36 deletions(-) -- 2.7.4

3 20

Out of bounds
by GitHub pull_request - opened 23 Aug '21

23 Aug '21

alsa-project/alsa-utils pull request #107 was opened from folkertvanheusden: Drevent out-of-bounds writing in arecord during recording with high volume and vu-meter enabled. Request URL : https://github.com/alsa-project/alsa-utils/pull/107 Patch URL : https://github.com/alsa-project/alsa-utils/pull/107.patch Repository URL: https://github.com/alsa-project/alsa-utils

1 0

[PATCH] ASoC: rt1015: remove possible unused variable `bclk_ms'
by Tzung-Bi Shih 23 Aug '21

23 Aug '21

bclk_ms is possible unused by using the given config (see [1]). sound/soc/codecs/rt1015.c:724:2: warning: Value stored to 'bclk_ms' is never read [clang-analyzer-deadcode.DeadStores] bclk_ms = frame_size > 32; ^ ~~~~~~~~~~~~~~~ In addition, bclk_ms is meaningless and confusing after applying commit a5db2ca51367 ("ASoC: rt1015: remove unneeded variables in rt1015_priv"). The "> 32" in the expression looks like a typo but it was not. Let's remove the confusing variable bclk_ms. [1]: https://lkml.org/lkml/2021/8/23/305 Reported-by: kernel test robot <lkp(a)intel.com> Signed-off-by: Tzung-Bi Shih <tzungbi(a)google.com> --- For the other two reported files: tas2770.c and wm8731.c, it seems there is no straightforward way to fix the warning. sound/soc/codecs/rt1015.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/rt1015.c b/sound/soc/codecs/rt1015.c index b3e69bf245dd..c0c5952cdff7 100644 --- a/sound/soc/codecs/rt1015.c +++ b/sound/soc/codecs/rt1015.c @@ -689,7 +689,7 @@ static int rt1015_hw_params(struct snd_pcm_substream *substream, { struct snd_soc_component *component = dai->component; struct rt1015_priv *rt1015 = snd_soc_component_get_drvdata(component); - int pre_div, bclk_ms, frame_size, lrck; + int pre_div, frame_size, lrck; unsigned int val_len = 0; lrck = params_rate(params); @@ -706,10 +706,7 @@ static int rt1015_hw_params(struct snd_pcm_substream *substream, return -EINVAL; } - bclk_ms = frame_size > 32; - - dev_dbg(component->dev, "bclk_ms is %d and pre_div is %d for iis %d\n", - bclk_ms, pre_div, dai->id); + dev_dbg(component->dev, "pre_div is %d for iis %d\n", pre_div, dai->id); dev_dbg(component->dev, "lrck is %dHz and pre_div is %d for iis %d\n", lrck, pre_div, dai->id); -- 2.33.0.rc2.250.ged5fa647cd-goog

2 1

[PATCH 00/11] ASoC: Intel: Skylake: Fix and support complex
by Cezary Rojewski 23 Aug '21

23 Aug '21

Existing skylake-driver supports very basic scenarios with limited range of modules and their control. Attached changes first fix code as several advanced configurations are 'mentioned' throughout the files but are not actually functional. Follow up are changes adding missing support for said configurations. Cezary Rojewski (5): ASoC: Intel: kbl_da7219_max98927: Fix format selection for max98373 ASoC: Intel: Skylake: Leave data as is when invoking TLV IPCs ASoC: Intel: Skylake: Fix module resource and format selection ASoC: Intel: Skylake: Fix module configuration for KPB and MIXER ASoC: Intel: Skylake: Select first entry for singular pipe config arrays Gustaw Lewandowski (2): ASoC: Intel: Skylake: Fix passing loadable flag for module ASoC: Intel: Skylake: Simplify m_state for loadable modules Kareem Shaik (1): ASoC: Intel: Skylake: Support multiple format configs Pawel Harlozinski (1): ASoC: Intel: Skylake: Properly configure modules with generic extension Piotr Maziarz (1): ASoC: Intel: Skylake: Select proper format for NHLT blob Szymon Mielczarek (1): ASoC: Intel: Skylake: Support modules with generic extension include/uapi/sound/snd_sst_tokens.h | 6 +- sound/soc/intel/boards/kbl_da7219_max98927.c | 55 +------ sound/soc/intel/skylake/skl-messages.c | 155 ++++++++++++------- sound/soc/intel/skylake/skl-pcm.c | 25 ++- sound/soc/intel/skylake/skl-topology.c | 155 +++++++++++-------- sound/soc/intel/skylake/skl-topology.h | 26 +++- 6 files changed, 231 insertions(+), 191 deletions(-) -- 2.25.1

3 13

[PATCH] ASoC: Intel: bytcr_rt5640: Mark hp_elitepad_1000g2_jack?_check functions static
by Hans de Goede 23 Aug '21

23 Aug '21

The byt_rt5640_hp_elitepad_1000g2_jack?_check functions are only used inside bytcr_rt5640.c, mark them as static. Reported-by: kernel test robot <lkp(a)intel.com> Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- sound/soc/intel/boards/bytcr_rt5640.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c index 2f151ba80be5..05667a33d919 100644 --- a/sound/soc/intel/boards/bytcr_rt5640.c +++ b/sound/soc/intel/boards/bytcr_rt5640.c @@ -490,7 +490,7 @@ static const struct acpi_gpio_mapping byt_rt5640_hp_elitepad_1000g2_gpios[] = { { }, }; -int byt_rt5640_hp_elitepad_1000g2_jack1_check(void *data) +static int byt_rt5640_hp_elitepad_1000g2_jack1_check(void *data) { struct byt_rt5640_private *priv = data; int jack_status, mic_status; @@ -506,7 +506,7 @@ int byt_rt5640_hp_elitepad_1000g2_jack1_check(void *data) return SND_JACK_HEADSET; } -int byt_rt5640_hp_elitepad_1000g2_jack2_check(void *data) +static int byt_rt5640_hp_elitepad_1000g2_jack2_check(void *data) { struct snd_soc_component *component = data; int jack_status, report; -- 2.31.1

2 1

[RESEND 1/3] ASoC: ics43432: add CMM-4030D-261 support
by Angelo Dureghello 23 Aug '21

23 Aug '21

Despite minimal datasheet differences, the driver seems perfectly compatible with CMM-4030D-261. Tested CMM-4030D-261 to work with this changes: / { cmm4030d: cmm4030d { #sound-dai-cells = <0>; compatible = "cui,cmm-4030d-261"; }; sound_mic { compatible = "simple-audio-card"; simple-audio-card,name = "i2s mem mic"; simple-audio-card,format = "i2s"; simple-audio-card,bitclock-master = <&sound_master>; simple-audio-card,frame-master = <&sound_master>; sound_master: simple-audio-card,cpu { sound-dai = <&ssi2>; system-clock-frequency = <2822400>; }; simple-audio-card,codec { sound-dai = <&cmm4030d>; }; }; }; Audio has been captured and tested successfully by: arecord -D "hw:1,0" -f S24_LE > test.wav aplay test.wav Signed-off-by: Angelo Dureghello <angelo.dureghello(a)timesys.com> --- sound/soc/codecs/Kconfig | 2 +- sound/soc/codecs/ics43432.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index db16071205ba..cd1976aae328 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -847,7 +847,7 @@ config SND_SOC_HDAC_HDA select SND_HDA config SND_SOC_ICS43432 - tristate + tristate "ICS43423 and compatible i2s microphones" config SND_SOC_INNO_RK3036 tristate "Inno codec driver for RK3036 SoC" diff --git a/sound/soc/codecs/ics43432.c b/sound/soc/codecs/ics43432.c index 47e749f03940..de4c8460ab3d 100644 --- a/sound/soc/codecs/ics43432.c +++ b/sound/soc/codecs/ics43432.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * I2S MEMS microphone driver for InvenSense ICS-43432 + * I2S MEMS microphone driver for InvenSense ICS-43432 and similar + * MEMS-based microphones. * * - Non configurable. * - I2S interface, 64 BCLs per frame, 32 bits per channel, 24 bit data @@ -53,6 +54,7 @@ static int ics43432_probe(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id ics43432_ids[] = { { .compatible = "invensense,ics43432", }, + { .compatible = "cui,cmm-4030d-261", }, { } }; MODULE_DEVICE_TABLE(of, ics43432_ids); -- 2.32.0

2 5

[PATCH 2/2] plugio: Check for pointer callback error codes
by Arkadiusz Bokowy 23 Aug '21

23 Aug '21

By checking error code returned by the pointer callback, we can determine more precisely PCM state. Previous implementation assumed, that a software PCM can only produce overrun or underrun. It was impossible to mark software PCM as disconnected. Signed-off-by: Arkadiusz Bokowy <arkadiusz.bokowy(a)gmail.com> --- src/pcm/pcm_ioplug.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/pcm/pcm_ioplug.c b/src/pcm/pcm_ioplug.c index c96104e9..0e27e121 100644 --- a/src/pcm/pcm_ioplug.c +++ b/src/pcm/pcm_ioplug.c @@ -81,11 +81,21 @@ static int snd_pcm_ioplug_hw_ptr_update(snd_pcm_t *pcm) } io->last_hw = (snd_pcm_uframes_t)hw; } else { + switch (hw) { + case -ESTRPIPE: + io->data->state = SND_PCM_STATE_SUSPENDED; + break; + case -ENODEV: + io->data->state = SND_PCM_STATE_DISCONNECTED; + break; + default: + io->data->state = SND_PCM_STATE_XRUN; + } if (io->data->state == SND_PCM_STATE_DRAINING) snd_pcm_ioplug_drop(pcm); else io->data->state = SNDRV_PCM_STATE_XRUN; - return -EPIPE; + return hw; } return 0; } -- 2.31.1

2 1

[PATCH 1/2] ioplug: Check for callback error codes
by Arkadiusz Bokowy 23 Aug '21

23 Aug '21

Signed-off-by: Arkadiusz Bokowy <arkadiusz.bokowy(a)gmail.com> --- src/pcm/pcm_ioplug.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/pcm/pcm_ioplug.c b/src/pcm/pcm_ioplug.c index 98184398..c96104e9 100644 --- a/src/pcm/pcm_ioplug.c +++ b/src/pcm/pcm_ioplug.c @@ -54,7 +54,7 @@ static int snd_pcm_ioplug_poll_revents(snd_pcm_t *pcm, struct pollfd *pfds, unsi /* update the hw pointer */ /* called in lock */ -static void snd_pcm_ioplug_hw_ptr_update(snd_pcm_t *pcm) +static int snd_pcm_ioplug_hw_ptr_update(snd_pcm_t *pcm) { ioplug_priv_t *io = pcm->private_data; snd_pcm_sframes_t hw; @@ -85,7 +85,9 @@ static void snd_pcm_ioplug_hw_ptr_update(snd_pcm_t *pcm) snd_pcm_ioplug_drop(pcm); else io->data->state = SNDRV_PCM_STATE_XRUN; + return -EPIPE; } + return 0; } static int snd_pcm_ioplug_info(snd_pcm_t *pcm, snd_pcm_info_t *info) @@ -115,7 +117,10 @@ static int snd_pcm_ioplug_delay(snd_pcm_t *pcm, snd_pcm_sframes_t *delayp) io->data->callback->delay) return io->data->callback->delay(io->data, delayp); else { - snd_pcm_ioplug_hw_ptr_update(pcm); + int err; + err = snd_pcm_ioplug_hw_ptr_update(pcm); + if (err < 0) + return err; *delayp = snd_pcm_mmap_delay(pcm); } return 0; @@ -499,11 +504,14 @@ static int snd_pcm_ioplug_start(snd_pcm_t *pcm) static int snd_pcm_ioplug_drop(snd_pcm_t *pcm) { ioplug_priv_t *io = pcm->private_data; + int err; if (io->data->state == SND_PCM_STATE_OPEN) return -EBADFD; - io->data->callback->stop(io->data); + err = io->data->callback->stop(io->data); + if (err < 0) + return err; gettimestamp(&io->trigger_tstamp, pcm->tstamp_type); io->data->state = SND_PCM_STATE_SETUP; @@ -625,7 +633,7 @@ static int snd_pcm_ioplug_resume(snd_pcm_t *pcm) ioplug_priv_t *io = pcm->private_data; if (io->data->callback->resume) - io->data->callback->resume(io->data); + return io->data->callback->resume(io->data); return 0; } @@ -898,13 +906,14 @@ static void clear_io_params(ioplug_priv_t *io) static int snd_pcm_ioplug_close(snd_pcm_t *pcm) { ioplug_priv_t *io = pcm->private_data; + int err = 0; clear_io_params(io); if (io->data->callback->close) - io->data->callback->close(io->data); + err = io->data->callback->close(io->data); free(io); - return 0; + return err; } static const snd_pcm_ops_t snd_pcm_ioplug_ops = { -- 2.31.1

2 1

[PATCH] soundwire: cadence: do not extend reset delay
by Bard Liao 23 Aug '21

23 Aug '21

From: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> The duration of the hw_reset is defined as 4096 cycles. The Cadence IP allows for an additional delay which doesn't seem necessary in practice: the actual reset sequence duration is defined by the sync_go mechanism, not by the IP itself. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Rander Wang <rander.wang(a)intel.com> Signed-off-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> --- drivers/soundwire/cadence_master.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c index 0b7f037e6cd0..4fcc3ba93004 100644 --- a/drivers/soundwire/cadence_master.c +++ b/drivers/soundwire/cadence_master.c @@ -1032,10 +1032,7 @@ EXPORT_SYMBOL(sdw_cdns_check_self_clearing_bits); */ int sdw_cdns_exit_reset(struct sdw_cdns *cdns) { - /* program maximum length reset to be safe */ - cdns_updatel(cdns, CDNS_MCP_CONTROL, - CDNS_MCP_CONTROL_RST_DELAY, - CDNS_MCP_CONTROL_RST_DELAY); + /* keep reset delay unchanged to 4096 cycles */ /* use hardware generated reset */ cdns_updatel(cdns, CDNS_MCP_CONTROL, -- 2.17.1

2 1

[PATCH v2 0/3] soundwire: intel: exit clock-stop mode before system suspend
by Bard Liao 23 Aug '21

23 Aug '21

Intel validation reported an issue where the HW_RST self-clearing bit is not cleared in hardware, which as a ripple effect creates issues with the clock stop mode. This happens is a specific sequence where the Intel manager is pm_runtime suspended with the clock-stop mode enabled. During the system suspend, we currently do nothing, which can lead to potential issues on system resume and the following pm_runtime suspend, depending on the hardware state. This patch suggests a full resume if the clock-stop mode is used. This may require extra time but will make the suspend/resume flows completely symmetric. This also removes a race condition where we could not access SHIM registers if the parent was suspended as well. Resuming the link also resumes the parent by construction. BugLink: https://github.com/thesofproject/linux/issues/2606 v2: - Better comments and commit messages. - Modified the .prepare callback to only deal with the corner case that is NOT covered today instead of systematically doing a full resume. Pierre-Louis Bossart (3): soundwire: intel: fix potential race condition during power down soundwire: intel: skip suspend/resume/wake when link was not started soundwire: intel: conditionally exit clock stop mode on system suspend drivers/soundwire/intel.c | 150 ++++++++++++++++++++++++++++++-------- drivers/soundwire/intel.h | 1 + 2 files changed, 119 insertions(+), 32 deletions(-) -- 2.17.1

2 4