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

[GIT PULL] ASoC fixes for v5.8-rc2
by broonie＠kernel.org 22 Jun '20

22 Jun '20

The following changes since commit 44ce45f866c1606f03a411fb2d2c0db4626403a6: Merge series "ASoC: Fix dailink checks for DPCM" from Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com>: (2020-06-09 15:46:20 +0100) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v5.8-rc2 for you to fetch changes up to f141a422159a199f4c8dedb7e0df55b3b2cf16cd: ASoC: rockchip: Fix a reference count leak. (2020-06-18 17:21:58 +0100) ---------------------------------------------------------------- ASoC: Fixes for v5.8 This is a collection of mostly small fixes, mostly fixing fallout from some of the DPCM changes that went in last time around which shook out some issues on i.MX and Qualcomm platforms. The addition of a managed version of snd_soc_register_dai() is to fix resource leaks. There's also a few new device IDs for x86 systems. ---------------------------------------------------------------- Brent Lu (1): ASoC: SOF: Intel: hda: Clear RIRB status before reading WP Jack Yu (1): ASoC: rt1015: Update rt1015 default register value according to spec modification. Mark Brown (2): Merge series "ASoC: topology: fix use-after-free when removing components" from Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com>: Merge series "ASoC: SOF: Intel: update PCI IDs" from Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com>: Pierre-Louis Bossart (7): ASoC: soc-devres: add devm_snd_soc_register_dai() ASoC: soc-topology: use devm_snd_soc_register_dai() ASoC: soc-pcm: fix checks for multi-cpu FE dailinks ASoC: Intel: SOF: merge COMETLAKE_LP and COMETLAKE_H ASoC: SOF: Intel: add PCI ID for CometLake-S ASoC: SOF: Intel: add PCI IDs for ICL-H and TGL-H ASoC: hdac_hda: fix memleak with regmap not freed on remove Qiushi Wu (1): ASoC: rockchip: Fix a reference count leak. Ravulapati Vishnu vardhan rao (1): ASoC: amd: closing specific instance. Shengjiu Wang (5): ASoC: soc-card: export snd_soc_lookup_component_nolocked ASoC: dmaengine_pcm: export soc_component_to_pcm ASoC: fsl_asrc_dma: Reuse the dma channel if available in Back-End ASoC: fsl_asrc_dma: Fix data copying speed issue with EDMA ASoC: fsl_ssi: Fix bclk calculation for mono channel Srinivas Kandagatla (3): ASoC: q6asm: handle EOS correctly ASoc: q6afe: add support to get port direction ASoC: qcom: common: set correct directions for dailinks Steve Lee (1): ASoC: max98390: Update regmap readable reg and volatile derek.fang (1): ASoC: rt5682: Let dai clks be registered whether mclk exists or not include/sound/dmaengine_pcm.h | 11 +++ include/sound/soc.h | 6 ++ sound/hda/intel-dsp-config.c | 4 +- sound/soc/amd/raven/acp3x-pcm-dma.c | 30 ++++++-- sound/soc/codecs/hdac_hda.c | 16 +++-- sound/soc/codecs/max98390.c | 6 +- sound/soc/codecs/rt1015.c | 124 ++++++++++++++++++++-------------- sound/soc/codecs/rt1015.h | 15 +++- sound/soc/codecs/rt5682.c | 11 +-- sound/soc/fsl/fsl_asrc_common.h | 2 + sound/soc/fsl/fsl_asrc_dma.c | 47 +++++++++---- sound/soc/fsl/fsl_ssi.c | 13 ++-- sound/soc/intel/boards/Kconfig | 4 +- sound/soc/qcom/common.c | 14 +++- sound/soc/qcom/qdsp6/q6afe.c | 8 +++ sound/soc/qcom/qdsp6/q6afe.h | 1 + sound/soc/qcom/qdsp6/q6asm.c | 7 +- sound/soc/rockchip/rockchip_pdm.c | 4 +- sound/soc/soc-core.c | 3 +- sound/soc/soc-devres.c | 37 ++++++++++ sound/soc/soc-generic-dmaengine-pcm.c | 12 ---- sound/soc/soc-pcm.c | 6 +- sound/soc/soc-topology.c | 3 +- sound/soc/sof/intel/Kconfig | 29 +++----- sound/soc/sof/intel/hda-stream.c | 9 ++- sound/soc/sof/sof-pci-dev.c | 24 ++++--- 26 files changed, 295 insertions(+), 151 deletions(-)

2 1

[PATCH AUTOSEL 5.7 130/388] ASoC: Fix wrong dependency of da7210 and wm8983
by Sasha Levin 22 Jun '20

22 Jun '20

From: Wei Li <liwei391(a)huawei.com> [ Upstream commit c1c050ee74d67aeb879fd38e3a07139d7fdb79f4 ] As these two drivers support I2C and SPI, we should add the SND_SOC_I2C_AND_SPI dependency instead. Fixes: ce0c97f8a2936 ("ASoC: Fix SND_SOC_ALL_CODECS imply SPI fallout") Signed-off-by: Wei Li <liwei391(a)huawei.com> Link: https://lore.kernel.org/r/20200420202410.47327-3-liwei391@huawei.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/codecs/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 8cdc68c141dc..7d2cbed55a9d 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -717,7 +717,7 @@ config SND_SOC_L3 config SND_SOC_DA7210 tristate - depends on I2C + depends on SND_SOC_I2C_AND_SPI config SND_SOC_DA7213 tristate "Dialog DA7213 CODEC" @@ -1569,7 +1569,7 @@ config SND_SOC_WM8978 config SND_SOC_WM8983 tristate - depends on I2C + depends on SND_SOC_I2C_AND_SPI config SND_SOC_WM8985 tristate "Wolfson Microelectronics WM8985 and WM8758 codec driver" -- 2.25.1

2 4

[PATCH] soundwire: qcom: Constify static structs
by Rikard Falkeborn 22 Jun '20

22 Jun '20

qcom_swrm_port_ops and qcom_swrm_ops are not modified and can be made const to allow the compiler to put them in read-only memory. Before: text data bss dec hex filename 18266 3056 256 21578 544a drivers/soundwire/qcom.o After: text data bss dec hex filename 18426 2896 256 21578 544a drivers/soundwire/qcom.o Signed-off-by: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> --- drivers/soundwire/qcom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index a1c2a44a3b4d..915c2cf0c274 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -406,13 +406,13 @@ static int qcom_swrm_port_enable(struct sdw_bus *bus, return ctrl->reg_write(ctrl, reg, val); } -static struct sdw_master_port_ops qcom_swrm_port_ops = { +static const struct sdw_master_port_ops qcom_swrm_port_ops = { .dpn_set_port_params = qcom_swrm_port_params, .dpn_set_port_transport_params = qcom_swrm_transport_params, .dpn_port_enable_ch = qcom_swrm_port_enable, }; -static struct sdw_master_ops qcom_swrm_ops = { +static const struct sdw_master_ops qcom_swrm_ops = { .xfer_msg = qcom_swrm_xfer_msg, .pre_bank_switch = qcom_swrm_pre_bank_switch, }; -- 2.27.0

2 1

[PATCH v2 0/6] soundwire: intel: transition to 3 steps initialization
by Bard Liao 22 Jun '20

22 Jun '20

This series is to split the original "soundwire: intel: transition to 3 steps initialization" patch into different patches for better review. It also address comments from Vinod. Pierre-Louis Bossart (6): soundwire: intel: cleanups for indirections/logs soundwire: intel: clarify drvdata and remove more indirections soundwire: intel_init: remove useless test soundwire: intel_init: use devm_ allocation soundwire: intel_init: pass link information as platform data soundwire: intel: transition to 3 steps initialization drivers/soundwire/intel.c | 138 +++++++++-------- drivers/soundwire/intel.h | 13 ++ drivers/soundwire/intel_init.c | 261 ++++++++++++++++++++++++++------- 3 files changed, 295 insertions(+), 117 deletions(-) -- 2.17.1

2 7

[PATCH] soundwire: intel: fix memory leak with devm_kasprintf
by Pierre-Louis Bossart 22 Jun '20

22 Jun '20

The dais are allocated with devm_kcalloc() but their name isn't resourced managed and never freed. Fix by also using devm_ for the dai names as well. Fixes: c46302ec554c5 ('soundwire: intel: Add audio DAI ops') Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Daniel Baluta <daniel.baluta(a)gmail.com> Reviewed-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Reviewed-by: Rander Wang <rander.wang(a)linux.intel.com> Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski(a)linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> --- drivers/soundwire/intel.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c index 4cfdd074e310..c7422740edd4 100644 --- a/drivers/soundwire/intel.c +++ b/drivers/soundwire/intel.c @@ -930,8 +930,9 @@ static int intel_create_dai(struct sdw_cdns *cdns, /* TODO: Read supported rates/formats from hardware */ for (i = off; i < (off + num); i++) { - dais[i].name = kasprintf(GFP_KERNEL, "SDW%d Pin%d", - cdns->instance, i); + dais[i].name = devm_kasprintf(cdns->dev, GFP_KERNEL, + "SDW%d Pin%d", + cdns->instance, i); if (!dais[i].name) return -ENOMEM; -- 2.20.1

2 1

[PATCH] soundwire: bus: clock_stop: don't deal with UNATTACHED Slave devices
by Bard Liao 22 Jun '20

22 Jun '20

We don't need to do anything for the slave if it is unattached during clock stop prepare and exit sequences. Signed-off-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> --- drivers/soundwire/bus.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c index 2289c2ac8c5a..405335fb790a 100644 --- a/drivers/soundwire/bus.c +++ b/drivers/soundwire/bus.c @@ -863,13 +863,13 @@ int sdw_bus_prep_clk_stop(struct sdw_bus *bus) if (!slave->dev_num) continue; - /* Identify if Slave(s) are available on Bus */ - is_slave = true; - if (slave->status != SDW_SLAVE_ATTACHED && slave->status != SDW_SLAVE_ALERT) continue; + /* Identify if Slave(s) are available on Bus */ + is_slave = true; + slave_mode = sdw_get_clk_stop_mode(slave); slave->curr_clk_stop_mode = slave_mode; @@ -900,6 +900,10 @@ int sdw_bus_prep_clk_stop(struct sdw_bus *bus) return ret; } + /* Don't need to inform slaves if there is no slave attached */ + if (!is_slave) + return ret; + /* Inform slaves that prep is done */ list_for_each_entry(slave, &bus->slaves, node) { if (!slave->dev_num) @@ -985,13 +989,13 @@ int sdw_bus_exit_clk_stop(struct sdw_bus *bus) if (!slave->dev_num) continue; - /* Identify if Slave(s) are available on Bus */ - is_slave = true; - if (slave->status != SDW_SLAVE_ATTACHED && slave->status != SDW_SLAVE_ALERT) continue; + /* Identify if Slave(s) are available on Bus */ + is_slave = true; + mode = slave->curr_clk_stop_mode; if (mode == SDW_CLK_STOP_MODE1) { @@ -1016,6 +1020,13 @@ int sdw_bus_exit_clk_stop(struct sdw_bus *bus) if (is_slave && !simple_clk_stop) sdw_bus_wait_for_clk_prep_deprep(bus, SDW_BROADCAST_DEV_NUM); + /* + * Don't need to call slave callback function if there is no slave + * attached + */ + if (!is_slave) + return 0; + list_for_each_entry(slave, &bus->slaves, node) { if (!slave->dev_num) continue; -- 2.17.1

2 1

[PATCH alsa-lib 1/2] pcm: dmix: Fix semaphore usage
by Takashi Iwai 22 Jun '20

22 Jun '20

As Maarten Baert recently reported, the current dmix code applies the semaphore unnecessarily around mixing streams even when the lockless mix operation is used on x86. This was rather introduced mistakenly at the commit 267d7c728196 ("Add support of little-endian on i386/x86_64 dmix") where the generic dmix code was included on x86, too. For achieving the original performance back, this patch changes the semaphore handling to be checked at run time instead of statically at compile time. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- src/pcm/pcm_direct.h | 1 + src/pcm/pcm_dmix.c | 18 +++++++++++------- src/pcm/pcm_dmix_generic.c | 2 +- src/pcm/pcm_dmix_i386.c | 1 + src/pcm/pcm_dmix_x86_64.c | 1 + 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/pcm/pcm_direct.h b/src/pcm/pcm_direct.h index 8a236970a3a1..2150bce15449 100644 --- a/src/pcm/pcm_direct.h +++ b/src/pcm/pcm_direct.h @@ -186,6 +186,7 @@ struct snd_pcm_direct { mix_areas_32_t *remix_areas_32; mix_areas_24_t *remix_areas_24; mix_areas_u8_t *remix_areas_u8; + unsigned int use_sem; } dmix; struct { unsigned long long chn_mask; diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c index 843fa3168756..e9343b19a536 100644 --- a/src/pcm/pcm_dmix.c +++ b/src/pcm/pcm_dmix.c @@ -292,13 +292,17 @@ static void remix_areas(snd_pcm_direct_t *dmix, * the area via semaphore */ #ifndef DOC_HIDDEN -#ifdef NO_CONCURRENT_ACCESS -#define dmix_down_sem(dmix) snd_pcm_direct_semaphore_down(dmix, DIRECT_IPC_SEM_CLIENT) -#define dmix_up_sem(dmix) snd_pcm_direct_semaphore_up(dmix, DIRECT_IPC_SEM_CLIENT) -#else -#define dmix_down_sem(dmix) -#define dmix_up_sem(dmix) -#endif +static void dmix_down_sem(snd_pcm_direct_t *dmix) +{ + if (dmix->u.dmix.use_sem) + snd_pcm_direct_semaphore_down(dmix, DIRECT_IPC_SEM_CLIENT); +} + +static void dmix_up_sem(snd_pcm_direct_t *dmix) +{ + if (dmix->u.dmix.use_sem) + snd_pcm_direct_semaphore_up(dmix, DIRECT_IPC_SEM_CLIENT); +} #endif /* diff --git a/src/pcm/pcm_dmix_generic.c b/src/pcm/pcm_dmix_generic.c index 40c08747a74a..8a5b6f148556 100644 --- a/src/pcm/pcm_dmix_generic.c +++ b/src/pcm/pcm_dmix_generic.c @@ -43,7 +43,6 @@ static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old, #ifndef ARCH_ADD #define ARCH_ADD(p,a) (*(p) += (a)) #define ARCH_CMPXCHG(p,a,b) (*(p)) /* fake */ -#define NO_CONCURRENT_ACCESS /* use semaphore to avoid race */ #define IS_CONCURRENT 0 /* no race check */ #endif @@ -530,6 +529,7 @@ static void generic_mix_select_callbacks(snd_pcm_direct_t *dmix) dmix->u.dmix.mix_areas_u8 = generic_mix_areas_u8; dmix->u.dmix.remix_areas_24 = generic_remix_areas_24; dmix->u.dmix.remix_areas_u8 = generic_remix_areas_u8; + dmix->u.dmix.use_sem = 1; } #endif diff --git a/src/pcm/pcm_dmix_i386.c b/src/pcm/pcm_dmix_i386.c index 1ab983a8a373..82a91c5c2897 100644 --- a/src/pcm/pcm_dmix_i386.c +++ b/src/pcm/pcm_dmix_i386.c @@ -135,4 +135,5 @@ static void mix_select_callbacks(snd_pcm_direct_t *dmix) dmix->u.dmix.mix_areas_24 = smp > 1 ? mix_areas_24_smp: mix_areas_24; dmix->u.dmix.remix_areas_24 = smp > 1 ? remix_areas_24_smp: remix_areas_24; } + dmix->u.dmix.use_sem = 0; } diff --git a/src/pcm/pcm_dmix_x86_64.c b/src/pcm/pcm_dmix_x86_64.c index 34c40d4e9d1d..4d882bfd01bf 100644 --- a/src/pcm/pcm_dmix_x86_64.c +++ b/src/pcm/pcm_dmix_x86_64.c @@ -102,4 +102,5 @@ static void mix_select_callbacks(snd_pcm_direct_t *dmix) dmix->u.dmix.remix_areas_32 = smp > 1 ? remix_areas_32_smp : remix_areas_32; dmix->u.dmix.mix_areas_24 = smp > 1 ? mix_areas_24_smp : mix_areas_24; dmix->u.dmix.remix_areas_24 = smp > 1 ? remix_areas_24_smp : remix_areas_24; + dmix->u.dmix.use_sem = 0; } -- 2.16.4

3 3

alsa-gobject: bump version up to 0.1.0 for official release
by GitHub pull_request - opened 22 Jun '20

22 Jun '20

alsa-project/alsa-gobject pull request #46 was opened from takaswie: This patch is a preparation for official v0.1.0 release. After merged, I'm going to push a tag 'v0.1.0' with release note. Request URL : https://github.com/alsa-project/alsa-gobject/pull/46 Patch URL : https://github.com/alsa-project/alsa-gobject/pull/46.patch Repository URL: https://github.com/alsa-project/alsa-gobject

1 0

[PATCH] ASoC: fsl_mqs: Fix unchecked return value for clk_prepare_enable
by Shengjiu Wang 22 Jun '20

22 Jun '20

Fix unchecked return value for clk_prepare_enable. And because clk_prepare_enable and clk_disable_unprepare should check input clock parameter is NULL or not, then we don't need to check it before calling the function. Fixes: 9e28f6532c61 ("ASoC: fsl_mqs: Add MQS component driver") Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- sound/soc/fsl/fsl_mqs.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/sound/soc/fsl/fsl_mqs.c b/sound/soc/fsl/fsl_mqs.c index 0c813a45bba7..69aeb0e71844 100644 --- a/sound/soc/fsl/fsl_mqs.c +++ b/sound/soc/fsl/fsl_mqs.c @@ -265,12 +265,20 @@ static int fsl_mqs_remove(struct platform_device *pdev) static int fsl_mqs_runtime_resume(struct device *dev) { struct fsl_mqs *mqs_priv = dev_get_drvdata(dev); + int ret; - if (mqs_priv->ipg) - clk_prepare_enable(mqs_priv->ipg); + ret = clk_prepare_enable(mqs_priv->ipg); + if (ret) { + dev_err(dev, "failed to enable ipg clock\n"); + return ret; + } - if (mqs_priv->mclk) - clk_prepare_enable(mqs_priv->mclk); + ret = clk_prepare_enable(mqs_priv->mclk); + if (ret) { + dev_err(dev, "failed to enable mclk clock\n"); + clk_disable_unprepare(mqs_priv->ipg); + return ret; + } if (mqs_priv->use_gpr) regmap_write(mqs_priv->regmap, IOMUXC_GPR2, @@ -292,11 +300,8 @@ static int fsl_mqs_runtime_suspend(struct device *dev) regmap_read(mqs_priv->regmap, REG_MQS_CTRL, &mqs_priv->reg_mqs_ctrl); - if (mqs_priv->mclk) - clk_disable_unprepare(mqs_priv->mclk); - - if (mqs_priv->ipg) - clk_disable_unprepare(mqs_priv->ipg); + clk_disable_unprepare(mqs_priv->mclk); + clk_disable_unprepare(mqs_priv->ipg); return 0; } -- 2.21.0

1 0

alsa-gobject: reorder documentation sections
by GitHub pull_request - opened 21 Jun '20

21 Jun '20

alsa-project/alsa-gobject pull request #45 was opened from takaswie: For better documentation, this patchset reorders sections of ALSATimer/ALSASeq documentation. Request URL : https://github.com/alsa-project/alsa-gobject/pull/45 Patch URL : https://github.com/alsa-project/alsa-gobject/pull/45.patch Repository URL: https://github.com/alsa-project/alsa-gobject

1 0