thesofproject · lgirdwood · Jul 31, 2025 · Jul 30, 2025 · Jul 30, 2025 · Copilot
@@ -50,6 +50,13 @@ config SOF_ZEPHYR_VIRTUAL_HEAP_SIZE
 	 NOTE: Keep in mind that the heap size should not be greater than the physical
 	 memory size of the system defined in DT (and this includes baseFW text/data).
 
+config SOF_ZEPHYR_VIRTUAL_HEAP_REGION_SIZE
+	hex "Size in bytes of virtual memory region for virtual heap shared for all cores"
+	depends on MM_DRV_INTEL_ADSP_MTL_TLB
+	default 0x100000
+	help
+	  This config defines size of virtual heap region shared between all cores
+
 config ZEPHYR_NATIVE_DRIVERS
 	bool "Use Zephyr native drivers"
 	default n

@@ -17,6 +17,9 @@
 #include <zephyr/init.h>
 #include <zephyr/sys/mem_blocks.h>
 
+/* Attributes for memory regions */
+#define VIRTUAL_REGION_SHARED_HEAP_ATTR 1U	  /*< region dedicated for shared virtual heap */
+
 /* Dependency on ipc/topology.h created due to memory capability definitions
  * that are defined there
  */

@@ -21,6 +21,7 @@
 
 #if CONFIG_VIRTUAL_HEAP
 #include <sof/lib/regions_mm.h>
+#include <zephyr/drivers/mm/mm_drv_intel_adsp_mtl_tlb.h>
 
 struct vmh_heap;
 struct vmh_heap *virtual_buffers_heap;
@@ -288,8 +289,39 @@ static const struct vmh_heap_config static_hp_buffers = {
 	},
 };
 
+/* WA Stubs begin
-/* WA Stubs begin
+/* Workaround Stubs begin
-/* WA Stubs begin
+/* Workaround Stubs begin
+ *
+ * in order to merge a PR that moves initialization of virtual regions from Zephyr to SOF,
+ * we need to create weak stubs for 2 functions that will need to be called once the PR is merged
+ */
+
+__weak
+uintptr_t adsp_mm_get_unused_l2_start_aligned(void)
+{
+	return 0;
+}
+
-
-__weak
-uintptr_t adsp_mm_get_unused_l2_start_aligned(void)
-{
-	return 0;
-}
+
+/**
+ * @brief Weak stub for retrieving the start address of unused L2 memory, aligned.
+ *
+ * This function is a placeholder and should be overridden by a platform-specific
+ * implementation. It is expected to return the starting address of unused L2 memory,
+ * aligned to the required boundary.
+ *
+ * @return uintptr_t The aligned start address of unused L2 memory. Returns 0 if
+ *         no implementation is provided.
+ */
+__weak
+uintptr_t adsp_mm_get_unused_l2_start_aligned(void)
+{
+	return 0;
+}
+
+/**
+ * @brief Weak stub for adding a virtual memory region.
+ *
+ * This function is a placeholder and should be overridden by a platform-specific
+ * implementation. It is expected to add a virtual memory region with the specified
+ * address, size, and attributes.
+ *
+ * @param region_address The starting address of the virtual memory region.
+ * @param region_size The size of the virtual memory region in bytes.
+ * @param attr Attributes for the virtual memory region (e.g., access permissions).
+ *
+ * @return int Returns 0 if successful, or an error code if the operation fails.
+ */
-
+
+/**
+ * @brief Add a virtual memory region to the system.
+ *
+ * This weak stub function is a placeholder for adding a virtual memory region.
+ * It is expected to be overridden by a real implementation in the future.
+ *
+ * @param region_address The starting address of the memory region.
+ * @param region_size The size of the memory region in bytes.
+ * @param attr Attributes for the memory region (e.g., access permissions).
+ *
+ * @return 0 on success, or an error code indicating failure.
+ */
-
-__weak
-uintptr_t adsp_mm_get_unused_l2_start_aligned(void)
-{
-	return 0;
-}
+
+/**
+ * @brief Weak stub for retrieving the start address of unused L2 memory, aligned.
+ *
+ * This function is a placeholder and should be overridden by a platform-specific
+ * implementation. It is expected to return the starting address of unused L2 memory,
+ * aligned to the required boundary.
+ *
+ * @return uintptr_t The aligned start address of unused L2 memory. Returns 0 if
+ *         no implementation is provided.
+ */
+__weak
+uintptr_t adsp_mm_get_unused_l2_start_aligned(void)
+{
+	return 0;
+}
+
+/**
+ * @brief Weak stub for adding a virtual memory region.
+ *
+ * This function is a placeholder and should be overridden by a platform-specific
+ * implementation. It is expected to add a virtual memory region with the specified
+ * address, size, and attributes.
+ *
+ * @param region_address The starting address of the virtual memory region.
+ * @param region_size The size of the virtual memory region in bytes.
+ * @param attr Attributes for the virtual memory region (e.g., access permissions).
+ *
+ * @return int Returns 0 if successful, or an error code if the operation fails.
+ */
-
+
+/**
+ * @brief Add a virtual memory region to the system.
+ *
+ * This weak stub function is a placeholder for adding a virtual memory region.
+ * It is expected to be overridden by a real implementation in the future.
+ *
+ * @param region_address The starting address of the memory region.
+ * @param region_size The size of the memory region in bytes.
+ * @param attr Attributes for the memory region (e.g., access permissions).
+ *
+ * @return 0 on success, or an error code indicating failure.
+ */
+__weak
+int adsp_add_virtual_memory_region(uintptr_t region_address, uint32_t region_size, uint32_t attr)
+{
+	return 0;
+}
+/* WA Stubs end */
-/* WA Stubs end */
+/* Workaround Stubs end */
-/* WA Stubs end */
+/* Workaround Stubs end */
+
 static int virtual_heap_init(void)
 {
+	int ret;
+
+	if (virtual_buffers_heap)
+		return -EEXIST;
+
+	/* add a virtual memory region */
+	ret = adsp_add_virtual_memory_region(adsp_mm_get_unused_l2_start_aligned(),
+					     CONFIG_SOF_ZEPHYR_VIRTUAL_HEAP_REGION_SIZE,
+					     VIRTUAL_REGION_SHARED_HEAP_ATTR);
+	if (ret)
+		return ret;
+
 	virtual_buffers_heap = vmh_init_heap(&static_hp_buffers, false);
 	if (!virtual_buffers_heap) {
 		tr_err(&zephyr_tr, "Unable to init virtual heap");

@@ -49,10 +49,7 @@ struct vmh_heap {
  */
 struct vmh_heap *vmh_init_heap(const struct vmh_heap_config *cfg, bool allocating_continuously)
 {
-	const struct sys_mm_drv_region *virtual_memory_regions =
-		sys_mm_drv_query_memory_regions();
 	int i;
-
 	struct vmh_heap *new_heap =
 		rzalloc(SOF_MEM_FLAG_KERNEL | SOF_MEM_FLAG_COHERENT, sizeof(*new_heap));
 
@@ -61,15 +58,14 @@ struct vmh_heap *vmh_init_heap(const struct vmh_heap_config *cfg, bool allocatin
 
 	k_mutex_init(&new_heap->lock);
 	struct vmh_heap_config new_config = {0};
-	const struct sys_mm_drv_region *region;
 
-	SYS_MM_DRV_MEMORY_REGION_FOREACH(virtual_memory_regions, region) {
-		if (region->attr == MEM_REG_ATTR_SHARED_HEAP) {
-			new_heap->virtual_region = region;
-			break;
-		}
-	}
-	if (!new_heap->virtual_region)
+	/* Workaround - use the very first virtual memory region because of virt addresses
+	 * collision.
+	 * Fix will be provided ASAP, but removing MEM_REG_ATTR_SHARED_HEAP from SOF is required
+	 * to merge Zephyr changes
+	 */
+	new_heap->virtual_region = sys_mm_drv_query_memory_regions();
+	if (!new_heap->virtual_region || !new_heap->virtual_region->size)
 		goto fail;
 
 	/* If no config was specified we will use default one */