Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ASoC: Intel: soc-acpi-intel-ptl-match: add rt712_vb_l3_rt1320_l2 and rt713_vb_l3_rt1320_l12 support #5315

Open
wants to merge 2 commits into
base: topic/sof-dev
Choose a base branch
from
Open

ASoC: Intel: soc-acpi-intel-ptl-match: add rt712_vb_l3_rt1320_l2 and rt713_vb_l3_rt1320_l12 support #5315

wants to merge 2 commits into from

Conversation

ujfalusi
Copy link
Collaborator

Add rt712_vb on SDW link 3 and 1 rt1320 on SDW link 2 configuration support.

@ujfalusi ujfalusi force-pushed the peter/sof/pr/ptl-sdw-add-new-config-01 branch from f3f67f8 to 9e81c1e Compare January 31, 2025 09:48
bardliao
bardliao reviewed Feb 3, 2025
View reviewed changes
sound/soc/intel/common/soc-acpi-intel-ptl-match.c Outdated
{
.adr = 0x000230025d132000ull,
.num_endpoints = 1,
.endpoints = &single_endpoint,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should use group 1 as rt1320 works with rt712_vb's amp. IOW, rt712_vb and rt1320 are aggregated.

@ujfalusi ujfalusi force-pushed the peter/sof/pr/ptl-sdw-add-new-config-01 branch from 9e81c1e to 15d705a Compare February 3, 2025 08:13
@ujfalusi
Copy link
Collaborator Author

ujfalusi commented Feb 3, 2025

Changes since v1:

  • use group1 for rt1320

@ujfalusi ujfalusi force-pushed the peter/sof/pr/ptl-sdw-add-new-config-01 branch from 15d705a to fae423b Compare February 3, 2025 08:23
@ujfalusi
Copy link
Collaborator Author

ujfalusi commented Feb 3, 2025

Changes since v2:

  • add spk_r_endpoint for rt1320

@ujfalusi ujfalusi marked this pull request as draft February 3, 2025 11:21
bardliao
bardliao previously approved these changes Feb 3, 2025
View reviewed changes
@ujfalusi ujfalusi force-pushed the peter/sof/pr/ptl-sdw-add-new-config-01 branch from fae423b to 5e39f93 Compare February 6, 2025 07:45
@ujfalusi
Copy link
Collaborator Author

ujfalusi commented Feb 6, 2025

Changes since v2:

  • Addresses should use capital letters in hex numbers
  • corrected rt1320 address to production version
  • added new config for rt713-l3 with rt3120-l12

@ujfalusi ujfalusi marked this pull request as ready for review February 6, 2025 07:47
@ujfalusi ujfalusi changed the title ASoC: Intel: soc-acpi-intel-ptl-match: add rt712_vb_l3_rt1320_l2 support ASoC: Intel: soc-acpi-intel-ptl-match: add rt712_vb_l3_rt1320_l2 and rt713_vb_l3_rt1320_l12 support Feb 6, 2025
@ujfalusi ujfalusi force-pushed the peter/sof/pr/ptl-sdw-add-new-config-01 branch from 5e39f93 to 7089f62 Compare February 10, 2025 09:29
@ujfalusi
ASoC: Intel: soc-acpi-intel-ptl-match: add rt712_vb_l3_rt1320_l2 support
28c0373 
Add rt712_vb on SDW link 3 and 1 rt1320 on SDW link 2 configuration
support.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@ujfalusi
ASoC: Intel: soc-acpi-intel-ptl-match: add rt713_vb_l3_rt1320_l12 sup…
7089f62 
…port

Add rt713_vb on SDW link 3 and 2 rt1320 on SDW link 1 and 2 configuration
support.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@ujfalusi
Copy link
Collaborator Author

Changes since v3:

  • Fix commit message for rt713_l3-rt1320_l12

@ujfalusi ujfalusi mentioned this pull request Feb 10, 2025
Merged
plbossart
plbossart reviewed Feb 11, 2025
View reviewed changes
sound/soc/intel/common/soc-acpi-intel-ptl-match.c
.adr = 0x000230025D132001ull,
.num_endpoints = 1,
.endpoints = &spk_r_endpoint,
.name_prefix = "rt1320-1"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure I follow why this one needs to have the '-1' suffix for group 1 but the rt712 above does not. IIRC the -1 and -2 where related to amps, not groups.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The '-1' suffix will be used by the ucm. https://github.com/alsa-project/alsa-ucm-conf/blob/master/ucm2/sof-soundwire/rt1320.conf. It assume the '-1', '-2' prefix in the control names.

@plbossart plbossart mentioned this pull request Feb 11, 2025
Draft
@bardliao
Copy link
Collaborator

Not sure what happened to the LNL SDW test https://sof-ci.01.org/linuxpr/PR5315/build6111/devicetest/index.html. Let rerun the test.

@bardliao
Copy link
Collaborator

SOFCI TEST

@lgirdwood
Copy link
Member

Not sure what happened to the LNL SDW test https://sof-ci.01.org/linuxpr/PR5315/build6111/devicetest/index.html. Let rerun the test.

This seems unrelated to PTL, but could we be including a shared topology file that breaks ?

2025-02-14 02:44:01 UTC [ERROR] Caught kernel log error
===========================>>
[    5.740282] kernel: sof-audio-pci-intel-lnl 0000:00:1f.3: error: can't connect DAI alh-copier.SDW2-Playback.0 stream SDW2-Playback
[    5.740285] kernel: sof-audio-pci-intel-lnl 0000:00:1f.3: failed to add widget type 27 name : alh-copier.SDW2-Playback.0 stream SDW2-Playback
[    5.740294] kernel: sof_sdw sof_sdw: ASoC: failed to load widget alh-copier.SDW2-Playback.0
[    5.740297] kernel: sof_sdw sof_sdw: ASoC: topology: could not load header: -22
[    5.740353] kernel: sof-audio-pci-intel-lnl 0000:00:1f.3: error: tplg component load failed -22
[    5.740362] kernel: sof-audio-pci-intel-lnl 0000:00:1f.3: error: failed to load DSP topology -22
[    5.740365] kernel: sof-audio-pci-intel-lnl 0000:00:1f.3: ASoC: error at snd_soc_component_probe on 0000:00:1f.3: -22
[    5.740407] kernel: sof_sdw sof_sdw: ASoC: failed to instantiate card -22
[    5.740863] kernel: sof_sdw sof_sdw: error -EINVAL: snd_soc_register_card failed -22
[    5.740869] kernel: sof_sdw sof_sdw: probe with driver sof_sdw failed with error -22

@ujfalusi
Copy link
Collaborator Author

ujfalusi commented Feb 14, 2025 •
edited
Loading

Not sure what happened to the LNL SDW test https://sof-ci.01.org/linuxpr/PR5315/build6111/devicetest/index.html. Let rerun the test.

This seems unrelated to PTL, but could we be including a shared topology file that breaks ?

2025-02-14 02:44:01 UTC [ERROR] Caught kernel log error
===========================>>
[    5.740282] kernel: sof-audio-pci-intel-lnl 0000:00:1f.3: error: can't connect DAI alh-copier.SDW2-Playback.0 stream SDW2-Playback
[    5.740285] kernel: sof-audio-pci-intel-lnl 0000:00:1f.3: failed to add widget type 27 name : alh-copier.SDW2-Playback.0 stream SDW2-Playback
[    5.740294] kernel: sof_sdw sof_sdw: ASoC: failed to load widget alh-copier.SDW2-Playback.0
[    5.740297] kernel: sof_sdw sof_sdw: ASoC: topology: could not load header: -22
[    5.740353] kernel: sof-audio-pci-intel-lnl 0000:00:1f.3: error: tplg component load failed -22
[    5.740362] kernel: sof-audio-pci-intel-lnl 0000:00:1f.3: error: failed to load DSP topology -22
[    5.740365] kernel: sof-audio-pci-intel-lnl 0000:00:1f.3: ASoC: error at snd_soc_component_probe on 0000:00:1f.3: -22
[    5.740407] kernel: sof_sdw sof_sdw: ASoC: failed to instantiate card -22
[    5.740863] kernel: sof_sdw sof_sdw: error -EINVAL: snd_soc_register_card failed -22
[    5.740869] kernel: sof_sdw sof_sdw: probe with driver sof_sdw failed with error -22

Someone left the device in mockup mode?

kernel: snd_soc_sdw_utils:asoc_sdw_count_sdw_endpoints: sof_sdw sof_sdw: Found 3 devices with 3 endpoints
kernel: snd_soc_sdw_utils:asoc_sdw_parse_sdw_endpoints: sof_sdw sof_sdw: Adding prefix sdw_mockup_headset0 for sdw:0:0:0105:aa55:00
kernel: snd_soc_sdw_utils:asoc_sdw_parse_sdw_endpoints: sof_sdw sof_sdw: Add dev: 0, 0x105aa5500 end: 0, dai: 0, P/C to solo: 0
kernel: snd_soc_sdw_utils:asoc_sdw_parse_sdw_endpoints: sof_sdw sof_sdw: Adding prefix sdw_mockup_amp1 for sdw:0:1:0105:55aa:00
kernel: snd_soc_sdw_utils:asoc_sdw_parse_sdw_endpoints: sof_sdw sof_sdw: Add dev: 1, 0x100010555aa00 end: 0, dai: 1, P/C to solo: 0
kernel: snd_soc_sdw_utils:asoc_sdw_parse_sdw_endpoints: sof_sdw sof_sdw: Adding prefix sdw_mockup_mic3 for sdw:0:3:0105:5555:00
kernel: snd_soc_sdw_utils:asoc_sdw_parse_sdw_endpoints: sof_sdw sof_sdw: Add dev: 3, 0x3000105555500 end: 0, dai: 2, -/C to solo: 0
kernel: snd_soc_sof_sdw:sof_card_dai_links_create: sof_sdw sof_sdw: DAI link numbers: sdw 5, ssp 0, dmic 0, hdmi 3, bt: 0

kernel: File kernel/firmware/acpi/mockup-device-1amp.aml exceeding MAX_CPIO_FILE_NAME [18]
kernel: ACPI: SSDT ACPI table found in initrd [kernel/firmware/acpi/mockup-device-1am][0x99]

@kv2019i ?

@bardliao
Copy link
Collaborator

@ujfalusi That's my fault. I used jf-lnlm-rvp-sdw-1 to test SDW mockup mode yesterday. But I removed the mockup ADR from the acpi table already. Not sure why mockup devices are still present.

@bardliao
Copy link
Collaborator

The aml is not in the /lib/firmware/acpi-upgrades/ folder already.

ubuntu@jf-lnlm-rvp-sdw-1:~$ ls /lib/firmware/acpi-upgrades/
ubuntu@jf-lnlm-rvp-sdw-1:~$

I did it by the sudo ./acpi-rm command. Did I miss something?

@ujfalusi
Copy link
Collaborator Author

I have manually removed them, rebuilt the initramfs and rebooted the machine

@ranj063
Copy link
Collaborator

ranj063 commented Feb 14, 2025

SOFCI TEST

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@plbossart plbossart plbossart left review comments

@bardliao bardliao bardliao approved these changes

@ranj063 ranj063 ranj063 approved these changes

@lgirdwood lgirdwood lgirdwood approved these changes

@kv2019i kv2019i Awaiting requested review from kv2019i kv2019i is a code owner

@dbaluta dbaluta Awaiting requested review from dbaluta dbaluta is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ujfalusi @bardliao @lgirdwood @ranj063 @plbossart