mem: workaround - make SOF working with and without zephyr changes

This commit add creation of virtual memory region for heap
Called functions are not yet present in Zephyr (Zephyr is creating
regions by itself now), so the commit also contains weaked aliases
of zephyr functions.

Signed-off-by: Marcin Szkudlinski <marcin.szkudlinski@intel.com>

Author: marcinszkudlinski

zephyr/Kconfig

@@ -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

zephyr/include/sof/lib/regions_mm.h

@@ -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
  */

zephyr/lib/alloc.c

@@ -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
+ *
+ * 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
+int adsp_add_virtual_memory_region(uintptr_t region_address, uint32_t region_size, uint32_t attr)
+{
+	return 0;
+}
+/* WA 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");