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

zephyr: lib/dma.h: limit use of platform/lib/dma.h #9667

Merged
merged 3 commits into from
Nov 22, 2024

Conversation

kv2019i
Copy link
Collaborator

@kv2019i kv2019i commented Nov 19, 2024

Cannot remove platform/lib/dma.h completely, but limit its use and make it optional for new targets.

Link: #5794

select XT_INTERRUPT_LEVEL_5
select INTEL_MN
select WAKEUP_HOOK
select SCHEDULE_DMA_SINGLE_CHANNEL
Copy link
Collaborator

Choose a reason for hiding this comment

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

nice! Can some of these be removed completely? E.g. INTEL_MN looks Intel-specific, and we don't do XTOS builds on "main" any more?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Others are removed, but INTEL_MN seems to have more complex baggage still in place. I'm afraid the Zephyr SSP driver depends on this (still)... needs to be cleaned up before this can be merged.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@lyakh ok, now filed zephyrproject-rtos/zephyr#81734 for Zephyr and will submit a separate PR for SOF for this. I'll update this series to still keep INTEL_MN.

@kv2019i
Copy link
Collaborator Author

kv2019i commented Nov 20, 2024

Hmm, ok, there's a failure on imx8m that I missed: https://github.com/thesofproject/sof/actions/runs/11914362596/job/33202110141?pr=9667

@kv2019i kv2019i added the DNM Do Not Merge tag label Nov 20, 2024
@lgirdwood lgirdwood changed the title zephyr: lib/dma.h: limit use of platform/lib/dma.h [DNM] zephyr: lib/dma.h: limit use of platform/lib/dma.h Nov 20, 2024
@kv2019i
Copy link
Collaborator Author

kv2019i commented Nov 21, 2024

V2:

  • fix to the imx8m build issue
  • not solution yet to INTEL_MN

Remove unused Kconfig dependencies for CONFIG_CAVS. These were
valid entries for XTOS builds, but as CAVS no longer has any XTOS
suppot in the tree, these can be now removed. Equivalent settings
are now moved all to Zephyr.

Signed-off-by: Kai Vehmanen <[email protected]>
The platform lib/dma.h definitions are only needed in a small set of
usages. Make the inclusion conditional and add a note to guide new
configurations to use CONFIG_DMA_DOMAIN instead.

Signed-off-by: Kai Vehmanen <[email protected]>
The platform lib/dma.h is no longer needed in SOF Zephyr
builds unless the legacy DMA domain scheduler is used. This
is not the case for any Intel target, so the lib/dma.h headers
can be removed.

Signed-off-by: Kai Vehmanen <[email protected]>
@kv2019i
Copy link
Collaborator Author

kv2019i commented Nov 21, 2024

V3:

  • INTEL_MN issue now solved, removing DNM label

@kv2019i kv2019i removed the DNM Do Not Merge tag label Nov 21, 2024
@kv2019i kv2019i changed the title [DNM] zephyr: lib/dma.h: limit use of platform/lib/dma.h zephyr: lib/dma.h: limit use of platform/lib/dma.h Nov 21, 2024
@lgirdwood lgirdwood merged commit a50f8b5 into thesofproject:main Nov 22, 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