espressif/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-04-27 19:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'change/added_mutex_for_get_apis_v6.0' into 'release/v6.0'

Browse Source 
mmu: add mutex for get_max_consecutive_free_block_size and paddr_find_caps (v6.0)

See merge request espressif/esp-idf!46432
This commit is contained in:
Marius Vikhammer
2026-03-20 10:04:27 +08:00
parent 613f8eaaed 15cbf78a64
commit a138e4e516
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_mm/esp_mmu_map.c
+2
View File
@@ -279,6 +279,7 @@ esp_err_t esp_mmu_map_get_max_consecutive_free_block_size(mmu_mem_caps_t caps, m
ESP_RETURN_ON_ERROR(s_mem_caps_check(caps), TAG, "invalid caps"); ESP_RETURN_ON_ERROR(s_mem_caps_check(caps), TAG, "invalid caps");
*out_len = 0; *out_len = 0;
_lock_acquire(&s_mmu_ctx.mutex);
size_t max = 0; size_t max = 0;
for (int i = 0; i < s_mmu_ctx.num_regions; i++) { for (int i = 0; i < s_mmu_ctx.num_regions; i++) {
@@ -290,6 +291,7 @@ esp_err_t esp_mmu_map_get_max_consecutive_free_block_size(mmu_mem_caps_t caps, m
} }
*out_len = max; *out_len = max;
_lock_release(&s_mmu_ctx.mutex);
return ESP_OK; return ESP_OK;
} }
components/spi_flash/flash_mmap.c
+19 -1
View File
@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2026 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -10,6 +10,7 @@
#include <stdio.h> #include <stdio.h>
#include <freertos/FreeRTOS.h> #include <freertos/FreeRTOS.h>
#include "sdkconfig.h" #include "sdkconfig.h"
#include "esp_bit_defs.h"
#include "esp_attr.h" #include "esp_attr.h"
#include "esp_log.h" #include "esp_log.h"
#include "esp_rom_caps.h" #include "esp_rom_caps.h"
@@ -51,6 +52,8 @@ extern char _rodata_reserved_end;
#if !ESP_ROM_HAS_SPI_FLASH_MMAP || !CONFIG_SPI_FLASH_ROM_IMPL #if !ESP_ROM_HAS_SPI_FLASH_MMAP || !CONFIG_SPI_FLASH_ROM_IMPL
/* 0x1000000, 16MB */
#define FLASH_MMAP_ADDR_24BIT_MAX (BIT(24))
typedef struct mmap_block_t { typedef struct mmap_block_t {
uint32_t *vaddr_list; uint32_t *vaddr_list;
@@ -61,6 +64,12 @@ typedef struct mmap_block_t {
esp_err_t spi_flash_mmap(size_t src_addr, size_t size, spi_flash_mmap_memory_t memory, esp_err_t spi_flash_mmap(size_t src_addr, size_t size, spi_flash_mmap_memory_t memory,
const void** out_ptr, spi_flash_mmap_handle_t* out_handle) const void** out_ptr, spi_flash_mmap_handle_t* out_handle)
{ {
#if !CONFIG_BOOTLOADER_CACHE_32BIT_ADDR_QUAD_FLASH && !CONFIG_BOOTLOADER_CACHE_32BIT_ADDR_OCTAL_FLASH
if (src_addr >= FLASH_MMAP_ADDR_24BIT_MAX || size > FLASH_MMAP_ADDR_24BIT_MAX || src_addr > FLASH_MMAP_ADDR_24BIT_MAX - size) {
ESP_LOGE("flash_mmap", "Address 0x%08x is out of range for 24bit flash mapping, see CONFIG_BOOTLOADER_CACHE_32BIT_ADDR_QUAD_FLASH and CONFIG_BOOTLOADER_CACHE_32BIT_ADDR_OCTAL_FLASH for more details", src_addr);
return ESP_ERR_INVALID_ARG;
}
#endif
esp_err_t ret = ESP_FAIL; esp_err_t ret = ESP_FAIL;
mmu_mem_caps_t caps = 0; mmu_mem_caps_t caps = 0;
void *ptr = NULL; void *ptr = NULL;
@@ -166,6 +175,15 @@ static void s_pages_to_bytes(int (*blocks)[2], int block_nums)
esp_err_t spi_flash_mmap_pages(const int *pages, size_t page_count, spi_flash_mmap_memory_t memory, esp_err_t spi_flash_mmap_pages(const int *pages, size_t page_count, spi_flash_mmap_memory_t memory,
const void** out_ptr, spi_flash_mmap_handle_t* out_handle) const void** out_ptr, spi_flash_mmap_handle_t* out_handle)
{ {
#if !CONFIG_BOOTLOADER_CACHE_32BIT_ADDR_QUAD_FLASH && !CONFIG_BOOTLOADER_CACHE_32BIT_ADDR_OCTAL_FLASH
for (size_t i = 0; i < page_count; i++) {
uint32_t phys = (uint32_t)pages[i] * CONFIG_MMU_PAGE_SIZE;
if (phys >= FLASH_MMAP_ADDR_24BIT_MAX) {
ESP_LOGE("flash_mmap", "Page %d (addr 0x%08x) is out of range for 24bit flash mapping", pages[i], phys);
return ESP_ERR_INVALID_ARG;
}
}
#endif
esp_err_t ret = ESP_FAIL; esp_err_t ret = ESP_FAIL;
mmu_mem_caps_t caps = 0; mmu_mem_caps_t caps = 0;
mmap_block_t *block = NULL; mmap_block_t *block = NULL;