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

Merge branch 'fix/use_heap_caps_to_maintain_desc_alignment' into 'master'

Browse Source 
sdmmc: use heap_caps_alloc to maintain desc alignment

See merge request espressif/esp-idf!42038
This commit is contained in:
Armando (Dou Yiwen)
2025-09-23 06:08:41 +00:00
parent 2d9b6c1179 70acf169e0
commit 4447fdc018
2 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp_driver_sdmmc/include/esp_private/sd_host_private.h
View File

@@ -38,9 +38,9 @@ extern "C" {
#endif #endif
#if SOC_SDMMC_PSRAM_DMA_CAPABLE #if SOC_SDMMC_PSRAM_DMA_CAPABLE
#define SD_HOST_SDMMC_DMA_ALLOC_CAPS MALLOC_CAP_DEFAULT #define SD_HOST_SDMMC_DMA_ALLOC_CAPS MALLOC_CAP_DEFAULT | MALLOC_CAP_DMA
#else #else
#define SD_HOST_SDMMC_DMA_ALLOC_CAPS (MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT) #define SD_HOST_SDMMC_DMA_ALLOC_CAPS (MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT | MALLOC_CAP_DMA)
#endif #endif
#if !SOC_RCC_IS_INDEPENDENT #if !SOC_RCC_IS_INDEPENDENT

13
components/esp_driver_sdmmc/src/sd_host_sdmmc.c
View File

@@ -82,19 +82,8 @@ esp_err_t sd_host_create_sdmmc_controller(const sd_host_sdmmc_cfg_t *config, sd_
ESP_RETURN_ON_ERROR(ret, TAG, "no available sd host controller"); ESP_RETURN_ON_ERROR(ret, TAG, "no available sd host controller");
} }
size_t alignment = 0;
size_t cache_alignment_bytes = 0;
ret = esp_cache_get_alignment(0, &cache_alignment_bytes);
assert(ret == ESP_OK);
if (cache_alignment_bytes != 0) {
alignment = cache_alignment_bytes;
} else {
alignment = 4;
}
ESP_LOGD(TAG, "size: %d, alignment: %d", sizeof(sdmmc_desc_t), alignment);
ctlr->dma_desc_num = config->dma_desc_num ? config->dma_desc_num : SD_HOST_SDMMC_DMA_DESC_CNT; ctlr->dma_desc_num = config->dma_desc_num ? config->dma_desc_num : SD_HOST_SDMMC_DMA_DESC_CNT;
ctlr->dma_desc = heap_caps_aligned_calloc(alignment, 1, sizeof(sdmmc_desc_t) * ctlr->dma_desc_num, SD_HOST_SDMMC_DMA_ALLOC_CAPS); ctlr->dma_desc = heap_caps_calloc(1, sizeof(sdmmc_desc_t) * ctlr->dma_desc_num, SD_HOST_SDMMC_DMA_ALLOC_CAPS);
ESP_LOGD(TAG, "ctlr->dma_desc addr: %p", ctlr->dma_desc); ESP_LOGD(TAG, "ctlr->dma_desc addr: %p", ctlr->dma_desc);
ESP_RETURN_ON_FALSE(ctlr->dma_desc, ESP_ERR_NO_MEM, TAG, "no mem for dma descriptors"); ESP_RETURN_ON_FALSE(ctlr->dma_desc, ESP_ERR_NO_MEM, TAG, "no mem for dma descriptors");