audio: module: simplify resource allocation context

Flatten struct sof_alloc_api by removing struct dp_heap_user.

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

Author: lyakh

src/audio/buffers/comp_buffer.c

@@ -163,16 +163,12 @@ static void comp_buffer_free(struct sof_audio_buffer *audio_buffer)
 	struct sof_alloc_api *alloc = buffer->audio_buffer.alloc;
 
 	rfree(buffer->stream.addr);
-	if (alloc && alloc->vreg)
+	if (alloc && alloc->vreg) {
 		vregion_free(alloc->vreg, buffer);
-	else
+		if (!--alloc->client_count)
+			vregion_destroy(alloc->vreg);
+	} else {
 		sof_heap_free(alloc ? alloc->heap : NULL, buffer);
-
-	if (alloc && alloc->client && !--alloc->client->client_count) {
-		rfree(alloc->client);
-		alloc->client = NULL;
-		/* NULL is allowed */
-		vregion_destroy(alloc->vreg);
 	}
 }
 

src/audio/module_adapter/module/generic.c

@@ -162,7 +162,7 @@ void mod_heap_info(struct processing_module *mod, size_t *size, uintptr_t *start
 		*size = res->alloc.heap->heap.init_bytes;
 
 	if (start)
-		*start = (uintptr_t)res->alloc.client;
+		*start = (uintptr_t)res->alloc.heap;
 }
 #endif
 

src/audio/module_adapter/module_adapter.c

@@ -57,8 +57,8 @@ struct comp_dev *module_adapter_new(const struct comp_driver *drv,
 #define PAGE_SZ HOST_PAGE_SIZE
 #endif
 
-static struct dp_heap_user *module_adapter_dp_heap_new(const struct comp_ipc_config *config,
-						       size_t *heap_size)
+static struct k_heap *module_adapter_dp_heap_new(const struct comp_ipc_config *config,
+						 size_t *heap_size)
 {
 	/* src-lite with 8 channels has been seen allocating 14k in one go */
 	/* FIXME: the size will be derived from configuration */
@@ -71,9 +71,8 @@ static struct dp_heap_user *module_adapter_dp_heap_new(const struct comp_ipc_con
 	if (!mod_heap_mem)
 		return NULL;
 
-	struct dp_heap_user *mod_heap_user = (struct dp_heap_user *)mod_heap_mem;
-	struct k_heap *mod_heap = &mod_heap_user->heap;
-	const size_t heap_prefix_size = ALIGN_UP(sizeof(*mod_heap_user), 4);
+	struct k_heap *mod_heap = (struct k_heap *)mod_heap_mem;
+	const size_t heap_prefix_size = ALIGN_UP(sizeof(*mod_heap), 4);
 	void *mod_heap_buf = mod_heap_mem + heap_prefix_size;
 
 	*heap_size = buf_size - heap_prefix_size;
@@ -83,7 +82,7 @@ static struct dp_heap_user *module_adapter_dp_heap_new(const struct comp_ipc_con
 	mod_heap->heap.init_bytes = *heap_size;
 #endif
 
-	return mod_heap_user;
+	return mod_heap;
 }
 
 static struct processing_module *module_adapter_mem_alloc(const struct comp_driver *drv,
@@ -99,20 +98,17 @@ static struct processing_module *module_adapter_mem_alloc(const struct comp_driv
 	 */
 	uint32_t flags = config->proc_domain == COMP_PROCESSING_DOMAIN_DP ?
 		SOF_MEM_FLAG_USER | SOF_MEM_FLAG_COHERENT : SOF_MEM_FLAG_USER;
-	struct dp_heap_user *mod_heap_user;
 	size_t heap_size;
 
 	if (config->proc_domain == COMP_PROCESSING_DOMAIN_DP && IS_ENABLED(CONFIG_USERSPACE) &&
 	    !IS_ENABLED(CONFIG_SOF_USERSPACE_USE_DRIVER_HEAP)) {
-		mod_heap_user = module_adapter_dp_heap_new(config, &heap_size);
-		if (!mod_heap_user) {
+		mod_heap = module_adapter_dp_heap_new(config, &heap_size);
+		if (!mod_heap) {
 			comp_cl_err(drv, "Failed to allocate DP module heap");
 			return NULL;
 		}
-		mod_heap = &mod_heap_user->heap;
 	} else {
 		mod_heap = drv->user_heap;
-		mod_heap_user = NULL;
 		heap_size = 0;
 	}
 
@@ -123,9 +119,10 @@ static struct processing_module *module_adapter_mem_alloc(const struct comp_driv
 		goto emod;
 	}
 
+	struct sof_alloc_api *alloc = &mod->priv.resources.alloc;
+
 	memset(mod, 0, sizeof(*mod));
-	mod->priv.resources.alloc.heap = mod_heap;
-	mod->priv.resources.alloc.client = mod_heap_user;
+	alloc->heap = mod_heap;
 	mod_resource_init(mod);
 
 	/*
@@ -147,22 +144,23 @@ static struct processing_module *module_adapter_mem_alloc(const struct comp_driv
 	mod->dev = dev;
 	dev->mod = mod;
 
-	if (mod_heap_user)
-		mod_heap_user->client_count++;
+	if (config->proc_domain == COMP_PROCESSING_DOMAIN_DP)
+		alloc->client_count++;
 
 	return mod;
 
 err:
 	sof_heap_free(mod_heap, mod);
 emod:
-	rfree(mod_heap_user);
+	rfree(mod_heap);
 
 	return NULL;
 }
 
 static void module_adapter_mem_free(struct processing_module *mod)
 {
-	struct k_heap *mod_heap = mod->priv.resources.alloc.heap;
+	struct sof_alloc_api *alloc = &mod->priv.resources.alloc;
+	struct k_heap *mod_heap = alloc->heap;
 	unsigned int domain = mod->dev->ipc_config.proc_domain;
 
 	/*
@@ -174,13 +172,8 @@ static void module_adapter_mem_free(struct processing_module *mod)
 #endif
 	sof_heap_free(mod_heap, mod->dev);
 	sof_heap_free(mod_heap, mod);
-	if (domain == COMP_PROCESSING_DOMAIN_DP) {
-		struct dp_heap_user *mod_heap_user = container_of(mod_heap, struct dp_heap_user,
-								  heap);
-
-		if (mod_heap && !--mod_heap_user->client_count)
-			rfree(mod_heap_user);
-	}
+	if (domain == COMP_PROCESSING_DOMAIN_DP && mod_heap && !--alloc->client_count)
+		rfree(mod_heap);
 }
 
 /*
@@ -626,7 +619,7 @@ int module_adapter_prepare(struct comp_dev *dev)
 
 			if (md->resources.alloc.heap &&
 			    md->resources.alloc.heap != dev->drv->user_heap)
-				md->resources.alloc.client->client_count++;
+				md->resources.alloc.client_count++;
 
 			irq_local_disable(flags);
 			list_item_prepend(&buffer->buffers_list, &mod->raw_data_buffers_list);

src/include/sof/audio/component.h

@@ -580,11 +580,10 @@ struct comp_ops {
 
 struct k_heap;
 struct vregion;
-struct dp_heap_user;
 struct sof_alloc_api {
 	struct k_heap *heap;
 	struct vregion *vreg;
-	struct dp_heap_user *client;
+	unsigned int client_count;	/* devices and buffers */
 };
 
 /**

src/include/sof/schedule/dp_schedule.h

@@ -119,12 +119,6 @@ union scheduler_dp_thread_ipc_param {
 	} pipeline_state;
 };
 
-struct dp_heap_user {
-	struct k_heap heap;
-	/* So far relying on linear processing of serialized IPCs, but might need protection */
-	unsigned int client_count;	/* devices and buffers */
-};
-
 #if CONFIG_ZEPHYR_DP_SCHEDULER
 int scheduler_dp_thread_ipc(struct processing_module *pmod, unsigned int cmd,
 			    const union scheduler_dp_thread_ipc_param *param);

src/ipc/ipc4/helper.c

@@ -739,7 +739,7 @@ __cold int ipc_comp_connect(struct ipc *ipc, ipc_pipe_comp_connect *_connect)
 
 #if CONFIG_ZEPHYR_DP_SCHEDULER
 	if (alloc)
-		alloc->client->client_count++;
+		alloc->client_count++;
 #endif
 
 	/*