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.

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

drivers: intel: remove remaining references to MN driver #9671

Merged
merged 1 commit into from
Dec 10, 2024

Conversation

kv2019i
Copy link
Collaborator

@kv2019i kv2019i commented Nov 21, 2024

The Zephyr SSP driver has had dependency to CONFIG_INTEL_NM defined in SOF, so this has not been removed before. This is now cleaned up on Zephyr side, so we can proceed to remove the remaining bits of the Intel MN driver on SOF side.

@kv2019i kv2019i added the DNM Do Not Merge tag label Nov 21, 2024
@kv2019i
Copy link
Collaborator Author

kv2019i commented Nov 21, 2024

Found in review of #9667

Copy link
Member

@lgirdwood lgirdwood left a comment

Choose a reason for hiding this comment

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

LGTM to merge when ready.

@wszypelt
Copy link

Unfortunately we have a problem on TGL with IPC4, the test with SSP does not pass. The question is what do we do about it or should we throw away this test? I would like it to be agreed with the developers

Issue:
E TimeoutError: Play stream timed out after 6.003951072692871 seconds

@lgirdwood
Copy link
Member

Unfortunately we have a problem on TGL with IPC4, the test with SSP does not pass. The question is what do we do about it or should we throw away this test? I would like it to be agreed with the developers

Issue: E TimeoutError: Play stream timed out after 6.003951072692871 seconds

@wszypelt pls disable this test. I would not fully delete though, just disable.

@kv2019i
Copy link
Collaborator Author

kv2019i commented Nov 26, 2024

@lgirdwood @wszypelt This is an expected result that some SSP tests will fail on cAVS2.5. This PR removes the SOF side CONFIG option, but we are still using old Zephyr here. so the SSP driver code for SSP2.5 clocks will be then partially disabled. I expect the tests to pass when Zephyr part is merged and can test together with this PR (and thus the DNM for this).
FYI @lyakh

@kv2019i kv2019i force-pushed the 202411-intel-mn-remove branch from cb77aa2 to a172410 Compare November 26, 2024 17:04
@kv2019i kv2019i changed the title drivers: intel: remove remaining references to MN driver (depends on Zephyr 81734) drivers: intel: remove remaining references to MN driver (includes 26th Nov Zephyr update) Nov 26, 2024
@kv2019i kv2019i removed the DNM Do Not Merge tag label Nov 26, 2024
@kv2019i
Copy link
Collaborator Author

kv2019i commented Nov 26, 2024

New version pushed:

  • contains Zephyr update (first commit)
  • MN removal in SOF as second commit

@kv2019i
Copy link
Collaborator Author

kv2019i commented Nov 27, 2024

DSP crashes on ace30, probably caused by latest Zephyr main:

[00:00:01.946,936] <inf> main: sof_app_main: SOF initialized
[00:00:02.037,930] <err> os: print_fatal_exception:  ** FATAL EXCEPTION
[00:00:02.038,041] <err> os: print_fatal_exception:  ** CPU 0 EXCCAUSE 29 (store prohibited)
[00:00:02.038,071] <err> os: print_fatal_exception:  **  PC 0xa007f894 VADDR 0xa00303bc

FYI @lyakh @wszypelt

@kv2019i
Copy link
Collaborator Author

kv2019i commented Nov 28, 2024

Fix is identified for Zephyr upstream regression, but I'll mark this PR with DNM until the Zephyr part is merged and we can try again.

@kv2019i
Copy link
Collaborator Author

kv2019i commented Dec 5, 2024

I'll rebase this once #9712 is merged.

The Zephyr SSP driver has had a dependency to CONFIG_INTEL_NM defined in
SOF, so this has not been removed before. This is now cleaned up on
Zephyr side, so we can proceed to remove the remaining bits of the Intel
MN driver on SOF side.

Signed-off-by: Kai Vehmanen <[email protected]>
@kv2019i kv2019i force-pushed the 202411-intel-mn-remove branch from a172410 to 3b0271f Compare December 9, 2024 13:03
@kv2019i kv2019i changed the title drivers: intel: remove remaining references to MN driver (includes 26th Nov Zephyr update) drivers: intel: remove remaining references to MN driver Dec 9, 2024
@kv2019i kv2019i removed the DNM Do Not Merge tag label Dec 9, 2024
@kv2019i
Copy link
Collaborator Author

kv2019i commented Dec 9, 2024

New version uploaded:

  • dropped the Zephyr update (no longer needed as Zephyr has been upgraded in separate PRs)
  • rebased to latest SOF main, no changes to code

@lgirdwood
Copy link
Member

@wszypelt @lrudyX good to merge ?
@kv2019i can you check LNL, looks like a topology or SW error and unrelated ?

@kv2019i
Copy link
Collaborator Author

kv2019i commented Dec 9, 2024

@lgirdwood Ack, I think the LNL fails are unrelated. I think the BIOS update broke this DUT and it's loading the wrong config:

Dec 09 13:40:41 ba-lnlm-rvp-sdw-01 kernel: sof-audio-pci-intel-lnl 0000:00:1f.3: error: can't connect DAI alh-copier.SDW2-Playback.0 stream SDW2-Playback
Dec 09 13:40:41 ba-lnlm-rvp-sdw-01 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

@wszypelt
Copy link

@kv2019i @lgirdwood Internal Intel CI System, all green

@lgirdwood lgirdwood merged commit 47125ee into thesofproject:main Dec 10, 2024
44 of 47 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants