From ab14bbaa00d64339c596beb1d1b09001593abde9 Mon Sep 17 00:00:00 2001 From: John Boiles Date: Thu, 22 May 2025 08:25:26 -0700 Subject: [PATCH] fix(memory-utils): Use esp_ptr_in_tcm to check TCM range --- components/esp_hw_support/esp_memory_utils.c | 2 +- components/esp_hw_support/include/esp_memory_utils.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/esp_hw_support/esp_memory_utils.c b/components/esp_hw_support/esp_memory_utils.c index a74bb16a85..a8aaa8fa3b 100644 --- a/components/esp_hw_support/esp_memory_utils.c +++ b/components/esp_hw_support/esp_memory_utils.c @@ -53,7 +53,7 @@ bool esp_ptr_byte_accessible(const void *p) bool r; r = (ip >= SOC_BYTE_ACCESSIBLE_LOW && ip < SOC_BYTE_ACCESSIBLE_HIGH); #if SOC_MEM_TCM_SUPPORTED - r |= (ip >= SOC_TCM_LOW && ip < SOC_TCM_HIGH); + r |= esp_ptr_in_tcm(p); #endif #if CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP /* For ESP32 case, RTC fast memory is accessible to PRO cpu only and hence diff --git a/components/esp_hw_support/include/esp_memory_utils.h b/components/esp_hw_support/include/esp_memory_utils.h index eedee4abcc..deee9c9d72 100644 --- a/components/esp_hw_support/include/esp_memory_utils.h +++ b/components/esp_hw_support/include/esp_memory_utils.h @@ -279,7 +279,7 @@ inline static bool esp_ptr_internal(const void *p) { r = ((intptr_t)p >= SOC_MEM_INTERNAL_LOW && (intptr_t)p < SOC_MEM_INTERNAL_HIGH); #if SOC_MEM_TCM_SUPPORTED - r |= ((intptr_t)p >= SOC_TCM_LOW && (intptr_t)p < SOC_TCM_HIGH); + r |= esp_ptr_in_tcm(p); #endif #if SOC_RTC_SLOW_MEM_SUPPORTED