alloc: xtos: remove xtos memory zones.

Zones are no longer needed as Zephyr manages heaps.
Remove enum and API usage.

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

Author: lrgirdwo

src/arch/xtensa/lib/cpu.c

@@ -46,7 +46,7 @@ static void alloc_shared_secondary_cores_objects(void)
 {
 	uint8_t *dynamic_vectors;
 
-	dynamic_vectors = rzalloc(SOF_MEM_ZONE_RUNTIME_SHARED, 0, 0, SOF_DYNAMIC_VECTORS_SIZE);
+	dynamic_vectors = rzalloc(0, 0, SOF_DYNAMIC_VECTORS_SIZE);
 	if (dynamic_vectors == NULL)
 		sof_panic(SOF_IPC_PANIC_MEM);
 

src/arch/xtensa/schedule/task.c

@@ -65,7 +65,7 @@ void task_context_set(void *task_ctx)
 
 int task_context_alloc(void **task_ctx)
 {
-	*task_ctx = rzalloc(SOF_MEM_ZONE_SYS_RUNTIME, 0, SOF_MEM_CAPS_RAM,
+	*task_ctx = rzalloc(0, SOF_MEM_CAPS_RAM,
 			    sizeof(xtos_task_context));
 	if (!*task_ctx)
 		return -ENOMEM;

src/audio/aria/aria.c

@@ -126,7 +126,7 @@ static int aria_init(struct processing_module *mod)
 	list_init(&dev->bsource_list);
 	list_init(&dev->bsink_list);
 
-	cd = rzalloc(SOF_MEM_ZONE_RUNTIME, 0, SOF_MEM_CAPS_RAM, sizeof(*cd));
+	cd = rzalloc(0, SOF_MEM_CAPS_RAM, sizeof(*cd));
 	if (!cd) {
 		return -ENOMEM;
 	}

src/audio/asrc/asrc.c

@@ -217,7 +217,7 @@ static int asrc_init(struct processing_module *mod)
 		return -EINVAL;
 	}
 
-	cd = rzalloc(SOF_MEM_ZONE_RUNTIME, 0, SOF_MEM_CAPS_RAM, sizeof(*cd));
+	cd = rzalloc(0, SOF_MEM_CAPS_RAM, sizeof(*cd));
 	if (!cd)
 		return -ENOMEM;
 
@@ -261,7 +261,7 @@ static int asrc_initialize_buffers(struct asrc_farrow *src_obj)
 		buffer_size = src_obj->buffer_length * sizeof(int32_t);
 
 		for (ch = 0; ch < src_obj->num_channels; ch++) {
-			buf_32 = rzalloc(SOF_MEM_ZONE_RUNTIME, 0, SOF_MEM_CAPS_RAM, buffer_size);
+			buf_32 = rzalloc(0, SOF_MEM_CAPS_RAM, buffer_size);
 
 			if (!buf_32)
 				return -ENOMEM;
@@ -272,7 +272,7 @@ static int asrc_initialize_buffers(struct asrc_farrow *src_obj)
 		buffer_size = src_obj->buffer_length * sizeof(int16_t);
 
 		for (ch = 0; ch < src_obj->num_channels; ch++) {
-			buf_16 = rzalloc(SOF_MEM_ZONE_RUNTIME, 0, SOF_MEM_CAPS_RAM, buffer_size);
+			buf_16 = rzalloc(0, SOF_MEM_CAPS_RAM, buffer_size);
 
 			if (!buf_16)
 				return -ENOMEM;
@@ -614,7 +614,7 @@ static int asrc_prepare(struct processing_module *mod,
 	cd->buf_size = (cd->source_frames_max + cd->sink_frames_max) *
 		frame_bytes;
 
-	cd->buf = rzalloc(SOF_MEM_ZONE_RUNTIME, 0, SOF_MEM_CAPS_RAM,
+	cd->buf = rzalloc(0, SOF_MEM_CAPS_RAM,
 			  cd->buf_size);
 	if (!cd->buf) {
 		cd->buf_size = 0;
@@ -640,7 +640,7 @@ static int asrc_prepare(struct processing_module *mod,
 		goto err_free_buf;
 	}
 
-	cd->asrc_obj = rzalloc(SOF_MEM_ZONE_RUNTIME, 0, SOF_MEM_CAPS_RAM,
+	cd->asrc_obj = rzalloc(0, SOF_MEM_CAPS_RAM,
 			       cd->asrc_size);
 	if (!cd->asrc_obj) {
 		comp_err(dev, "asrc_prepare(), allocation fail for size %d",

src/audio/buffers/comp_buffer.c

@@ -188,10 +188,10 @@ static struct comp_buffer *buffer_alloc_struct(void *stream_addr, size_t size, u
 
 	tr_dbg(&buffer_tr, "buffer_alloc_struct()");
 
-	/* allocate new buffer	 */
-	enum mem_zone zone = is_shared ? SOF_MEM_ZONE_RUNTIME_SHARED : SOF_MEM_ZONE_RUNTIME;
+	/* allocate new buffer - use coherent flag is shared */
+	flags |= is_shared ? SOF_MEM_FLAG_COHERENT : 0;
 
-	buffer = rzalloc(zone, 0, SOF_MEM_CAPS_RAM, sizeof(*buffer));
+	buffer = rzalloc(flags, SOF_MEM_CAPS_RAM, sizeof(*buffer));
 
 	if (!buffer) {
 		tr_err(&buffer_tr, "buffer_alloc_struct(): could not alloc structure");

src/audio/buffers/ring_buffer.c

@@ -280,10 +280,10 @@ struct ring_buffer *ring_buffer_create(size_t min_available, size_t min_free_spa
 
 	/* allocate ring_buffer structure */
 	if (is_shared)
-		ring_buffer = rzalloc(SOF_MEM_ZONE_RUNTIME_SHARED, 0, SOF_MEM_CAPS_RAM,
+		ring_buffer = rzalloc(0, SOF_MEM_CAPS_RAM,
 				      sizeof(*ring_buffer));
 	else
-		ring_buffer = rzalloc(SOF_MEM_ZONE_RUNTIME, 0, SOF_MEM_CAPS_RAM,
+		ring_buffer = rzalloc(0, SOF_MEM_CAPS_RAM,
 				      sizeof(*ring_buffer));
 	if (!ring_buffer)
 		return NULL;

src/audio/chain_dma.c

@@ -668,7 +668,7 @@ __cold static struct comp_dev *chain_task_create(const struct comp_driver *drv,
 	if (!dev)
 		return NULL;
 
-	cd = rzalloc(SOF_MEM_ZONE_RUNTIME, 0, SOF_MEM_CAPS_RAM, sizeof(*cd));
+	cd = rzalloc(0, SOF_MEM_CAPS_RAM, sizeof(*cd));
 	if (!cd)
 		goto error;
 

src/audio/copier/copier.c

@@ -87,7 +87,7 @@ static int mic_privacy_configure(struct comp_dev *dev, struct copier_data *cd)
 	struct mic_privacy_data *mic_priv_data;
 	int ret;
 
-	mic_priv_data = rzalloc(SOF_MEM_ZONE_RUNTIME, 0, SOF_MEM_CAPS_RAM,
+	mic_priv_data = rzalloc(0, SOF_MEM_CAPS_RAM,
 				sizeof(struct mic_privacy_data));
 	if (!mic_priv_data)
 		return -ENOMEM;
@@ -144,7 +144,7 @@ __cold static int copier_init(struct processing_module *mod)
 
 	assert_can_be_cold();
 
-	cd = rzalloc(SOF_MEM_ZONE_RUNTIME, 0, SOF_MEM_CAPS_RAM, sizeof(*cd));
+	cd = rzalloc(0, SOF_MEM_CAPS_RAM, sizeof(*cd));
 	if (!cd)
 		return -ENOMEM;
 
@@ -166,7 +166,7 @@ __cold static int copier_init(struct processing_module *mod)
 	 */
 	if (copier->gtw_cfg.config_length) {
 		gtw_cfg_size = copier->gtw_cfg.config_length << 2;
-		gtw_cfg = rmalloc(SOF_MEM_ZONE_RUNTIME, 0, SOF_MEM_CAPS_RAM,
+		gtw_cfg = rmalloc(0, SOF_MEM_CAPS_RAM,
 				  gtw_cfg_size);
 		if (!gtw_cfg) {
 			ret = -ENOMEM;

src/audio/copier/copier_dai.c

@@ -204,7 +204,7 @@ __cold static int copier_dai_init(struct comp_dev *dev,
 			return ret;
 	}
 
-	dd = rzalloc(SOF_MEM_ZONE_RUNTIME_SHARED, 0, SOF_MEM_CAPS_RAM, sizeof(*dd));
+	dd = rzalloc(0, SOF_MEM_CAPS_RAM, sizeof(*dd));
 	if (!dd)
 		return -ENOMEM;
 
@@ -223,8 +223,8 @@ __cold static int copier_dai_init(struct comp_dev *dev,
 
 	/* Allocate gain data if selected for this dai type and set basic params */
 	if (dai->apply_gain) {
-		struct copier_gain_params *gain_data = rzalloc(SOF_MEM_ZONE_RUNTIME_SHARED,
-							       0, SOF_MEM_CAPS_RAM,
+		struct copier_gain_params *gain_data = rzalloc(SOF_MEM_FLAG_COHERENT,
+							       SOF_MEM_CAPS_RAM,
 							       sizeof(*gain_data));
 		if (!gain_data) {
 			ret = -ENOMEM;

src/audio/copier/copier_host.c

@@ -62,7 +62,7 @@ __cold static int add_to_fpi_sync_group(struct comp_dev *parent_dev,
 
 		group->ref_count++;
 	} else {
-		group = rzalloc(SOF_MEM_ZONE_RUNTIME_SHARED, 0, SOF_MEM_CAPS_RAM, sizeof(*group));
+		group = rzalloc(0, SOF_MEM_CAPS_RAM, sizeof(*group));
 		if (!group) {
 			comp_err(parent_dev, "Failed to alloc memory for new group");
 			return -ENOMEM;
@@ -177,7 +177,7 @@ __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_ZONE_RUNTIME, 0, SOF_MEM_CAPS_RAM, sizeof(*hd));
+	hd = rzalloc(0, SOF_MEM_CAPS_RAM, sizeof(*hd));
 	if (!hd)
 		return -ENOMEM;