Audio: SRC: All memory allocations through module

Change all memory allocations to go through module API mod_alloc(),
mod_zalloc(), and mod_free(). The mod_free() calls are dropped form
error handling branches and from src_free() as the memory is anyway
freed as the module should unload shortly.

Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>

Author: Jyri Sarha

src/audio/src/src.c

@@ -60,7 +60,7 @@ static int src_prepare(struct processing_module *mod,
 	if (ret < 0)
 		return ret;
 
-	ret = src_allocate_copy_stages(mod->dev, a,
+	ret = src_allocate_copy_stages(mod, a,
 				       src_table1[a->idx_out][a->idx_in],
 				       src_table2[a->idx_out][a->idx_in]);
 	if (ret < 0)

src/audio/src/src_common.c

@@ -531,9 +531,9 @@ int src_params_general(struct processing_module *mod,
 	}
 
 	/* free any existing delay lines. TODO reuse if same size */
-	rfree(cd->delay_lines);
+	mod_free(mod, cd->delay_lines);
 
-	cd->delay_lines = rballoc(SOF_MEM_FLAG_USER, delay_lines_size);
+	cd->delay_lines = mod_alloc(mod, delay_lines_size);
 	if (!cd->delay_lines) {
 		comp_err(dev, "src_params(): failed to alloc cd->delay_lines, delay_lines_size = %zu",
 			 delay_lines_size);
@@ -594,7 +594,7 @@ int src_param_set(struct comp_dev *dev, struct comp_data *cd)
 	return 0;
 }
 
-int src_allocate_copy_stages(struct comp_dev *dev, struct src_param *prm,
+int src_allocate_copy_stages(struct processing_module *mod, struct src_param *prm,
 			     const struct src_stage *stage_src1,
 			     const struct src_stage *stage_src2)
 {
@@ -607,10 +607,9 @@ int src_allocate_copy_stages(struct comp_dev *dev, struct src_param *prm,
 	size_t tap_size = sizeof(int32_t);
 #endif
 
-	stage_dst = rmalloc(SOF_MEM_FLAG_USER,
-			    2 * sizeof(*stage_dst));
+	stage_dst = mod_alloc(mod, 2 * sizeof(*stage_dst));
 	if (!stage_dst) {
-		comp_err(dev, "failed to allocate stages");
+		comp_err(mod->dev, "failed to allocate stages");
 		return -ENOMEM;
 	}
 
@@ -622,20 +621,18 @@ int src_allocate_copy_stages(struct comp_dev *dev, struct src_param *prm,
 	coef_size[1] = tap_size * stage_src2->filter_length;
 
 	if (coef_size[0] == 0 || coef_size[1] == 0) {
-		comp_err(dev,
+		comp_err(mod->dev,
 			 "illegal zero coefficient vector size for unsupported conversion request %d to %d",
 			 prm->in_fs[prm->idx_in], prm->out_fs[prm->idx_out]);
-		rfree(stage_dst);
 		return -EINVAL;
 	}
 
 	stage_dst[0].coefs = fast_get(stage_src1->coefs, coef_size[0]);
 	stage_dst[1].coefs = fast_get(stage_src2->coefs, coef_size[1]);
 
 	if (!stage_dst[0].coefs || !stage_dst[1].coefs)  {
-		comp_err(dev, "failed to allocate coefficients");
+		comp_err(mod->dev, "failed to allocate coefficients");
 		fast_put(stage_dst[0].coefs);
-		rfree(stage_dst);
 		return -ENOMEM;
 	}
 
@@ -707,21 +704,19 @@ int src_reset(struct processing_module *mod)
 
 __cold int src_free(struct processing_module *mod)
 {
+#if CONFIG_FAST_GET
 	struct comp_data *cd = module_get_private_data(mod);
+#endif
 
 	assert_can_be_cold();
 
 	comp_info(mod->dev, "src_free()");
 
-	/* Free dynamically reserved buffers for SRC algorithm */
-	rfree(cd->delay_lines);
 #if CONFIG_FAST_GET
 	if (cd->param.stage1) {
 		fast_put(cd->param.stage1->coefs);
 		fast_put(cd->param.stage2->coefs);
 	}
-	rfree((void *)cd->param.stage1);
 #endif
-	rfree(cd);
 	return 0;
 }

src/audio/src/src_common.h

@@ -215,7 +215,7 @@ static inline int src_fallback(struct comp_data *cd,
 	return 0;
 }
 
-int src_allocate_copy_stages(struct comp_dev *dev, struct src_param *prm,
+int src_allocate_copy_stages(struct processing_module *mod, struct src_param *prm,
 			     const struct src_stage *stage_src1,
 			     const struct src_stage *stage_src2);
 int src_rate_check(const void *spec);

src/audio/src/src_ipc3.c

@@ -178,7 +178,7 @@ int src_init(struct processing_module *mod)
 		return -EINVAL;
 	}
 
-	cd = rzalloc(SOF_MEM_FLAG_USER, sizeof(*cd));
+	cd = mod_zalloc(mod, sizeof(*cd));
 	if (!cd)
 		return -ENOMEM;
 

src/audio/src/src_ipc4.c

@@ -209,7 +209,7 @@ __cold int src_init(struct processing_module *mod)
 		return -EINVAL;
 	}
 
-	cd = rzalloc(SOF_MEM_FLAG_USER, sizeof(*cd));
+	cd = mod_zalloc(mod, sizeof(*cd));
 	if (!cd)
 		return -ENOMEM;
 
@@ -240,7 +240,6 @@ __cold int src_init(struct processing_module *mod)
 	default:
 		comp_err(dev, "src_init(): Illegal sample depth %d",
 			 cd->ipc_config.base.audio_fmt.depth);
-		rfree(cd);
 		return -EINVAL;
 	}
 

src/audio/src/src_lite.c

@@ -43,7 +43,7 @@ static int src_lite_prepare(struct processing_module *mod,
 	if (ret < 0)
 		return ret;
 
-	ret = src_allocate_copy_stages(mod->dev, a,
+	ret = src_allocate_copy_stages(mod, a,
 				       src_table1[a->idx_out][a->idx_in],
 				       src_table2[a->idx_out][a->idx_in]);
 	if (ret < 0)