espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 04:04:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(psram): correct heap vaddr calculation

Browse Source 
- fixes https://github.com/espressif/esp-idf/issues/15496

Signed-off-by: armando <douyiwen@espressif.com>
This commit is contained in:
Erki Aring
2025-03-04 14:47:10 +02:00
committed by armando
parent 4e6d2095b9
commit 90611532a2
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
components/esp_psram/esp_psram.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -266,21 +266,31 @@ esp_err_t esp_psram_init(void)
* After mapping, we DON'T care about the PSRAM PHYSICAL ADDRESSS ANYMORE! * After mapping, we DON'T care about the PSRAM PHYSICAL ADDRESSS ANYMORE!
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
//------------------------------------Configure .bss in PSRAM-------------------------------------// //------------------------------------Configure heap in PSRAM-------------------------------------//
uintptr_t ext_segment_start = UINTPTR_MAX;
uintptr_t ext_segment_end = 0;
#if CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY #if CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY
//should never be negative number ext_segment_start = (uintptr_t)&_ext_ram_bss_start;
uint32_t ext_bss_size = ((intptr_t)&_ext_ram_bss_end - (intptr_t)&_ext_ram_bss_start); ext_segment_end = (uintptr_t)&_ext_ram_bss_end;
ESP_EARLY_LOGV(TAG, "ext_bss_size is %d", ext_bss_size);
s_psram_ctx.regions_to_heap[PSRAM_MEM_8BIT_ALIGNED].vaddr_start += ext_bss_size;
s_psram_ctx.regions_to_heap[PSRAM_MEM_8BIT_ALIGNED].size -= ext_bss_size;
#endif //#if CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY #endif //#if CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY
#if CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY #if CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY
uint32_t ext_noinit_size = ((intptr_t)&_ext_ram_noinit_end - (intptr_t)&_ext_ram_noinit_start); if ((uintptr_t)&_ext_ram_noinit_start < ext_segment_start) {
ESP_EARLY_LOGV(TAG, "ext_noinit_size is %d", ext_noinit_size); ext_segment_start = (uintptr_t)&_ext_ram_noinit_start;
s_psram_ctx.regions_to_heap[PSRAM_MEM_8BIT_ALIGNED].vaddr_start += ext_noinit_size; }
s_psram_ctx.regions_to_heap[PSRAM_MEM_8BIT_ALIGNED].size -= ext_noinit_size; if ((uintptr_t)&_ext_ram_noinit_end > ext_segment_end) {
#endif ext_segment_end = (uintptr_t)&_ext_ram_noinit_end;
}
#endif //#if CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY
if ((ext_segment_start != UINTPTR_MAX) || (ext_segment_end != 0)) {
assert(ext_segment_end >= ext_segment_start);
uint32_t ext_segment_size = ext_segment_end - ext_segment_start;
ESP_EARLY_LOGV(TAG, "ext_segment_size is %" PRIu32, ext_segment_size);
s_psram_ctx.regions_to_heap[PSRAM_MEM_8BIT_ALIGNED].vaddr_start += ext_segment_size;
s_psram_ctx.regions_to_heap[PSRAM_MEM_8BIT_ALIGNED].size -= ext_segment_size;
}
#if CONFIG_IDF_TARGET_ESP32 #if CONFIG_IDF_TARGET_ESP32
s_psram_ctx.regions_to_heap[PSRAM_MEM_8BIT_ALIGNED].size -= esp_himem_reserved_area_size() - 1; s_psram_ctx.regions_to_heap[PSRAM_MEM_8BIT_ALIGNED].size -= esp_himem_reserved_area_size() - 1;