fast-get: switch to module allocation context

fast-get has to choose which allocation method to use, it needs
access to the full module allocation context.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>

Author: lyakh

src/audio/module_adapter/module/generic.c

@@ -323,7 +323,7 @@ const void *z_impl_mod_fast_get(struct processing_module *mod, const void * cons
 	if (!container)
 		return NULL;
 
-	ptr = fast_get(res->alloc->heap, dram_ptr, size);
+	ptr = fast_get(res->alloc, dram_ptr, size);
 	if (!ptr) {
 		container_put(mod, container);
 		return NULL;
@@ -362,7 +362,7 @@ static int free_contents(struct processing_module *mod, struct module_resource *
 #else
 		mdom = NULL;
 #endif
-		fast_put(res->alloc->heap, mdom, container->sram_ptr);
+		fast_put(res->alloc, mdom, container->sram_ptr);
 		return 0;
 #endif
 	default:

src/include/sof/lib/fast-get.h

@@ -25,14 +25,16 @@ struct k_mem_domain;
 #if (CONFIG_COLD_STORE_EXECUTE_DRAM &&					\
 	(CONFIG_LLEXT_TYPE_ELF_RELOCATABLE || !defined(LL_EXTENSION_BUILD))) || \
 	!CONFIG_SOF_FULL_ZEPHYR_APPLICATION
-const void *fast_get(struct k_heap *heap, const void * const dram_ptr, size_t size);
-void fast_put(struct k_heap *heap, struct k_mem_domain *mdom, const void *sram_ptr);
+const void *fast_get(struct mod_alloc_ctx *alloc, const void * const dram_ptr, size_t size);
+void fast_put(struct mod_alloc_ctx *alloc, struct k_mem_domain *mdom, const void *sram_ptr);
 #else
-static inline const void *fast_get(struct k_heap *heap, const void * const dram_ptr, size_t size)
+static inline const void *fast_get(struct mod_alloc_ctx *alloc, const void * const dram_ptr,
+				   size_t size)
 {
 	return dram_ptr;
 }
-static inline void fast_put(struct k_heap *heap, struct k_mem_domain *mdom, const void *sram_ptr) {}
+static inline void fast_put(struct mod_alloc_ctx *alloc, struct k_mem_domain *mdom,
+			    const void *sram_ptr) {}
 #endif
 
 #endif /* __SOF_LIB_FAST_GET_H__ */

zephyr/lib/fast-get.c

@@ -8,6 +8,7 @@
 #include <stdint.h>
 #include <errno.h>
 
+#include <sof/audio/module_adapter/module/generic.h>
 #include <sof/lib/fast-get.h>
 #include <rtos/alloc.h>
 #include <rtos/cache.h>
@@ -125,7 +126,7 @@ static int fast_get_access_grant(struct k_mem_domain *mdom, void *addr, size_t s
 }
 #endif /* CONFIG_USERSPACE */
 
-const void *fast_get(struct k_heap *heap, const void *dram_ptr, size_t size)
+const void *fast_get(struct mod_alloc_ctx *alloc, const void *dram_ptr, size_t size)
 {
 #if CONFIG_USERSPACE
 	bool current_is_userspace = thread_is_userspace(k_current_get());
@@ -220,7 +221,7 @@ const void *fast_get(struct k_heap *heap, const void *dram_ptr, size_t size)
 	 * SRAM copy will be allocated on its own heap, so it will have access
 	 * to it
 	 */
-	ret = sof_heap_alloc(heap, alloc_flags, alloc_size, alloc_align);
+	ret = sof_heap_alloc(alloc->heap, alloc_flags, alloc_size, alloc_align);
 	if (!ret)
 		goto out;
 
@@ -232,7 +233,7 @@ const void *fast_get(struct k_heap *heap, const void *dram_ptr, size_t size)
 
 		if (err < 0) {
 			LOG_ERR("failed to grant access err=%d", err);
-			sof_heap_free(heap, ret);
+			sof_heap_free(alloc->heap, ret);
 			ret = NULL;
 			goto out;
 		}
@@ -266,7 +267,7 @@ static struct sof_fast_get_entry *fast_put_find_entry(struct sof_fast_get_data *
 	return NULL;
 }
 
-void fast_put(struct k_heap *heap, struct k_mem_domain *mdom, const void *sram_ptr)
+void fast_put(struct mod_alloc_ctx *alloc, struct k_mem_domain *mdom, const void *sram_ptr)
 {
 	struct sof_fast_get_data *data = &fast_get_data;
 	struct sof_fast_get_entry *entry;
@@ -283,7 +284,7 @@ void fast_put(struct k_heap *heap, struct k_mem_domain *mdom, const void *sram_p
 
 	if (!entry->refcount) {
 		LOG_DBG("freeing buffer %p", sram_ptr);
-		sof_heap_free(heap, entry->sram_ptr);
+		sof_heap_free(alloc->heap, entry->sram_ptr);
 	}
 
 #if CONFIG_USERSPACE