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

[PATCH AUTOSEL 4.19 1/4] ASoC: wm_adsp: Let soc_cleanup_component_debugfs remove debugfs
by Sasha Levin 17 Aug '21

17 Aug '21

From: Lucas Tanure <tanureal(a)opensource.cirrus.com> [ Upstream commit acbf58e530416e167c3b323111f4013d9f2b0a7d ] soc_cleanup_component_debugfs will debugfs_remove_recursive the component->debugfs_root, so adsp doesn't need to also remove the same entry. By doing that adsp also creates a race with core component, which causes a NULL pointer dereference Signed-off-by: Lucas Tanure <tanureal(a)opensource.cirrus.com> Link: https://lore.kernel.org/r/20210728104416.636591-1-tanureal@opensource.cirru… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/codecs/wm_adsp.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 02c557e1f779..47a4363ebde9 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -651,7 +651,6 @@ static void wm_adsp2_init_debugfs(struct wm_adsp *dsp, static void wm_adsp2_cleanup_debugfs(struct wm_adsp *dsp) { wm_adsp_debugfs_clear(dsp); - debugfs_remove_recursive(dsp->debugfs_root); } #else static inline void wm_adsp2_init_debugfs(struct wm_adsp *dsp, -- 2.30.2

1 0

[PATCH AUTOSEL 5.4 1/5] ASoC: wm_adsp: Let soc_cleanup_component_debugfs remove debugfs
by Sasha Levin 17 Aug '21

17 Aug '21

From: Lucas Tanure <tanureal(a)opensource.cirrus.com> [ Upstream commit acbf58e530416e167c3b323111f4013d9f2b0a7d ] soc_cleanup_component_debugfs will debugfs_remove_recursive the component->debugfs_root, so adsp doesn't need to also remove the same entry. By doing that adsp also creates a race with core component, which causes a NULL pointer dereference Signed-off-by: Lucas Tanure <tanureal(a)opensource.cirrus.com> Link: https://lore.kernel.org/r/20210728104416.636591-1-tanureal@opensource.cirru… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/codecs/wm_adsp.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 13672928da99..ba776f58d524 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -745,7 +745,6 @@ static void wm_adsp2_init_debugfs(struct wm_adsp *dsp, static void wm_adsp2_cleanup_debugfs(struct wm_adsp *dsp) { wm_adsp_debugfs_clear(dsp); - debugfs_remove_recursive(dsp->debugfs_root); } #else static inline void wm_adsp2_init_debugfs(struct wm_adsp *dsp, -- 2.30.2

1 0

[PATCH AUTOSEL 5.10 1/9] ASoC: rt5682: Adjust headset volume button threshold
by Sasha Levin 17 Aug '21

17 Aug '21

From: Derek Fang <derek.fang(a)realtek.com> [ Upstream commit 6d20bf7c020f417fdef1810a22da17c126603472 ] Adjust the threshold of headset button volume+ to fix the wrong button detection issue with some brand headsets. Signed-off-by: Derek Fang <derek.fang(a)realtek.com> Link: https://lore.kernel.org/r/20210721133121.12333-1-derek.fang@realtek.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/codecs/rt5682.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c index 2e41b8c169e5..0486b1469799 100644 --- a/sound/soc/codecs/rt5682.c +++ b/sound/soc/codecs/rt5682.c @@ -44,6 +44,7 @@ static const struct reg_sequence patch_list[] = { {RT5682_I2C_CTRL, 0x000f}, {RT5682_PLL2_INTERNAL, 0x8266}, {RT5682_SAR_IL_CMD_3, 0x8365}, + {RT5682_SAR_IL_CMD_6, 0x0180}, }; void rt5682_apply_patch_list(struct rt5682_priv *rt5682, struct device *dev) -- 2.30.2

1 2

[PATCH 0/3] ASoC: ti: Use of_device_get_match_data
by Aakash Hemadri 16 Aug '21

16 Aug '21

Hi, This patch series will apply cleanly on for-next Prefer `of_device_get_match_data` over `of_match_device`. Aakash Hemadri (3): ASoC: ti: davinci-mcasp: Use of_device_get_match_data ASoC: ti: omap-mcbsp: Use of_device_get_match_data ASoC: ti: davinci-evm: Use of_device_get_match_data sound/soc/ti/davinci-evm.c | 2 +- sound/soc/ti/davinci-mcasp.c | 2 +- sound/soc/ti/omap-mcbsp.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- 2.32.0

2 7

re: ASoC: sh: Add RZ/G2L SSIF-2 driver
by Colin Ian King 16 Aug '21

16 Aug '21

Hi, Static analysis on linux-next with Coverity has detected an issue in rz_ssi_stop, sound/soc/sh/rz-ssi.c with the following commit: commit 03e786bd43410fa93e5d2459f7a43e90ff0ae801 Author: Biju Das <biju.das.jz(a)bp.renesas.com> Date: Fri Aug 13 10:11:54 2021 +0100 ASoC: sh: Add RZ/G2L SSIF-2 driver The analysis is as follows: 367 368 /* Wait for idle */ 369 timeout = 100; 370 while (--timeout) { Wrong operator used (CONSTANT_EXPRESSION_RESULT) operator_confusion: rz_ssi_reg_readl(ssi, 4) | (33554432UL /* 1UL << 25 */) is always 1/true regardless of the values of its operand. This occurs as the logical operand of if. 371 if (rz_ssi_reg_readl(ssi, SSISR) | SSISR_IIRQ) 372 break; 373 udelay(1); 374 } I suspect the & operator was intended to mask the specific bit. However I'm not sure if the intent is to detect if the SSISR_IIRQ bit should be zero or one at the point where the break should occur, hence I'm reporting this issue. Colin

2 1

[PATCH 0/9] ASoC: soc-xxx: cleanup cppcheck warning
by Kuninori Morimoto 16 Aug '21

16 Aug '21

Hi Mark Now I'm posting audio-graph-card2 patch-set, but it seems it needs longer discussion. Thus I want to post more easy patch first, and reduce my local patches. These are cppcheck warning cleanup patches for soc-xxx. Kuninori Morimoto (9): ASoC: soc-generic-dmaengine-pcm: cleanup cppcheck warning at dmaengine_pcm_hw_params() ASoC: soc-generic-dmaengine-pcm: cleanup cppcheck warning at dmaengine_pcm_new() ASoC: soc-generic-dmaengine-pcm: cleanup cppcheck warning at dmaengine_copy_user() ASoC: soc-dai: cleanup cppcheck warning at snd_soc_dai_link_set_capabilities() ASoC: soc-dai: cleanup cppcheck warning at snd_soc_pcm_dai_new() ASoC: soc-jack: cleanup cppcheck warning at snd_soc_jack_report() ASoC: soc-jack: cleanup cppcheck warning for CONFIG_GPIOLIB ASoC: soc-component: cleanup cppcheck warning at snd_soc_pcm_component_pm_runtime_get() ASoC: soc-ac97: cleanup cppcheck warning sound/soc/soc-ac97.c | 14 ++++++-------- sound/soc/soc-component.c | 4 ++-- sound/soc/soc-dai.c | 18 ++++++++---------- sound/soc/soc-generic-dmaengine-pcm.c | 9 +++------ sound/soc/soc-jack.c | 15 +++++++-------- 5 files changed, 26 insertions(+), 34 deletions(-) -- 2.25.1

2 10

[PATCH] ASoC: sh: rz-ssi: Fix dereference of noderef expression warning
by Biju Das 16 Aug '21

16 Aug '21

Fix following sparse warning: sound/soc/sh/rz-ssi.c:156:15: sparse: warning: dereference of noderef expression Signed-off-by: Biju Das <biju.das.jz(a)bp.renesas.com> Reported-by: kernel test robot <lkp(a)intel.com> --- sound/soc/sh/rz-ssi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sh/rz-ssi.c b/sound/soc/sh/rz-ssi.c index 2f9345415a15..7fa3737b90bf 100644 --- a/sound/soc/sh/rz-ssi.c +++ b/sound/soc/sh/rz-ssi.c @@ -148,7 +148,7 @@ static u32 rz_ssi_reg_readl(struct rz_ssi_priv *priv, uint reg) return readl(priv->base + reg); } -static void rz_ssi_reg_mask_setl(struct rz_ssi_priv __iomem *priv, uint reg, +static void rz_ssi_reg_mask_setl(struct rz_ssi_priv *priv, uint reg, u32 bclr, u32 bset) { u32 val; -- 2.17.1

2 1

[PATCH v3 0/8] ASoC: Intel: boards: use software node API
by Pierre-Louis Bossart 16 Aug '21

16 Aug '21

This is an update on an earlier contribution from Heikki Krogerus The function device_add_properties() is going to be removed. Replacing it with software node API equivalents. Thanks for Hans de Goede and Andy Shevchenko for their comments, suggestions and Reviewed-by tags on GitHub. The review thread can be found at https://github.com/thesofproject/linux/pull/3041) v3 changes: Fixed nit-picks from Andy: label, return value, missing commas/periods. Added Andy's Reviewed-by tag v2 changes: feedback from Andy and Hans Better error handling Codec reference is kept until the .remove callback Remove bus search to find device v1 changes from Heikki's patches: Avoid the use of devm_ routines for Baytrail machine drivers. Heikki Krogerus (1): ASoC: Intel: boards: use software node API in Atom boards Pierre-Louis Bossart (7): ASoC: Intel: boards: harden codec property handling ASoC: Intel: boards: handle errors with acpi_dev_get_first_match_dev() ASoC: Intel: boards: get codec device with ACPI instead of bus search ASoC: Intel: sof_sdw: pass card information to init/exit functions ASoC: Intel: sof_sdw_rt711*: keep codec device reference until remove ASoC: Intel: use software node API in SoundWire machines ASoC: Intel: remove device_properties for Atom boards sound/soc/intel/boards/bytcht_es8316.c | 31 ++++++++-- sound/soc/intel/boards/bytcr_rt5640.c | 60 +++++++++++++++----- sound/soc/intel/boards/bytcr_rt5651.c | 63 ++++++++++++++------- sound/soc/intel/boards/sof_sdw.c | 20 ++++--- sound/soc/intel/boards/sof_sdw_common.h | 37 +++++++----- sound/soc/intel/boards/sof_sdw_max98373.c | 3 +- sound/soc/intel/boards/sof_sdw_rt1308.c | 3 +- sound/soc/intel/boards/sof_sdw_rt1316.c | 3 +- sound/soc/intel/boards/sof_sdw_rt5682.c | 3 +- sound/soc/intel/boards/sof_sdw_rt700.c | 3 +- sound/soc/intel/boards/sof_sdw_rt711.c | 51 +++++++++-------- sound/soc/intel/boards/sof_sdw_rt711_sdca.c | 52 +++++++++-------- sound/soc/intel/boards/sof_sdw_rt715.c | 3 +- sound/soc/intel/boards/sof_sdw_rt715_sdca.c | 3 +- 14 files changed, 223 insertions(+), 112 deletions(-) -- 2.25.1

3 10

[PATCH v2 00/14] ASoC: add Audio Graph Card2 driver
by Kuninori Morimoto 16 Aug '21

16 Aug '21

Hi Mark We already have Audio-Graph-Card which is Of-Graph base general sound card driver. Basically it supports basic CPU-Codec connection, and is also supporting DPCM connection. Because it was forcibly expanded to DPCM, DT parsing is very limited and very difficult to add new features on it, for example Multi CPU/Codec support, Codec2Codec support, etc. And some users want to use Audio-Graph-Card as basic connection and expand/customize its own settings on it. This patch adds more flexible new Audio-Graph-Card2 driver for it. Audio-Graph-Card and Audio-Graph-Card2 are similar, but don't have full compatibility. The reason why I need Audio-Graph-Card2 instead of update Audio-Graph-Card is that it is very difficult to keep compatibilty. Audio-Graph-Card2 supports Normal Connection, DPCM Connection, Multi CPU/Codec Connection, Codec2Codec Connection, and possible to Customizing. This patch-set adds Audio-Graph-Card2 driver and customized driver sample, and DT settings sample which can be used for testing. To enable testing/debuging, this patch-set also adds Test-Component driver. We already have Dummy Component and/or Dummy DAI on soc-utils, but 1) we can't use it from DT, 2) it do nothing. Added new Test-Component can be used from DT, and it can indicate called function name. We can use it to trace callback order / understanding ALSA SoC behavior, etc. Sample DT settings which can be used for testing is using Test-Component. This patch set includes sample DT for custome driver and/or audio-graph-card2. You can easily try to use/test it if you added below line to your DT file. It needs below CONFIGs. It will probe sample Sound Card which has Normal/DPCM/Multi/Codec2Codec connections. #include "../../../../../sound/soc/generic/audio-graph-card2-sample.dtsi" CONFIG_SND_AUDIO_GRAPH_CARD2 CONFIG_SND_SAMPLE_CUSTOM_CARD CONFIG_SND_TEST_COMPONENT There are some notes. Because Audio Graph Card2 is still under experimental stage, it will indicate such warning when probing, and the DT might be updated/exchanged. It can use Codec2Codec, but it will start automatically when probed, and can't stop it so far. It should be updated. 1 - 2 : add Test-Component driver 3 - 9 : add Audio-Graph-Card2 driver 10 : add Audio-Graph-Card2 base custome driver sample 11 - 14 : Audio-Graph-Card2 driver / custome driver DT sample Link: https://lore.kernel.org/r/87k0xszlep.wl-kuninori.morimoto.gx@renesas.com Link: https://lore.kernel.org/r/871r8u4s6q.wl-kuninori.morimoto.gx@renesas.com v1 -> v2 - don't use "port" base for_each loop Kuninori Morimoto (14): 1 ASoC: test-component: add Test Component YAML bindings 2 ASoC: test-component: add Test Component for Sound debug/test 3 ASoC: simple-card-utils: add asoc_graph_is_ports0() 4 ASoC: simple-card-utils: add codec2codec support 5 ASoC: audio-graph-card2: add Audio Graph Card2 driver 6 ASoC: audio-graph-card2: add DPCM support 7 ASoC: audio-graph-card2: add Multi CPU/Codec support 8 ASoC: audio-graph-card2: add Codec2Codec support 9 ASoC: audio-graph-card2: add Yaml Document 10 ASoC: sample-custom-card: add Audio Graph Card2 custome sample 11 ASoC: audio-graph-card2-sample.dtsi: add Sample DT for Audio Graph Card2 12 ASoC: audio-graph-card2-sample.dtsi: add DPCM sample 13 ASoC: audio-graph-card2-sample.dtsi: add Multi CPU/Codec sample 14 ASoC: audio-graph-card2-sample.dtsi: add Codec2Codec sample. .../sound/audio-graph-card2-items.yaml | 80 ++ .../bindings/sound/audio-graph-card2.yaml | 51 + .../bindings/sound/test-component.yaml | 33 + include/sound/graph_card.h | 24 + include/sound/simple_card_utils.h | 4 + sound/soc/generic/Kconfig | 20 + sound/soc/generic/Makefile | 6 + .../soc/generic/audio-graph-card2-sample.dtsi | 140 ++ sound/soc/generic/audio-graph-card2.c | 1252 +++++++++++++++++ sound/soc/generic/sample-custom-card.c | 160 +++ sound/soc/generic/simple-card-utils.c | 46 +- sound/soc/generic/test-component.c | 659 +++++++++ 12 files changed, 2474 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/sound/audio-graph-card2-items.yaml create mode 100644 Documentation/devicetree/bindings/sound/audio-graph-card2.yaml create mode 100644 Documentation/devicetree/bindings/sound/test-component.yaml create mode 100644 sound/soc/generic/audio-graph-card2-sample.dtsi create mode 100644 sound/soc/generic/audio-graph-card2.c create mode 100644 sound/soc/generic/sample-custom-card.c create mode 100644 sound/soc/generic/test-component.c -- 2.25.1

3 30

[PATCH] ALSA: hda/realtek: Enable 4-speaker output for Dell XPS 15 9510 laptop
by Kristin Paget 15 Aug '21

15 Aug '21

The 2021-model XPS 15 appears to use the same 4-speakers-on-ALC289 audio setup as the Precision models, so requires the same quirk to enable woofer output. Tested on my own 9510. Signed-off-by: Kristin Paget <kristin(a)tombom.co.uk> --- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 218d1aa0fd14..8b72064f8321 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -8319,6 +8319,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1028, 0x0a2e, "Dell", ALC236_FIXUP_DELL_AIO_HEADSET_MIC), SND_PCI_QUIRK(0x1028, 0x0a30, "Dell", ALC236_FIXUP_DELL_AIO_HEADSET_MIC), SND_PCI_QUIRK(0x1028, 0x0a58, "Dell", ALC255_FIXUP_DELL_HEADSET_MIC), + SND_PCI_QUIRK(0x1028, 0x0a61, "Dell XPS 15 9510", ALC289_FIXUP_DUAL_SPK), SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2),

2 1