mem: remove virtual memory regions workarounds

remove all workarounds for virtual memory region creation:
 - stubs for zephyr functions
 - using first memory region without checking attributes

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

Author: marcinszkudlinski

zephyr/lib/alloc.c

@@ -289,25 +289,6 @@ 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;

zephyr/lib/regions_mm.c

@@ -49,7 +49,10 @@ 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));
 
@@ -58,13 +61,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;
 
-	/* 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();
+	SYS_MM_DRV_MEMORY_REGION_FOREACH(virtual_memory_regions, region) {
+		if (region->attr == VIRTUAL_REGION_SHARED_HEAP_ATTR) {
+			new_heap->virtual_region = region;
+			break;
+		}
+	}
 	if (!new_heap->virtual_region || !new_heap->virtual_region->size)
 		goto fail;