module: adapter: use module memory APIs

Convert rmalloc and rballoc APIs to mod_alloc APIs.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>

Author: lrgirdwo

src/audio/module_adapter/module_adapter.c

@@ -337,23 +337,31 @@ int module_adapter_prepare(struct comp_dev *dev)
 
 	module_adapter_check_data(mod, dev, sink);
 
+	/* get memory flags for input and output */
 	memory_flags = user_get_buffer_memory_region(dev->drv);
+
 	/* allocate memory for input buffers */
 	if (mod->max_sources) {
 		mod->input_buffers =
-			rzalloc(memory_flags, sizeof(*mod->input_buffers) * mod->max_sources);
+			mod_alloc_ext(mod, memory_flags,
+				      sizeof(*mod->input_buffers) * mod->max_sources, 0);
+
 		if (!mod->input_buffers) {
 			comp_err(dev, "failed to allocate input buffers");
 			return -ENOMEM;
 		}
 	} else {
 		mod->input_buffers = NULL;
 	}
+	memset(mod->input_buffers, 0, sizeof(*mod->input_buffers) * mod->max_sources);
 
 	/* allocate memory for output buffers */
+	//TODO: check if shared memory is needed
 	if (mod->max_sinks) {
 		mod->output_buffers =
-			rzalloc(memory_flags, sizeof(*mod->output_buffers) * mod->max_sinks);
+			mod_alloc_ext(mod, memory_flags,
+				      sizeof(*mod->output_buffers) * mod->max_sinks, 0);
+
 		if (!mod->output_buffers) {
 			comp_err(dev, "failed to allocate output buffers");
 			ret = -ENOMEM;
@@ -362,6 +370,7 @@ int module_adapter_prepare(struct comp_dev *dev)
 	} else {
 		mod->output_buffers = NULL;
 	}
+	memset(mod->output_buffers, 0, sizeof(*mod->output_buffers) * mod->max_sinks);
 
 	/*
 	 * no need to allocate intermediate sink buffers if the module produces only period bytes
@@ -419,7 +428,8 @@ int module_adapter_prepare(struct comp_dev *dev)
 	size_t size = MAX(mod->deep_buff_bytes, mod->period_bytes);
 
 	list_for_item(blist, &dev->bsource_list) {
-		mod->input_buffers[i].data = rballoc(memory_flags, size);
+		mod->input_buffers[i].data = mod_alloc_ext(mod, memory_flags, size, 0);
+
 		if (!mod->input_buffers[i].data) {
 			comp_err(mod->dev, "Failed to alloc input buffer data");
 			ret = -ENOMEM;
@@ -431,7 +441,8 @@ int module_adapter_prepare(struct comp_dev *dev)
 	/* allocate memory for output buffer data */
 	i = 0;
 	list_for_item(blist, &dev->bsink_list) {
-		mod->output_buffers[i].data = rballoc(memory_flags, md->mpd.out_buff_size);
+		mod->output_buffers[i].data = mod_alloc_ext(mod, memory_flags,
+							    md->mpd.out_buff_size, 0);
 		if (!mod->output_buffers[i].data) {
 			comp_err(mod->dev, "Failed to alloc output buffer data");
 			ret = -ENOMEM;
@@ -497,16 +508,16 @@ int module_adapter_prepare(struct comp_dev *dev)
 
 out_data_free:
 	for (i = 0; i < mod->num_of_sinks; i++)
-		rfree(mod->output_buffers[i].data);
+		mod_free(mod, mod->output_buffers[i].data);
 
 in_data_free:
 	for (i = 0; i < mod->num_of_sources; i++)
-		rfree(mod->input_buffers[i].data);
+		mod_free(mod, mod->input_buffers[i].data);
 
 in_out_free:
-	rfree(mod->output_buffers);
+	mod_free(mod, mod->output_buffers);
 	mod->output_buffers = NULL;
-	rfree(mod->input_buffers);
+	mod_free(mod, mod->input_buffers);
 	mod->input_buffers = NULL;
 	return ret;
 }
@@ -529,10 +540,9 @@ int module_adapter_params(struct comp_dev *dev, struct sof_ipc_stream_params *pa
 
 	/* allocate stream_params each time */
 	if (mod->stream_params)
-		rfree(mod->stream_params);
+		mod_free(mod, mod->stream_params);
 
-	mod->stream_params = rzalloc(SOF_MEM_FLAG_USER,
-				     sizeof(*mod->stream_params) + params->ext_data_length);
+	mod->stream_params = mod_alloc(mod, sizeof(*mod->stream_params) + params->ext_data_length);
 	if (!mod->stream_params)
 		return -ENOMEM;
 
@@ -1212,15 +1222,14 @@ int module_adapter_reset(struct comp_dev *dev)
 
 	if (IS_PROCESSING_MODE_RAW_DATA(mod)) {
 		for (i = 0; i < mod->num_of_sinks; i++)
-			rfree((__sparse_force void *)mod->output_buffers[i].data);
+			mod_free(mod, (__sparse_force void *)mod->output_buffers[i].data);
 		for (i = 0; i < mod->num_of_sources; i++)
-			rfree((__sparse_force void *)mod->input_buffers[i].data);
+			mod_free(mod, (__sparse_force void *)mod->input_buffers[i].data);
 	}
 
 	if (IS_PROCESSING_MODE_RAW_DATA(mod) || IS_PROCESSING_MODE_AUDIO_STREAM(mod)) {
-		rfree(mod->output_buffers);
-		rfree(mod->input_buffers);
-
+		mod_free(mod, mod->output_buffers);
+		mod_free(mod, mod->input_buffers);
 		mod->num_of_sources = 0;
 		mod->num_of_sinks = 0;
 	}
@@ -1234,7 +1243,7 @@ int module_adapter_reset(struct comp_dev *dev)
 		buffer_zero(buffer);
 	}
 
-	rfree(mod->stream_params);
+	mod_free(mod, mod->stream_params);
 	mod->stream_params = NULL;
 
 	comp_dbg(dev, "done");
@@ -1268,7 +1277,8 @@ void module_adapter_free(struct comp_dev *dev)
 
 	mod_free_all(mod);
 
-	rfree(mod->stream_params);
+	mod_free(mod, mod->stream_params);
+
 	module_adapter_mem_free(mod);
 }
 EXPORT_SYMBOL(module_adapter_free);