ASoC: meson: fix codec-to-codec link setup
Jerome Brunet
maintainercover ASoC: meson: fix codec-to-codec link setup
This patchset fixes the problem reported by Marc in this thread [0] The problem was due to an error in the meson card drivers which had the "no_pcm" dai_link property set on codec-to-codec links
[0]: https://lore.kernel.org/r/[email protected]
Jerome Brunet (2):
ASoC: meson: axg-card: fix codec-to-codec link setup
ASoC: meson: gx-card: fix codec-to-codec link setup
sound/soc/meson/axg-card.c | 4 +++- sound/soc/meson/gx-card.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)
Signature · 1 line
2.25.2
Jerome Brunet
maintainerPATCH 1/2 ASoC: meson: axg-card: fix codec-to-codec link setup
Since the addition of commit 9b5db059366a ("ASoC: soc-pcm: dpcm: Only allow playback/capture if supported"), meson-axg cards which have codec-to-codec links fail to init and Oops:
Unable to handle kernel NULL pointer dereference at virtual address 0000000000000128 Internal error: Oops: 96000044 [#1] PREEMPT SMP CPU: 3 PID: 1582 Comm: arecord Not tainted 5.7.0-rc1 pc : invalidate_paths_ep+0x30/0xe0 lr : snd_soc_dapm_dai_get_connected_widgets+0x170/0x1a8 Call trace: invalidate_paths_ep+0x30/0xe0 snd_soc_dapm_dai_get_connected_widgets+0x170/0x1a8 dpcm_path_get+0x38/0xd0 dpcm_fe_dai_open+0x70/0x920 snd_pcm_open_substream+0x564/0x840 snd_pcm_open+0xfc/0x228 snd_pcm_capture_open+0x4c/0x78 snd_open+0xac/0x1a8 ...
While initiliazing the links, ASoC treats the codec-to-codec links of this card type as a DPCM backend. This error eventually leads to the Oops.
Most of the card driver code is shared between DPCM backends and codec-to-codec links. The property "no_pcm" marking DCPM BE was left set on codec-to-codec links, leading to this problem. This commit fixes that.
--- sound/soc/meson/axg-card.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/soc/meson/axg-card.c +3 -1
@@ -338,8 +338,10 @@ static int axg_card_add_link(struct snd_soc_card *card, struct device_node *np,if (axg_card_cpu_is_tdm_iface (dai_link->cpus->of_node)) ret =axg_card_parse_tdm (card, np, index); -else if (axg_card_cpu_is_codec (dai_link->cpus->of_node)) +else if (axg_card_cpu_is_codec (dai_link->cpus->of_node)) { dai_link->params = &codec_params; + dai_link->no_pcm =0 ;/* link is not a DPCM BE */ + }return ret; }
Signature · 1 line
2.25.2
Jerome Brunet
maintainerPATCH 2/2 ASoC: meson: gx-card: fix codec-to-codec link setup
In reply to Jerome BrunetSince the addition of commit 9b5db059366a ("ASoC: soc-pcm: dpcm: Only allow playback/capture if supported"), meson-axg cards which have codec-to-codec links fail to init and Oops.
Unable to handle kernel NULL pointer dereference at virtual address 0000000000000128 Internal error: Oops: 96000044 [#1] PREEMPT SMP CPU: 3 PID: 1582 Comm: arecord Not tainted 5.7.0-rc1 pc : invalidate_paths_ep+0x30/0xe0 lr : snd_soc_dapm_dai_get_connected_widgets+0x170/0x1a8 Call trace: invalidate_paths_ep+0x30/0xe0 snd_soc_dapm_dai_get_connected_widgets+0x170/0x1a8 dpcm_path_get+0x38/0xd0 dpcm_fe_dai_open+0x70/0x920 snd_pcm_open_substream+0x564/0x840 snd_pcm_open+0xfc/0x228 snd_pcm_capture_open+0x4c/0x78 snd_open+0xac/0x1a8 ...
While this error was initially reported the axg-card type, it also applies to the gx-card type.
While initiliazing the links, ASoC treats the codec-to-codec links of this card type as a DPCM backend. This error eventually leads to the Oops.
Most of the card driver code is shared between DPCM backends and codec-to-codec links. The property "no_pcm" marking DCPM BE was left set on codec-to-codec links, leading to this problem. This commit fixes that.
--- sound/soc/meson/gx-card.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/soc/meson/gx-card.c +3 -1
@@ -108,8 +108,10 @@ static int gx_card_add_link(struct snd_soc_card *card, struct device_node *np, ret =gx_card_parse_i2s (card, np, index);/* Or apply codec to codec params if necessary */ - else if (gx_card_cpu_identify(dai_link->cpus, "CODEC CTRL")) + else if (gx_card_cpu_identify(dai_link->cpus, "CODEC CTRL")) { dai_link->params = &codec_params; + dai_link->no_pcm =0 ;/* link is not a DPCM BE */ + }return ret; }
Signature · 1 line
2.25.2
Mark Brown
maintainerQuoted 11 lines · Jerome Brunet
This patchset fixes the problem reported by Marc in this thread [0] The problem was due to an error in the meson card drivers which had the "
no_pcm"dai_linkproperty set on codec-to-codec links[0]: https://lore.kernel.org/r/[email protected]
Jerome Brunet (2):
ASoC: meson: axg-card: fix codec-to-codec link setup
ASoC: meson: gx-card: fix codec-to-codec link setup[...]
Applied to
broonie/sound.git for-5.7
Thanks!
[1/2] ASoC: meson: axg-card: fix codec-to-codec link setup
commit: 1164284270779e1865cc2046a2a01b58a1e858a9
[2/2] ASoC: meson: gx-card: fix codec-to-codec link setup
commit: de911b4e683f9c28a063bb62991f2db206c38ba4All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
This series was applied to khilman/linux-amlogic.git (refs/heads/for-next).
Hello:
This series was applied to khilman/linux-amlogic.git (refs/heads/for-next).
Quoted 11 lines · On Mon, 20 Apr 2020 13:45:09 +0200 you wrote:
This patchset fixes the problem reported by Marc in this thread [0] The problem was due to an error in the meson card drivers which had the "
no_pcm"dai_linkproperty set on codec-to-codec links[0]: https://lore.kernel.org/r/[email protected]
Jerome Brunet (2):
ASoC: meson: axg-card: fix codec-to-codec link setup
ASoC: meson: gx-card: fix codec-to-codec link setup[...]
Here is a summary with links:
- [1/2] ASoC: meson: axg-card: fix codec-to-codec link setup
https://git.kernel.org/khilman/linux-amlogic/c/1164284270779e1865cc2046a2a01b58a1e858a9 - [2/2] ASoC: meson: gx-card: fix codec-to-codec link setup https://git.kernel.org/khilman/linux-amlogic/c/de911b4e683f9c28a063bb62991f2db206c38ba4
You are awesome, thank you!
Signature · 7 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/pwbot _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic