copier: Covert copier_host.c

Author: Jyri Sarha

src/audio/copier/copier.c

@@ -191,7 +191,7 @@ __cold static int copier_init(struct processing_module *mod)
 		switch (node_id.f.dma_type) {
 		case ipc4_hda_host_output_class:
 		case ipc4_hda_host_input_class:
-			ret = copier_host_create(dev, cd, copier, ipc_pipe->pipeline);
+			ret = copier_host_create(mod, cd, copier, ipc_pipe->pipeline);
 			if (ret < 0) {
 				comp_err(dev, "unable to create host");
 				return ret;
@@ -271,7 +271,7 @@ __cold static int copier_free(struct processing_module *mod)
 	switch (dev->ipc_config.type) {
 	case SOF_COMP_HOST:
 		if (!cd->ipc_gtw)
-			copier_host_free(cd);
+			copier_host_free(mod);
 		else
 			/* handle gtw case */
 			copier_ipcgtw_free(cd);

src/audio/copier/copier_host.c

@@ -131,11 +131,11 @@ __cold static int init_pipeline_reg(struct comp_dev *dev)
  * Sof host component can support this case so copier reuses host
  * component to support host gateway.
  */
-__cold int copier_host_create(struct comp_dev *dev, struct copier_data *cd,
+__cold int copier_host_create(struct processing_module *mod, struct copier_data *cd,
 			      const struct ipc4_copier_module_cfg *copier_cfg,
 			      struct pipeline *pipeline)
 {
-	struct processing_module *mod = comp_mod(dev);
+	struct comp_dev *dev = mod->dev;
 	struct comp_ipc_config *config = &dev->ipc_config;
 	struct ipc_config_host ipc_host;
 	struct host_data *hd;
@@ -177,16 +177,17 @@ __cold int copier_host_create(struct comp_dev *dev, struct copier_data *cd,
 	ipc_host.dma_buffer_size = copier_cfg->gtw_cfg.dma_buffer_size;
 	ipc_host.feature_mask = copier_cfg->copier_feature_mask;
 
-	hd = rzalloc(SOF_MEM_FLAG_USER, sizeof(*hd));
+	hd = mod_zalloc(mod, sizeof(*hd));
 	if (!hd)
 		return -ENOMEM;
 
 	ret = host_common_new(hd, dev, &ipc_host, config->id);
 	if (ret < 0) {
 		comp_err(dev, "copier: host new failed with exit");
-		goto e_data;
+		return ret;
 	}
 #if CONFIG_HOST_DMA_STREAM_SYNCHRONIZATION
+	/* NOTE: Should use goto e_conv this #if section, not direct return */
 	/* Size of a configuration without optional parameters. */
 	const uint32_t basic_size = sizeof(*copier_cfg) +
 				    (copier_cfg->gtw_cfg.config_length - 1) * sizeof(uint32_t);
@@ -248,22 +249,21 @@ __cold int copier_host_create(struct comp_dev *dev, struct copier_data *cd,
 
 e_conv:
 	host_common_free(hd);
-e_data:
-	rfree(hd);
 
 	return ret;
 }
 
-__cold void copier_host_free(struct copier_data *cd)
+__cold void copier_host_free(struct processing_module *mod)
 {
+	struct copier_data *cd = module_get_private_data(mod);
+
 	assert_can_be_cold();
 
 #if CONFIG_HOST_DMA_STREAM_SYNCHRONIZATION
 	if (cd->hd->is_grouped)
 		delete_from_fpi_sync_group(cd->hd);
 #endif
 	host_common_free(cd->hd);
-	rfree(cd->hd);
 }
 
 /* This is called by DMA driver every time when DMA completes its current

src/audio/copier/host_copier.h

@@ -129,10 +129,10 @@ static inline int host_common_copy(struct host_data *hd, struct comp_dev *dev, c
 }
 void host_common_update(struct host_data *hd, struct comp_dev *dev, uint32_t bytes);
 void host_common_one_shot(struct host_data *hd, uint32_t bytes);
-int copier_host_create(struct comp_dev *dev, struct copier_data *cd,
+int copier_host_create(struct processing_module *mod, struct copier_data *cd,
 		       const struct ipc4_copier_module_cfg *copier_cfg,
 		       struct pipeline *pipeline);
-void copier_host_free(struct copier_data *cd);
+void copier_host_free(struct processing_module *mod);
 int copier_host_params(struct copier_data *cd, struct comp_dev *dev,
 		       struct sof_ipc_stream_params *params);
 void copier_host_dma_cb(struct comp_dev *dev, size_t bytes);