Skip to content

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

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

Merged
lgirdwood merged 3 commits into from
Nov 22, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36e7322
platform: cavs: remove XTOS Kconfig items
kv2019i Nov 14, 2024
0daea7d
zephyr: lib/dma.h: limit use of platform/lib/dma.h
kv2019i Nov 14, 2024
eb516a9
platform: intel: remove lib/dma.h for all Intel targets
kv2019i Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/platform/Kconfig
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -339,11 +339,7 @@ config CAVS
bool
default n
select INTEL
select XT_INTERRUPT_LEVEL_2
select XT_INTERRUPT_LEVEL_5
select INTEL_MN
select WAKEUP_HOOK
select SCHEDULE_DMA_SINGLE_CHANNEL

@lyakhlyakhNov 20, 2024

Copy link
Copy Markdown
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?

@kv2019ikv2019iNov 20, 2024

Copy link
Copy Markdown
CollaboratorAuthor

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.

@kv2019ikv2019iNov 21, 2024

Copy link
Copy Markdown
CollaboratorAuthor

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.


config CAVS_VERSION_2_5
depends on CAVS
Expand Down
23 changes: 0 additions & 23 deletions src/platform/ace30/include/platform/lib/dma.h
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions src/platform/lunarlake/include/platform/lib/dma.h
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions src/platform/meteorlake/include/platform/lib/dma.h
View file
Open in desktop

This file was deleted.

66 changes: 0 additions & 66 deletions src/platform/tigerlake/include/platform/lib/dma.h
View file
Open in desktop

This file was deleted.

11 changes: 11 additions & 0 deletions zephyr/include/sof/lib/dma.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,18 @@
#ifndef __SOF_LIB_DMA_H__
#define __SOF_LIB_DMA_H__

#if defined(CONFIG_SCHEDULE_DMA_MULTI_CHANNEL) || \
defined(CONFIG_SCHEDULE_DMA_SINGLE_CHANNEL)
/*
* The platform/lib/dma.h definitions are only needed
* when using old dma_{single,multi}_chan_domain
* implementations. For new SOF build targets, it is
* recommended to use CONFIG_DMA_DOMAIN instead if
* DMA-driven scheduling is needed.
*/
#include <platform/lib/dma.h>
#endif

#include <rtos/atomic.h>
#include <rtos/bit.h>
#include <rtos/alloc.h>
Expand Down