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

[PATCH] ALSA: oxygen: use true,false for bool variables
by Jason Yan 22 Apr '20

22 Apr '20

Fix the following coccicheck warning: sound/pci/oxygen/xonar_pcm179x.c:463:1-17: WARNING: Assignment of 0/1 to bool variable sound/pci/oxygen/xonar_pcm179x.c:505:1-17: WARNING: Assignment of 0/1 to bool variable Signed-off-by: Jason Yan <yanaijie(a)huawei.com> --- sound/pci/oxygen/xonar_pcm179x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/pci/oxygen/xonar_pcm179x.c b/sound/pci/oxygen/xonar_pcm179x.c index 6a0520c4fb5a..cf801a235df9 100644 --- a/sound/pci/oxygen/xonar_pcm179x.c +++ b/sound/pci/oxygen/xonar_pcm179x.c @@ -460,7 +460,7 @@ static void xonar_st_init(struct oxygen *chip) data->generic.anti_pop_delay = 100; data->h6 = chip->model.dac_channels_mixer > 2; - data->has_cs2000 = 1; + data->has_cs2000 = true; data->cs2000_regs[CS2000_FUN_CFG_1] = CS2000_REF_CLK_DIV_1; data->broken_i2c = true; @@ -502,7 +502,7 @@ static void xonar_xense_init(struct oxygen *chip) xonar_init_ext_power(chip); data->generic.anti_pop_delay = 100; - data->has_cs2000 = 1; + data->has_cs2000 = true; data->cs2000_regs[CS2000_FUN_CFG_1] = CS2000_REF_CLK_DIV_1; oxygen_write16(chip, OXYGEN_I2S_A_FORMAT, -- 2.21.1

2 1

[PATCH] ALSA: usb-audio: Fix a limit check in proc_dump_substream_formats()
by Dan Carpenter 22 Apr '20

22 Apr '20

This should be ARRAY_SIZE() instead of sizeof(). The sizeof() limit is too high so it doesn't work. Fixes: 093b8494f299 ("ALSA: usb-audio: Print more information in stream proc files") Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> --- sound/usb/proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/usb/proc.c b/sound/usb/proc.c index 5a36e192ebb0..889c550c9f29 100644 --- a/sound/usb/proc.c +++ b/sound/usb/proc.c @@ -140,7 +140,7 @@ static void proc_dump_substream_formats(struct snd_usb_substream *subs, struct s snd_iprintf(buffer, " Channel map:"); for (c = 0; c < map->channels; c++) { - if (map->map[c] >= sizeof(channel_labels) || + if (map->map[c] >= ARRAY_SIZE(channel_labels) || !channel_labels[map->map[c]]) snd_iprintf(buffer, " --"); else -- 2.26.1

2 1

v2: Add support to SDM845 based platforms
by GitHub pull_request - opened 22 Apr '20

22 Apr '20

alsa-project/alsa-ucm-conf pull request #23 was opened from Srinivas-Kandagatla: Add Support to two codecs WCD934x and WSA881x and two platforms DragonBoard DB845c and Lenovo-YOGA-C630-13Q50 that use this codec. For ucm-validator to pass this PR depends on config files PR "v2: ucm-validator: add config files for DB845c and Lenovo-YOGA-C630-13Q50" (https://github.com/alsa-project/alsa-tests/pull/3) to alsa-tests Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/23 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/23.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

alsa-gobject: seq: some improvements and fixes
by GitHub pull_request - opened 22 Apr '20

22 Apr '20

alsa-project/alsa-gobject pull request #18 was opened from takaswie: In UAPI of ALSA Sequencer, some members in structures are defined as fixed-sized array. For accessor methods to the members, this patchset adds changes so that function annotations have 'not a variable length array type' in their prototype. In some cases, it's convenient to compare two instance of ALSASeq.Addr. This patchset adds a new API, 'ALSASeq.Addr.equal()' for this purpose. Finally, this patchset also adds some improvements and fixes. Request URL : https://github.com/alsa-project/alsa-gobject/pull/18 Patch URL : https://github.com/alsa-project/alsa-gobject/pull/18.patch Repository URL: https://github.com/alsa-project/alsa-gobject

1 0

How to support multi FIFO address in ALSA & DMA Engine?
by Shengjiu Wang 22 Apr '20

22 Apr '20

Hi Experts Some cpu-dai devices support multi FIFO, so we need to tell DMA which fifos and how many fifos it should fill the data to. For example, when channels = 2, only one fifo is used. when channels = 4, then two fifos are used. or when channels = 2, two fifos are used, when channels= 4, four fifos are used. But in snd_dmaengine_dai_dma_data, and dma_slave_config, there is only one dma address. Do you have any idea to support multi FIFO? is there any implemented reference? Best regards Wang shengjiu

1 0

[GIT PULL] ASoC fix v5.7-rc2
by Mark Brown 21 Apr '20

21 Apr '20

The following changes since commit ccfc531695f3a4aada042f6bdb33ac6be24e1aec: ASoC: cs4270: pull reset GPIO low then high (2020-04-07 15:29:54 +0100) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v5.7-rc2 for you to fetch changes up to 1e060a453c8604311fb45ae2f84f67ed673329b4: ASoC: wm8960: Fix wrong clock after suspend & resume (2020-04-21 15:43:22 +0100) ---------------------------------------------------------------- ASoC: Fixes for v5.7 Quite a lot of fixes here, a lot of driver specific ones but the biggest one is the revert of changes to the startup and shutdown sequence for DAIs that went in during the merge window - they broke some older x86 platforms and attempts to fix them didn't succeed so it's safer to just roll them back and try to make sure those platforms are handled properly in any future attempt. The rockchip S/PDIF DT stuff was IIRC for validation issues. ---------------------------------------------------------------- Akshu Agrawal (1): ASoC: amd: Fix button configuration Amadeusz Sławiński (8): ASoC: topology: Add missing memory checks ASoC: topology: Check return value of soc_tplg_create_tlv ASoC: topology: Check return value of soc_tplg_*_create ASoC: topology: Check soc_tplg_add_route return value ASoC: topology: Check return value of pcm_new_ver ASoC: topology: Check return value of soc_tplg_dai_config ASoC: topology: Fix endianness issue ASoC: codecs: hdac_hdmi: Fix incorrect use of list_for_each_entry Bjorn Andersson (1): ASoC: qcom: common: Silence duplicate parse error messages Charles Keepax (4): ASoC: dapm: Fix regression introducing multiple copies of DAI widgets ASoC: dapm: Move error message to avoid some duplication ASoC: dapm: Remove dapm_connect_dai_link_widgets helper ASoC: madera: Remove a couple of stray blank lines Gyeongtaek Lee (1): ASoC: dapm: fixup dapm kcontrol widget Jason Yan (2): ASoC: intel: soc-acpi-intel-icl-match: remove useless 'rt1308_2_adr' ASoC: Intel: soc-acpi-intel-cml-match: remove useless 'rt1308_2_adr' Jerome Brunet (2): ASoC: meson: axg-card: fix codec-to-codec link setup ASoC: meson: gx-card: fix codec-to-codec link setup Johan Jonker (4): ASoC: convert rockchip spdif bindings to yaml ASoC: rockchip-spdif: add #sound-dai-cells property ASoC: rockchip-spdif: add power-domains property ASoC: rockchip-i2s: add power-domains property Krzysztof Kozlowski (1): ASoC: samsung: s3c24xx-i2s: Fix build after removal of DAI suspend/resume Mark Brown (3): Merge series "ASoC: rsnd: Fixes for multichannel HDMI audio output" from Matthias Blankertz <matthias.blankertz(a)cetitec.com>: Merge series "ASoC: meson: fix codec-to-codec link setup" from Jerome Brunet <jbrunet(a)baylibre.com>: Merge series "ASoC: rsnd: multi-SSI setup fixes" from Matthias Blankertz <matthias.blankertz(a)cetitec.com>: Matthias Blankertz (4): ASoC: rsnd: Fix parent SSI start/stop in multi-SSI mode ASoC: rsnd: Fix HDMI channel mapping for multi-SSI mode ASoC: rsnd: Don't treat master SSI in multi SSI setup as parent ASoC: rsnd: Fix "status check failed" spam for multi-SSI Olivier Moysan (1): ASoC: stm32: sai: fix sai probe Philipp Puschmann (1): ASoC: tas571x: disable regulators on failed probe Pierre-Louis Bossart (2): ASoC: soc-dai: revert all changes to DAI startup/shutdown sequence ASoC: SOF: Intel: add min/max channels for SSP on Baytrail/Broadwell Sebastian Fricke (1): soc/stm/stm32_sub_sai: Add missing '\n' in log messages Sebastian Reichel (1): ASoC: sgtl5000: Fix VAG power-on handling Shengjiu Wang (1): ASoC: wm8960: Fix wrong clock after suspend & resume Srinivas Kandagatla (1): ASoC: wsa881x: mark read_only_wordlength flag Stephan Gerhold (2): ASoC: soc-pcm: dpcm: Only allow playback/capture if supported ASoC: q6dsp6: q6afe-dai: add missing channels to MI2S DAIs YueHaibing (1): ASoC: wm89xx: Add missing dependency .../devicetree/bindings/sound/rockchip-i2s.yaml | 3 + .../devicetree/bindings/sound/rockchip-spdif.txt | 45 ------- .../devicetree/bindings/sound/rockchip-spdif.yaml | 101 ++++++++++++++ include/sound/soc-dai.h | 1 - include/sound/soc.h | 3 + sound/soc/amd/acp3x-rt5682-max9836.c | 6 +- sound/soc/codecs/Kconfig | 3 + sound/soc/codecs/hdac_hdmi.c | 6 +- sound/soc/codecs/madera.c | 4 - sound/soc/codecs/sgtl5000.c | 34 +++++ sound/soc/codecs/sgtl5000.h | 1 + sound/soc/codecs/tas571x.c | 20 ++- sound/soc/codecs/wm8960.c | 3 +- sound/soc/codecs/wsa881x.c | 4 + sound/soc/intel/common/soc-acpi-intel-cml-match.c | 8 -- sound/soc/intel/common/soc-acpi-intel-icl-match.c | 8 -- sound/soc/meson/axg-card.c | 4 +- sound/soc/meson/gx-card.c | 4 +- sound/soc/qcom/apq8096.c | 4 +- sound/soc/qcom/qdsp6/q6afe-dai.c | 16 +++ sound/soc/qcom/sdm845.c | 4 +- sound/soc/samsung/s3c-i2s-v2.c | 57 -------- sound/soc/samsung/s3c2412-i2s.c | 56 ++++++++ sound/soc/sh/rcar/ssi.c | 11 +- sound/soc/sh/rcar/ssiu.c | 2 +- sound/soc/soc-dai.c | 11 +- sound/soc/soc-dapm.c | 147 +++++++++++---------- sound/soc/soc-pcm.c | 13 +- sound/soc/soc-topology.c | 115 ++++++++++++---- sound/soc/sof/intel/bdw.c | 16 +++ sound/soc/sof/intel/byt.c | 48 +++++++ sound/soc/stm/stm32_sai_sub.c | 14 +- 32 files changed, 509 insertions(+), 263 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/rockchip-spdif.txt create mode 100644 Documentation/devicetree/bindings/sound/rockchip-spdif.yaml

2 1

[PATCH v2] ASoC: intel/skl/hda - fix oops on systems without i915 audio codec
by Kai Vehmanen 21 Apr '20

21 Apr '20

Recent fix for jack detection caused a regression on systems with HDA audio codec but no HDMI/DP audio via i915 graphics, leading to a kernel oops at device probe. On these systems, HDA bus instance lookup fails, as the first ASoC runtime of the card is connected to a dummy codec (as no HDMI codec is present). Fixes: 3a24f135e6cc ("ASoC: intel/skl/hda - set autosuspend timeout for hda codecs") Signed-off-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> --- sound/soc/intel/boards/skl_hda_dsp_generic.c | 34 +++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/sound/soc/intel/boards/skl_hda_dsp_generic.c b/sound/soc/intel/boards/skl_hda_dsp_generic.c index 35f222ed9912..fc9290fb4e99 100644 --- a/sound/soc/intel/boards/skl_hda_dsp_generic.c +++ b/sound/soc/intel/boards/skl_hda_dsp_generic.c @@ -172,23 +172,25 @@ static int skl_hda_fill_card_info(struct snd_soc_acpi_mach_params *mach_params) static void skl_set_hda_codec_autosuspend_delay(struct snd_soc_card *card) { - struct snd_soc_pcm_runtime *rtd = - list_first_entry(&card->rtd_list, - struct snd_soc_pcm_runtime, list); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd; struct hdac_hda_priv *hda_pvt; - - if (!codec_dai) - return; - - /* - * all codecs are on the same bus, so it's sufficient - * to lookup the first runtime and its codec, and set - * power save defaults for all codecs on the bus - */ - hda_pvt = snd_soc_component_get_drvdata(codec_dai->component); - snd_hda_set_power_save(hda_pvt->codec.bus, - HDA_CODEC_AUTOSUSPEND_DELAY_MS); + struct snd_soc_dai *dai; + + for_each_card_rtds(card, rtd) { + if (!strstr(rtd->dai_link->codecs->name, "ehdaudio")) + continue; + dai = asoc_rtd_to_codec(rtd, 0); + hda_pvt = snd_soc_component_get_drvdata(dai->component); + if (hda_pvt) { + /* + * all codecs are on the same bus, so it's sufficient + * to look up only the first one + */ + snd_hda_set_power_save(hda_pvt->codec.bus, + HDA_CODEC_AUTOSUSPEND_DELAY_MS); + break; + } + } } static int skl_hda_audio_probe(struct platform_device *pdev) -- 2.26.0

3 4

[PATCH] ASoC: intel/skl/hda - fix oops on systems without i915 audio codec
by Kai Vehmanen 21 Apr '20

21 Apr '20

Recent fix for jack detection caused a regression on systems with HDA audio codec but no HDMI/DP audio via i915 graphics, leading to a kernel oops at device probe. On these systems, HDA bus instance lookup fails, as the first ASoC runtime of the card is connected to a dummy codec (as no HDMI codec is present). Fixes: 3a24f135e6cc ("ASoC: intel/skl/hda - set autosuspend timeout for hda codecs") Signed-off-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> --- sound/soc/intel/boards/skl_hda_dsp_generic.c | 34 +++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/sound/soc/intel/boards/skl_hda_dsp_generic.c b/sound/soc/intel/boards/skl_hda_dsp_generic.c index 35f222ed9912..fc9290fb4e99 100644 --- a/sound/soc/intel/boards/skl_hda_dsp_generic.c +++ b/sound/soc/intel/boards/skl_hda_dsp_generic.c @@ -172,23 +172,25 @@ static int skl_hda_fill_card_info(struct snd_soc_acpi_mach_params *mach_params) static void skl_set_hda_codec_autosuspend_delay(struct snd_soc_card *card) { - struct snd_soc_pcm_runtime *rtd = - list_first_entry(&card->rtd_list, - struct snd_soc_pcm_runtime, list); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_pcm_runtime *rtd; struct hdac_hda_priv *hda_pvt; - - if (!codec_dai) - return; - - /* - * all codecs are on the same bus, so it's sufficient - * to lookup the first runtime and its codec, and set - * power save defaults for all codecs on the bus - */ - hda_pvt = snd_soc_component_get_drvdata(codec_dai->component); - snd_hda_set_power_save(hda_pvt->codec.bus, - HDA_CODEC_AUTOSUSPEND_DELAY_MS); + struct snd_soc_dai *dai; + + for_each_card_rtds(card, rtd) { + if (!strstr(rtd->dai_link->codecs->name, "ehdaudio")) + continue; + dai = asoc_rtd_to_codec(rtd, 0); + hda_pvt = snd_soc_component_get_drvdata(dai->component); + if (hda_pvt) { + /* + * all codecs are on the same bus, so it's sufficient + * to look up only the first one + */ + snd_hda_set_power_save(hda_pvt->codec.bus, + HDA_CODEC_AUTOSUSPEND_DELAY_MS); + break; + } + } } static int skl_hda_audio_probe(struct platform_device *pdev) -- 2.26.0

2 2

[PATCH] ASoC: txx9: add back the hack for a too small resource_size_t
by Christoph Hellwig 21 Apr '20

21 Apr '20

Looks like I misread the Kconfig magic and this driver can be compiled into 32-bit kernels. Add back the hack to extent the range of the resource_size_t, and include the header with the txx9-specific ioremap magic for that. Fixes: acfaaf52ebfd ("ASoC: txx9: don't work around too small resource_size_t") Signed-off-by: Christoph Hellwig <hch(a)lst.de> --- sound/soc/txx9/txx9aclc-ac97.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sound/soc/txx9/txx9aclc-ac97.c b/sound/soc/txx9/txx9aclc-ac97.c index 7402448bdb09..d9e348444bd0 100644 --- a/sound/soc/txx9/txx9aclc-ac97.c +++ b/sound/soc/txx9/txx9aclc-ac97.c @@ -14,6 +14,7 @@ #include <linux/interrupt.h> #include <linux/io.h> #include <linux/gfp.h> +#include <asm/mach-tx39xx/ioremap.h> /* for TXX9_DIRECTMAP_BASE */ #include <sound/core.h> #include <sound/pcm.h> #include <sound/soc.h> @@ -175,8 +176,6 @@ static int txx9aclc_ac97_dev_probe(struct platform_device *pdev) int err; int irq; - BUILD_BUG_ON(sizeof(drvdata->physbase) > sizeof(r->start)); - irq = platform_get_irq(pdev, 0); if (irq < 0) return irq; @@ -192,6 +191,10 @@ static int txx9aclc_ac97_dev_probe(struct platform_device *pdev) platform_set_drvdata(pdev, drvdata); drvdata->physbase = r->start; + if (sizeof(drvdata->physbase) > sizeof(r->start) && + r->start >= TXX9_DIRECTMAP_BASE && + r->start < TXX9_DIRECTMAP_BASE + 0x400000) + drvdata->physbase |= 0xf00000000ull; err = devm_request_irq(&pdev->dev, irq, txx9aclc_ac97_irq, 0, dev_name(&pdev->dev), drvdata); if (err < 0) -- 2.26.1

3 2

[PATCH v2 0/8] ASoC: add snd_compress_ops and replace
by Kuninori Morimoto 21 Apr '20

21 Apr '20

Hi Mark Current snd_soc_component_driver has compr_ops, but it is created for ALSA, not for ALSA SoC. This means it doesn't know the callback is for which component, thus, each callback needs to get component via lookup function. It is not good design, and will not work in the future, because ASoC can have multipul same name component which current lookup function can't handle. This v2 patch-set adds new snd_compress_ops and call callbacks with component. v1 is here Link: https://lore.kernel.org/alsa-devel/87blnqpuqp.wl-kuninori.morimoto.gx@renes… Kuninori Morimoto (8): ASoC: soc-compress: add snd_compress_ops ASoC: codec: wm_adsp: use snd_compress_ops ASoC: uniphier: use snd_compress_ops ASoC: qcom: q6sp6: use snd_compress_ops ASoC: intel: atom: use snd_compress_ops ASoC: sof: use snd_compress_ops ASoC: sprd: use snd_compress_ops ASoC: soc-compress: remove snd_compr_ops include/sound/soc-component.h | 40 ++++++++- sound/soc/codecs/cs47l15.c | 9 +- sound/soc/codecs/cs47l24.c | 8 +- sound/soc/codecs/cs47l35.c | 9 +- sound/soc/codecs/cs47l85.c | 9 +- sound/soc/codecs/cs47l90.c | 9 +- sound/soc/codecs/cs47l92.c | 9 +- sound/soc/codecs/wm5102.c | 9 +- sound/soc/codecs/wm5110.c | 8 +- sound/soc/codecs/wm_adsp.c | 18 ++-- sound/soc/codecs/wm_adsp.h | 18 ++-- .../intel/atom/sst-mfld-platform-compress.c | 43 +++++---- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 2 +- sound/soc/intel/atom/sst-mfld-platform.h | 2 +- sound/soc/qcom/qdsp6/q6asm-dai.c | 51 ++++++----- sound/soc/soc-compress.c | 89 ++++++++++--------- sound/soc/sof/compress.c | 7 +- sound/soc/sof/compress.h | 7 +- sound/soc/sof/pcm.c | 4 +- sound/soc/sof/sof-priv.h | 2 +- sound/soc/sprd/sprd-pcm-compress.c | 49 +++++----- sound/soc/sprd/sprd-pcm-dma.c | 2 +- sound/soc/sprd/sprd-pcm-dma.h | 2 +- sound/soc/uniphier/aio-compress.c | 45 ++++++---- sound/soc/uniphier/aio-dma.c | 2 +- sound/soc/uniphier/aio.h | 2 +- 26 files changed, 265 insertions(+), 190 deletions(-) -- 2.17.1

4 13