OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

zephyr: Make CONFIG_DMA_DOMAIN no longer experimental 

DMA domain with Zephyr works fine for i.MX platforms. So, remove
"experimental" from description and enable it by default for i.MX
platforms.

Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
This commit is contained in:
Daniel Baluta 2023-04-03 18:02:07 +03:00 committed by Liam Girdwood
parent 60bc228b81
commit 3f3c1e5084
3 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/sof/schedule/ll_schedule.h
View File

@ -34,7 +34,7 @@ struct ll_task_pdata {
uint16_t skip_cnt; /**< how many times the task was skipped for execution */ uint16_t skip_cnt; /**< how many times the task was skipped for execution */
}; };
#if !defined(__ZEPHYR__) || (defined(CONFIG_IMX) && !CONFIG_DMA_DOMAIN) #if !defined(__ZEPHYR__)
int scheduler_init_ll(struct ll_schedule_domain *domain); int scheduler_init_ll(struct ll_schedule_domain *domain);
int schedule_task_init_ll(struct task *task, int schedule_task_init_ll(struct task *task,

14
zephyr/CMakeLists.txt
View File

@ -276,12 +276,7 @@ if (CONFIG_SOC_SERIES_NXP_IMX8)
${SOF_SRC_PATH}/drivers/interrupt.c ${SOF_SRC_PATH}/drivers/interrupt.c
) )
# Zephyr DMA domain should only be used with zephyr_ll zephyr_library_sources(${SOF_SRC_PATH}/schedule/zephyr_ll.c)
if (NOT(CONFIG_DMA_DOMAIN))
zephyr_library_sources(${SOF_SRC_PATH}/schedule/ll_schedule.c)
else()
zephyr_library_sources(${SOF_SRC_PATH}/schedule/zephyr_ll.c)
endif()
set(PLATFORM "imx8") set(PLATFORM "imx8")
endif() endif()
@ -309,12 +304,7 @@ if (CONFIG_SOC_SERIES_NXP_IMX8M)
${SOF_SRC_PATH}/drivers/interrupt.c ${SOF_SRC_PATH}/drivers/interrupt.c
) )
# Zephyr DMA domain should only be used with zephyr_ll zephyr_library_sources(${SOF_SRC_PATH}/schedule/zephyr_ll.c)
if (NOT(CONFIG_DMA_DOMAIN))
zephyr_library_sources(${SOF_SRC_PATH}/schedule/ll_schedule.c)
else()
zephyr_library_sources(${SOF_SRC_PATH}/schedule/zephyr_ll.c)
endif()
set(PLATFORM "imx8m") set(PLATFORM "imx8m")
endif() endif()

7
zephyr/Kconfig
View File

@ -29,13 +29,10 @@ config SOF_ZEPHYR_STRICT_HEADERS
If unsure, say n. If unsure, say n.
config DMA_DOMAIN config DMA_DOMAIN
bool "Experimental: Enable the usage of DMA domain." bool "Enable the usage of DMA domain."
default n default y if IMX
help help
This enables the usage of the DMA domain in scheduling. This enables the usage of the DMA domain in scheduling.
This will most likely come to replace dma_multi_chan
and dma_single_chan in Zephyr once it becomes more
stable.
config ZEPHYR_DP_SCHEDULER config ZEPHYR_DP_SCHEDULER
bool "use Zephyr thread based DP scheduler" bool "use Zephyr thread based DP scheduler"