zephyr: alloc: ace: calculate L3 heap size based on actual IMR size

abonislawski · abonislawski · commit 4929754eb0d7 · 2025-08-19T15:38:19.000+02:00
Updates the L3 heap management to dynamically calculate heap size based on the actual IMR size reported by hardware registers instead of using hardcoded values.

Only initializes the L3 heap when the IMR is actually available and being used, as determined by the ace_imr_used() function, improving robustness by preventing the initialization of unavailable memory regions.

Adds proper memory mapping when MMU is enabled, which maps the physical L3 heap memory to a virtual address with appropriate permissions (read/write with write-back caching).
MMU mapping is required because it is no longer a fixed region with
fixed mapping in Zephyr.

This change makes the L3 heap allocation more flexible and adaptable to different hardware configurations.

Signed-off-by: Adrian Bonislawski &lt;adrian.bonislawski@intel.com&gt;
diff --git a/zephyr/lib/alloc.c b/zephyr/lib/alloc.c
@@ -19,6 +19,10 @@
 #include <rtos/symbol.h>
 #include <rtos/wait.h>
 
+#if CONFIG_L3_HEAP && CONFIG_MMU
+#include <kernel_arch_interface.h>
+#endif
+
 #if CONFIG_VIRTUAL_HEAP
 #include <sof/lib/regions_mm.h>
 #include <zephyr/drivers/mm/mm_drv_intel_adsp_mtl_tlb.h>
@@ -158,7 +162,9 @@ static inline size_t get_l3_heap_size(void)
 	  * - IMR base address
 	  * - actual IMR heap start
 	  */
-	return ROUND_DOWN(IMR_L3_HEAP_SIZE, L3_MEM_PAGE_SIZE);
+	size_t offset = IMR_L3_HEAP_BASE - L3_MEM_BASE_ADDR;
+
+	return ROUND_DOWN(ace_imr_get_mem_size() - offset, L3_MEM_PAGE_SIZE);
 }
 
 void l3_heap_save(void)
@@ -557,11 +563,17 @@ static int heap_init(void)
 	sys_heap_init(&sof_heap.heap, heapmem, HEAPMEM_SIZE);
 
 #if CONFIG_L3_HEAP
-	if (l3_heap_copy.heap.heap)
+	if (l3_heap_copy.heap.heap) {
 		l3_heap = l3_heap_copy;
-	else
-		sys_heap_init(&l3_heap.heap, UINT_TO_POINTER(get_l3_heap_start()),
-			      get_l3_heap_size());
+	} else if (ace_imr_used()) {
+#if CONFIG_MMU
+		void *cached_ptr = sys_cache_cached_ptr_get(UINT_TO_POINTER(get_l3_heap_start()));
+		uintptr_t va = POINTER_TO_UINT(cached_ptr);
+
+		arch_mem_map(UINT_TO_POINTER(get_l3_heap_start()), va, get_l3_heap_size(), K_MEM_PERM_RW | K_MEM_CACHE_WB);
+#endif
+		sys_heap_init(&l3_heap.heap, UINT_TO_POINTER(get_l3_heap_start()), get_l3_heap_size());
+	}
 #endif
 
 	return 0;
