audio: cadence: All memory allocations to use mod_alloc() and friends

After adding two allocation levels to mod_alloc() and friends it is
now possible the convert cadence codec fully to module resource
allocation API.

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

Author: Jyri Sarha

src/audio/module_adapter/module/cadence.c

@@ -235,7 +235,7 @@ static int cadence_codec_post_init(struct processing_module *mod)
 		return ret;
 	}
 	/* Allocate space for codec object */
-	cd->self = rballoc(SOF_MEM_FLAG_USER, obj_size);
+	cd->self = mod_balloc(mod, obj_size);
 	if (!cd->self) {
 		comp_err(dev, "failed to allocate space for lib object");
 		return -ENOMEM;
@@ -247,7 +247,7 @@ static int cadence_codec_post_init(struct processing_module *mod)
 	API_CALL(cd, XA_API_CMD_INIT, XA_CMD_TYPE_INIT_API_PRE_CONFIG_PARAMS,
 		 NULL, ret);
 	if (ret != LIB_NO_ERROR) {
-		rfree(cd->self);
+		mod_free(mod, cd->self);
 		return ret;
 	}
 
@@ -268,7 +268,7 @@ static int cadence_codec_init(struct processing_module *mod)
 
 	comp_dbg(dev, "cadence_codec_init() start");
 
-	cd = rzalloc(SOF_MEM_FLAG_USER, sizeof(struct cadence_codec_data));
+	cd = mod_zalloc(mod, sizeof(struct cadence_codec_data));
 	if (!cd) {
 		comp_err(dev, "failed to allocate memory for cadence codec data");
 		return -ENOMEM;
@@ -284,17 +284,15 @@ static int cadence_codec_init(struct processing_module *mod)
 		cfg = (const struct ipc4_cadence_module_cfg *)codec->cfg.init_data;
 
 		/* allocate memory for set up config */
-		setup_cfg->data = rmalloc(SOF_MEM_FLAG_USER,
-					  cfg->param_size);
+		setup_cfg->data = mod_alloc(mod, cfg->param_size);
 		if (!setup_cfg->data) {
 			comp_err(dev, "failed to alloc setup config");
 			ret = -ENOMEM;
 			goto free;
 		}
 
 		/* allocate memory for runtime set up config */
-		codec->cfg.data = rmalloc(SOF_MEM_FLAG_USER,
-					  cfg->param_size);
+		codec->cfg.data = mod_alloc(mod, cfg->param_size);
 		if (!codec->cfg.data) {
 			comp_err(dev, "failed to alloc runtime setup config");
 			ret = -ENOMEM;
@@ -326,11 +324,11 @@ static int cadence_codec_init(struct processing_module *mod)
 	return 0;
 
 free_cfg2:
-	rfree(codec->cfg.data);
+	mod_free(mod, codec->cfg.data);
 free_cfg:
-	rfree(setup_cfg->data);
+	mod_free(mod, setup_cfg->data);
 free:
-	rfree(cd);
+	mod_free(mod, cd);
 	return ret;
 }
 
@@ -345,7 +343,7 @@ static int cadence_codec_init(struct processing_module *mod)
 
 	comp_dbg(dev, "cadence_codec_init() start");
 
-	cd = rzalloc(SOF_MEM_FLAG_USER, sizeof(struct cadence_codec_data));
+	cd = mod_zalloc(mod, sizeof(struct cadence_codec_data));
 	if (!cd) {
 		comp_err(dev, "failed to allocate memory for cadence codec data");
 		return -ENOMEM;
@@ -359,8 +357,7 @@ static int cadence_codec_init(struct processing_module *mod)
 		setup_cfg = &cd->setup_cfg;
 
 		/* allocate memory for set up config */
-		setup_cfg->data = rmalloc(SOF_MEM_FLAG_USER,
-					  codec->cfg.size);
+		setup_cfg->data = mod_alloc(mod, codec->cfg.size);
 		if (!setup_cfg->data) {
 			comp_err(dev, "failed to alloc setup config");
 			ret = -ENOMEM;
@@ -383,9 +380,9 @@ static int cadence_codec_init(struct processing_module *mod)
 	return 0;
 
 free_cfg:
-	rfree(setup_cfg->data);
+	mod_free(mod, setup_cfg->data);
 free:
-	rfree(cd);
+	mod_free(mod, cd);
 	return ret;
 }
 
@@ -673,6 +670,18 @@ static int cadence_codec_prepare(struct processing_module *mod,
 	if (ret)
 		return ret;
 
+	/*
+	 * The reason why lvl2 init is called here and before is
+	 * because earlier the cd->self was not allocated with
+	 * mod_balloc(), but directly from heap with rballoc(). So the
+	 * idea is to keep line between the two levels of allocation in
+	 * the same place. However, it would make sense to move
+	 * mod_alloc_lvl2_init() before cadence_codec_post_init()
+	 * call, so that all memory in prepare()/reset() cycle would
+	 * be allocated from lvl2.
+	 */
+	mod_alloc_lvl2_init(mod);
+
 	ret = cadence_codec_apply_config(mod);
 	if (ret) {
 		comp_err(dev, "cadence_codec_prepare() error %x: failed to apply config",
@@ -847,7 +856,7 @@ static int cadence_codec_reset(struct processing_module *mod)
 	 * So, free all memory associated with runtime params. These will be reallocated during
 	 * prepare.
 	 */
-	mod_free_all(mod);
+	mod_free_all_lvl2(mod);
 
 	/* reset to default params */
 	API_CALL(cd, XA_API_CMD_INIT, XA_CMD_TYPE_INIT_API_PRE_CONFIG_PARAMS, NULL, ret);
@@ -856,7 +865,7 @@ static int cadence_codec_reset(struct processing_module *mod)
 
 	codec->mpd.init_done = 0;
 
-	rfree(cd->self);
+	mod_free(mod, cd->self);
 	cd->self = NULL;
 
 	return ret;
@@ -866,10 +875,10 @@ static int cadence_codec_free(struct processing_module *mod)
 {
 	struct cadence_codec_data *cd = module_get_private_data(mod);
 
-	rfree(cd->setup_cfg.data);
-	mod_free_all(mod);
-	rfree(cd->self);
-	rfree(cd);
+	mod_free(mod, cd->setup_cfg.data);
+	mod_free_all_lvl2(mod);
+	mod_free(mod, cd->self);
+	mod_free(mod, cd);
 	return 0;
 }