From 3f3c1e5084a8f9aa6d3fce11167db997115ebc0b Mon Sep 17 00:00:00 2001 From: Daniel Baluta Date: Mon, 3 Apr 2023 18:02:07 +0300 Subject: [PATCH] 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 --- src/include/sof/schedule/ll_schedule.h | 2 +- zephyr/CMakeLists.txt | 14 ++------------ zephyr/Kconfig | 7 ++----- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/src/include/sof/schedule/ll_schedule.h b/src/include/sof/schedule/ll_schedule.h index 6ffa8db95..0d2d3d6d1 100644 --- a/src/include/sof/schedule/ll_schedule.h +++ b/src/include/sof/schedule/ll_schedule.h @@ -34,7 +34,7 @@ struct ll_task_pdata { 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 schedule_task_init_ll(struct task *task, diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt index 5c47aa383..82ccb0202 100644 --- a/zephyr/CMakeLists.txt +++ b/zephyr/CMakeLists.txt @@ -276,12 +276,7 @@ if (CONFIG_SOC_SERIES_NXP_IMX8) ${SOF_SRC_PATH}/drivers/interrupt.c ) - # Zephyr DMA domain should only be used with zephyr_ll - 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() + zephyr_library_sources(${SOF_SRC_PATH}/schedule/zephyr_ll.c) set(PLATFORM "imx8") endif() @@ -309,12 +304,7 @@ if (CONFIG_SOC_SERIES_NXP_IMX8M) ${SOF_SRC_PATH}/drivers/interrupt.c ) - # Zephyr DMA domain should only be used with zephyr_ll - 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() + zephyr_library_sources(${SOF_SRC_PATH}/schedule/zephyr_ll.c) set(PLATFORM "imx8m") endif() diff --git a/zephyr/Kconfig b/zephyr/Kconfig index d62c07700..c9dda09a9 100644 --- a/zephyr/Kconfig +++ b/zephyr/Kconfig @@ -29,13 +29,10 @@ config SOF_ZEPHYR_STRICT_HEADERS If unsure, say n. config DMA_DOMAIN - bool "Experimental: Enable the usage of DMA domain." - default n + bool "Enable the usage of DMA domain." + default y if IMX help 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 bool "use Zephyr thread based DP scheduler"