Merge branch 'fix/revert_dma_pool_default_caps_v5.4' into 'release/v5.4'

fix(heap): revert dma pool default malloc caps (v5.4)

See merge request espressif/esp-idf!52146

components/esp_psram/Kconfig.spiram.common

@@ -104,7 +104,7 @@ config SPIRAM_MALLOC_RESERVE_INTERNAL
         that the internal memory is entirely filled up. This causes allocations that are specifically done in
         internal memory, for example the stack for new tasks or memory to service DMA or have memory that's
         also available when SPI cache is down, to fail. This option reserves a pool specifically for requests
-        like that;  a normal malloc() can fall back to the pool only after all other internal are exhausted.
+        like that; the memory in this pool is not given out when a normal malloc() is called.
 
         Set this to 0 to disable this feature.
 

components/esp_psram/esp_psram.c

@@ -521,7 +521,7 @@ esp_err_t esp_psram_extram_reserve_dma_pool(size_t size)
             return ESP_ERR_NO_MEM;
         }
 
-        uint32_t caps[] = {0, MALLOC_CAP_DMA | MALLOC_CAP_INTERNAL, MALLOC_CAP_DEFAULT | MALLOC_CAP_8BIT | MALLOC_CAP_32BIT};
+        uint32_t caps[] = {0, MALLOC_CAP_DMA | MALLOC_CAP_INTERNAL, MALLOC_CAP_8BIT | MALLOC_CAP_32BIT};
         esp_err_t e = heap_caps_add_region_with_caps(caps, (intptr_t)dma_heap, (intptr_t)dma_heap + next_size - 1);
         if (e != ESP_OK) {
             return e;

components/esp_psram/include/esp_private/esp_psram_extram.h

@@ -37,11 +37,6 @@ esp_err_t esp_psram_extram_add_to_heap_allocator(void);
 /**
  * @brief Reserve a pool of internal memory for specific DMA/internal allocations
  *
- * Carves out @p size bytes from the regular internal heaps and registers the
- * region as separate heap pool with new priority-based caps: medium priority for
- * MALLOC_CAP_DMA | MALLOC_CAP_INTERNAL, and low priority for MALLOC_CAP_DEFAULT.
- * malloc() uses the pool only after other internal heaps are exhausted.
- *
  * @param size Size of reserved pool in bytes
  *
  * @return

components/heap/test_apps/heap_tests/main/test_malloc.c

@@ -65,6 +65,25 @@ TEST_CASE("Malloc/overwrite, then free all available DRAM", "[heap]")
 }
 
 
+#if CONFIG_SPIRAM_USE_MALLOC && (CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL > 1024)
+TEST_CASE("Check if reserved DMA pool still can allocate even when malloc()'ed memory is exhausted", "[heap][psram]")
+{
+    char** dmaMem=malloc(sizeof(char*)*512);
+    assert(dmaMem);
+    int m=tryAllocMem();
+    int i=0;
+    for (i=0; i<512; i++) {
+        dmaMem[i]=heap_caps_malloc(1024, MALLOC_CAP_DMA);
+        if (dmaMem[i]==NULL) break;
+    }
+    for (int j=0; j<i; j++) free(dmaMem[j]);
+    free(dmaMem);
+    tryAllocMemFree();
+    printf("Could allocate %dK of DMA memory after allocating all of %dK of normal memory.\n", i, m);
+    TEST_ASSERT(i);
+}
+#endif
+
 #if CONFIG_SPIRAM
 TEST_CASE("Check if default cap allocates in external memory in priority", "[heap][psram]")
 {