From 6ddbfbdb18c7c26d61ba04fe2074d307050bb5a3 Mon Sep 17 00:00:00 2001 From: Sudeep Mohanty Date: Wed, 1 Apr 2026 16:01:34 +0200 Subject: [PATCH] fix(freertos): hide mutex-owner check config --- components/freertos/Kconfig | 9 +++------ .../freertos/config/include/freertos/FreeRTOSConfig.h | 3 --- .../test_apps/freertos/sdkconfig.ci.code_coverage | 3 --- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/components/freertos/Kconfig b/components/freertos/Kconfig index 92498e83df..7df72816bf 100644 --- a/components/freertos/Kconfig +++ b/components/freertos/Kconfig @@ -417,14 +417,11 @@ menu "FreeRTOS" hook function in their application. config FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER - # This feature is innately supported in FreeRTOS SMP, and hence not available as a config option when - # FreeRTOS SMP is enabled. + # TODO(IDF-15523): Remove this hidden compatibility option entirely. + # This feature is innately supported in FreeRTOS SMP, and IDF FreeRTOS always enables it. depends on !FREERTOS_SMP - bool "Check that mutex semaphore is given by owner task" + bool default y - help - If enabled, assert that when a mutex semaphore is given, the task giving the semaphore is the task - which is currently holding the mutex. config FREERTOS_ISR_STACKSIZE int "ISR stack size" diff --git a/components/freertos/config/include/freertos/FreeRTOSConfig.h b/components/freertos/config/include/freertos/FreeRTOSConfig.h index 1e3db20e98..4634a2dec0 100644 --- a/components/freertos/config/include/freertos/FreeRTOSConfig.h +++ b/components/freertos/config/include/freertos/FreeRTOSConfig.h @@ -289,9 +289,6 @@ #ifdef CONFIG_FREERTOS_TLSP_DELETION_CALLBACKS #define configTHREAD_LOCAL_STORAGE_DELETE_CALLBACKS 1 #endif /* CONFIG_FREERTOS_TLSP_DELETION_CALLBACKS */ - #if CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER - #define configCHECK_MUTEX_GIVEN_BY_OWNER 1 - #endif /* CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER */ #endif /* !CONFIG_FREERTOS_SMP */ /* ------------------------------------------------ ESP-IDF Additions -------------------------------------------------- diff --git a/components/freertos/test_apps/freertos/sdkconfig.ci.code_coverage b/components/freertos/test_apps/freertos/sdkconfig.ci.code_coverage index 427f74c318..2f16a8edc8 100644 --- a/components/freertos/test_apps/freertos/sdkconfig.ci.code_coverage +++ b/components/freertos/test_apps/freertos/sdkconfig.ci.code_coverage @@ -96,8 +96,5 @@ CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=y # Thread local storage deletion callbacks CONFIG_FREERTOS_TLSP_DELETION_CALLBACKS=y -# Mutex owner check -CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y - # Port critical compliance check CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE=y