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

[PATCH RESEND 1/2] ASoC: amd: update spdx license for acp machine driver
by Vijendar Mukunda 29 Mar '21

29 Mar '21

update SPDX license for acp machine driver. Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> --- sound/soc/amd/acp-da7219-max98357a.c | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c index e65e007..84e3906 100644 --- a/sound/soc/amd/acp-da7219-max98357a.c +++ b/sound/soc/amd/acp-da7219-max98357a.c @@ -1,27 +1,8 @@ -/* - * Machine driver for AMD ACP Audio engine using DA7219 & MAX98357 codec - * - * Copyright 2017 Advanced Micro Devices, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - * - */ +// SPDX-License-Identifier: MIT +// +// Machine driver for AMD ACP Audio engine using DA7219, RT5682 & MAX98357 codec +// +//Copyright 2017-2021 Advanced Micro Devices, Inc. #include <sound/core.h> #include <sound/soc.h> -- 2.7.4

4 4

[PATCH] ASoC: fsl_rpmsg: initialise pointers to NULL
by Shengjiu Wang 29 Mar '21

29 Mar '21

This fixes the following sparse warnings: sound/soc/fsl/fsl_rpmsg.c:45:45: sparse: sparse: Using plain integer as NULL pointer sound/soc/fsl/fsl_rpmsg.c:45:56: sparse: sparse: Using plain integer as NULL pointer Fixes: b73d9e6225e8 ("ASoC: fsl_rpmsg: Add CPU DAI driver for audio base on rpmsg") Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> Reported-by: kernel test robot <lkp(a)intel.com> --- sound/soc/fsl/fsl_rpmsg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/fsl/fsl_rpmsg.c b/sound/soc/fsl/fsl_rpmsg.c index 2d09d8850e2c..ea5c973e2e84 100644 --- a/sound/soc/fsl/fsl_rpmsg.c +++ b/sound/soc/fsl/fsl_rpmsg.c @@ -42,7 +42,7 @@ static int fsl_rpmsg_hw_params(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct fsl_rpmsg *rpmsg = snd_soc_dai_get_drvdata(dai); - struct clk *p = rpmsg->mclk, *pll = 0, *npll = 0; + struct clk *p = rpmsg->mclk, *pll = NULL, *npll = NULL; u64 rate = params_rate(params); int ret = 0; -- 2.17.1

2 1

[PATCH -next] ASoC: dwc: Fix -Wmissing-prototypes warnings
by YueHaibing 29 Mar '21

29 Mar '21

while CONFIG_SND_DESIGNWARE_PCM is not set, building with W=1 shows this: sound/soc/dwc/local.h:127:6: warning: no previous prototype for ‘dw_pcm_push_tx’ [-Wmissing-prototypes] void dw_pcm_push_tx(struct dw_i2s_dev *dev) { } ^~~~~~~~~~~~~~ sound/soc/dwc/local.h:128:6: warning: no previous prototype for ‘dw_pcm_pop_rx’ [-Wmissing-prototypes] void dw_pcm_pop_rx(struct dw_i2s_dev *dev) { } ^~~~~~~~~~~~~ sound/soc/dwc/local.h:129:5: warning: no previous prototype for ‘dw_pcm_register’ [-Wmissing-prototypes] int dw_pcm_register(struct platform_device *pdev) ^~~~~~~~~~~~~~~ Change these to inline functions to fix the warnings. Signed-off-by: YueHaibing <yuehaibing(a)huawei.com> --- sound/soc/dwc/local.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/dwc/local.h b/sound/soc/dwc/local.h index 91dc70a826f8..1c361eb6127e 100644 --- a/sound/soc/dwc/local.h +++ b/sound/soc/dwc/local.h @@ -124,9 +124,9 @@ void dw_pcm_push_tx(struct dw_i2s_dev *dev); void dw_pcm_pop_rx(struct dw_i2s_dev *dev); int dw_pcm_register(struct platform_device *pdev); #else -void dw_pcm_push_tx(struct dw_i2s_dev *dev) { } -void dw_pcm_pop_rx(struct dw_i2s_dev *dev) { } -int dw_pcm_register(struct platform_device *pdev) +static inline void dw_pcm_push_tx(struct dw_i2s_dev *dev) { } +static inline void dw_pcm_pop_rx(struct dw_i2s_dev *dev) { } +static inline int dw_pcm_register(struct platform_device *pdev) { return -EINVAL; } -- 2.17.1

2 1

[PATCH -next] ASoC: amd: acp-da7219-max98357a: Fix -Wunused-variable warning
by YueHaibing 29 Mar '21

29 Mar '21

While ACPI is not set, make W=1 warns: sound/soc/amd/acp-da7219-max98357a.c:684:28: warning: ‘cz_rt5682_card’ defined but not used [-Wunused-variable] static struct snd_soc_card cz_rt5682_card = { ^~~~~~~~~~~~~~ sound/soc/amd/acp-da7219-max98357a.c:671:28: warning: ‘cz_card’ defined but not used [-Wunused-variable] static struct snd_soc_card cz_card = { Use #ifdef block to guard this. Signed-off-by: YueHaibing <yuehaibing(a)huawei.com> --- sound/soc/amd/acp-da7219-max98357a.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c index e65e007fc604..1bf0458e22a8 100644 --- a/sound/soc/amd/acp-da7219-max98357a.c +++ b/sound/soc/amd/acp-da7219-max98357a.c @@ -47,13 +47,15 @@ #define DUAL_CHANNEL 2 #define RT5682_PLL_FREQ (48000 * 512) +extern bool bt_uart_enable; +void *acp_soc_is_rltk_max(struct device *dev); + +#ifdef CONFIG_ACPI static struct snd_soc_jack cz_jack; static struct clk *da7219_dai_wclk; static struct clk *da7219_dai_bclk; static struct clk *rt5682_dai_wclk; static struct clk *rt5682_dai_bclk; -extern bool bt_uart_enable; -void *acp_soc_is_rltk_max(struct device *dev); static int cz_da7219_init(struct snd_soc_pcm_runtime *rtd) { @@ -692,6 +694,7 @@ static struct snd_soc_card cz_rt5682_card = { .controls = cz_mc_controls, .num_controls = ARRAY_SIZE(cz_mc_controls), }; +#endif void *acp_soc_is_rltk_max(struct device *dev) { -- 2.17.1

2 1

Re: [PATCH v2] ASoC: rt1019: add rt1019 amplifier driver
by Mark Brown 29 Mar '21

29 Mar '21

On Mon, Mar 29, 2021 at 08:09:26AM +0000, Jack Yu wrote: > > Bindings should also be sent to the DT list. get_maintainer.pl will tell you this. > 1. Does it mean I should add my name in MAINTAINERS? It means you should have sent the patch with the binding changes to the DT list and maintainers as well as everyone else. > 2. Is below warning message caused by #1 question? No, it's the content of the change that's introduced problems in the binding.

1 0

Adding movable PCIe BARs support in snd_hda_intel
by Andrey Grodzovsky 29 Mar '21

29 Mar '21

Hi, I am working on adding AMD related drivers support for PCIe BARs move feature developed by Sergei (https://linuxplumbersconf.org/event/7/contributions/847/attachments/584/103…). His feature is still not upstream, all his code and mine on top can be seen here - https://cgit.freedesktop.org/~agrodzov/linux/log/?h=yadro/pcie_hotplug/mova… I did basic implementation fro amdgpu driver and now I am doing the same for snd_hda_intel to support our on GPU Azalia audio chips. This relevant commit is here - https://cgit.freedesktop.org/~agrodzov/linux/commit/?h=yadro/pcie_hotplug/m… Any driver that wants to support movable BARs needs to implement rescan_prepare, rescan_done and bar_fixed callbacks where rescan_prepare needs to stop HW/SW and unamp all MMIO mappings and rescan_done needs to ioremap the BAR from it's new MMIO location and restart HW/SW. I am able currently to trigger BARs move by sysfs using "/sys/bus/pci/rescan" and the driver will go through the sequence I described above without hangs. Problem is that after this when i try to use mplayer I am getting following errors: andrey@andrey-test:~$ sudo mplayer -ao alsa:device=hw=0.3 Downloads/file_example_MP3_5MG.mp3 MPlayer 1.3.0 (Debian), built with gcc-9 (C) 2000-2016 MPlayer Team do_connect: could not connect to socket connect: No such file or directory Failed to open LIRC support. You will not be able to use your remote control. Playing Downloads/file_example_MP3_5MG.mp3. libavformat version 58.29.100 (external) Audio only file format detected. Load subtitles in Downloads/ ========================================================================== Opening audio decoder: [mpg123] MPEG 1.0/2.0/2.5 layers I, II, III AUDIO: 44100 Hz, 2 ch, s16le, 320.0 kbit/22.68% (ratio: 40000->176400) Selected audio codec: [mpg123] afm: mpg123 (MPEG 1.0/2.0/2.5 layers I, II, III) ========================================================================== AO: [alsa] 44100Hz 2ch s16le (2 bytes per sample) Video: no video Starting playback... A: 0.1 (00.0) of 132.0 (02:12.0) ??,?% Audio device got stuck! and in dmesg I see [ 365.355518] snd_hda_codec_hdmi hdaudioC0D0: Unable to sync register 0x2f0d00. -5 Also I see 296.619014] snd_hda_intel 0000:0a:00.1: CORB reset timeout#2, CORBRP = 65535 error during the rescan_done callback execution I know it has to do with the move of BAR's MMIO address because when i disallow BAR migration by returning true from bar_fixed callback I have no such errors and mplayer works fine. I enabled MMIO trace and didn't see that post BAR move there is a wrong MMIO access - all of them are from the new MMIO base offset - 0xfcd80000 (trace attached including mmio trace and dmesg) I would be happy for any idea on this and any comment on the correctness of my sequence in the code Andrey

3 25

[PATCH 1/2] ASoC: tlv320aic32x4: Increase maximum register in regmap
by Annaliese McDermond 29 Mar '21

29 Mar '21

AIC32X4_REFPOWERUP was added as a register, but the maximum register value in the regmap and regmap range was not correspondingly increased. This caused an error when this register was attempted to be written. Fixes: ec96690 ("ASoC: tlv320aic32x4: Enable fast charge") Cc: stable(a)vger.kernel.org Signed-off-by: Annaliese McDermond <nh6z(a)nh6z.net> --- sound/soc/codecs/tlv320aic32x4.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c index f04f88c8d425..1ac3b3b12dc6 100644 --- a/sound/soc/codecs/tlv320aic32x4.c +++ b/sound/soc/codecs/tlv320aic32x4.c @@ -577,12 +577,12 @@ static const struct regmap_range_cfg aic32x4_regmap_pages[] = { .window_start = 0, .window_len = 128, .range_min = 0, - .range_max = AIC32X4_RMICPGAVOL, + .range_max = AIC32X4_REFPOWERUP, }, }; const struct regmap_config aic32x4_regmap_config = { - .max_register = AIC32X4_RMICPGAVOL, + .max_register = AIC32X4_REFPOWERUP, .ranges = aic32x4_regmap_pages, .num_ranges = ARRAY_SIZE(aic32x4_regmap_pages), }; -- 2.27.0

1 0

[PATCH 2/2] ASoC: tlv320aic32x4: Register clocks before registering component
by Annaliese McDermond 29 Mar '21

29 Mar '21

Clock registration must be performed before the component is registered. aic32x4_component_probe attempts to get all the clocks right off the bat. If the component is registered before the clocks there is a race condition where the clocks may not be registered by the time aic32x4_componet_probe actually runs. Fixes: d1c859d ("ASoC: codec: tlv3204: Increased maximum supported channels") Cc: stable(a)vger.kernel.org Signed-off-by: Annaliese McDermond <nh6z(a)nh6z.net> --- sound/soc/codecs/tlv320aic32x4.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c index 1ac3b3b12dc6..b689f26fc4be 100644 --- a/sound/soc/codecs/tlv320aic32x4.c +++ b/sound/soc/codecs/tlv320aic32x4.c @@ -1243,6 +1243,10 @@ int aic32x4_probe(struct device *dev, struct regmap *regmap) if (ret) goto err_disable_regulators; + ret = aic32x4_register_clocks(dev, aic32x4->mclk_name); + if (ret) + goto err_disable_regulators; + ret = devm_snd_soc_register_component(dev, &soc_component_dev_aic32x4, &aic32x4_dai, 1); if (ret) { @@ -1250,10 +1254,6 @@ int aic32x4_probe(struct device *dev, struct regmap *regmap) goto err_disable_regulators; } - ret = aic32x4_register_clocks(dev, aic32x4->mclk_name); - if (ret) - goto err_disable_regulators; - return 0; err_disable_regulators: -- 2.27.0

1 0

[PATCH 0/2] ASoC: tlv320aic32x4: Bugfixes for tlv320aic32x4 driver
by Annaliese McDermond 29 Mar '21

29 Mar '21

These are a couple of bugfixes for the tlv320aic32x4 driver that we discovered after the Raspberry Pi Foundation's move to the 5.10 kernel. The first increases the maximum value in the regmap configuration so that the powerup command actually works. The second changes the ordering of the clock registration in the module probe function so that the clocks are properly registered before the component probe function runs. Annaliese McDermond (2): ASoC: tlv320aic32x4: Increase maximum register in regmap ASoC: tlv320aic32x4: Register clocks before registering component sound/soc/codecs/tlv320aic32x4.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.27.0

1 0

[PATCH 1/2] ALSA: hda: Re-add dropped snd_poewr_change_state() calls
by Takashi Iwai 29 Mar '21

29 Mar '21

The card power state change via snd_power_change_state() at the system suspend/resume seems dropped mistakenly during the PM code rewrite. The card power state doesn't play much role nowadays but it's still referred in a few places such as the HDMI codec driver. This patch restores them, but in a more appropriate place now in the prepare and complete callbacks. Fixes: f5dac54d9d93 ("ALSA: hda: Separate runtime and system suspend") Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/hda_intel.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 5b492c3f816c..12e51ac973c4 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1025,6 +1025,7 @@ static int azx_prepare(struct device *dev) chip = card->private_data; chip->pm_prepared = 1; + snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); /* HDA controller always requires different WAKEEN for runtime suspend * and system suspend, so don't use direct-complete here. @@ -1038,6 +1039,7 @@ static void azx_complete(struct device *dev) struct azx *chip; chip = card->private_data; + snd_power_change_state(card, SNDRV_CTL_POWER_D0); chip->pm_prepared = 0; } -- 2.26.2

1 1