ipc: use notifications allocated by sources

Changes implementation of notifications allocation.
Instead of using common empty list of messages let's
switch to allocating message per source of notification.
This way we won't have problem with memory and lack of
empty messages and also we will be able to optimize memory.

Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>

Author: tlauda

src/audio/detect_test.c

@@ -69,7 +69,8 @@ struct comp_data {
 	struct kpb_event_data event_data;
 	struct kpb_client client_data;
 
-	struct ipc_msg msg;	/**< host notification */
+	struct sof_ipc_comp_event event;
+	struct ipc_msg *msg;	/**< host notification */
 
 	void (*detect_func)(struct comp_dev *dev,
 			    const struct audio_stream *source, uint32_t frames);
@@ -105,19 +106,10 @@ static inline bool detector_is_sample_width_supported(enum sof_ipc_frame sf)
 static void notify_host(const struct comp_dev *dev)
 {
 	struct comp_data *cd = comp_get_drvdata(dev);
-	struct sof_ipc_comp_event event;
 
 	comp_info(dev, "notify_host()");
 
-	event.event_type = SOF_CTRL_EVENT_KD;
-	event.num_elems = 0;
-
-	ipc_build_comp_event(&event, dev_comp_type(dev), dev_comp_id(dev));
-	ipc_prepare_host_message(&cd->msg, event.rhdr.hdr.cmd, &event,
-				 sizeof(event));
-
-	/* Send IPC message right away to wake host up ASAP */
-	ipc_platform_send_msg(&cd->msg);
+	ipc_msg_send(cd->msg, &cd->event, true);
 }
 
 static void notify_kpb(const struct comp_dev *dev)
@@ -346,6 +338,17 @@ static struct comp_dev *test_keyword_new(const struct comp_driver *drv,
 		goto fail;
 	}
 
+	/* build component event */
+	ipc_build_comp_event(&cd->event, comp->type, comp->id);
+	cd->event.event_type = SOF_CTRL_EVENT_KD;
+	cd->event.num_elems = 0;
+
+	cd->msg = ipc_msg_init(cd->event.rhdr.hdr.cmd, sizeof(cd->event));
+	if (!cd->msg) {
+		comp_err(dev, "test_keyword_new() error: ipc notification init failed");
+		goto fail;
+	}
+
 	dev->state = COMP_STATE_READY;
 	return dev;
 
@@ -362,6 +365,7 @@ static void test_keyword_free(struct comp_dev *dev)
 
 	comp_info(dev, "test_keyword_free()");
 
+	ipc_msg_free(cd->msg);
 	free_mem_load(cd);
 	rfree(cd);
 	rfree(dev);

src/audio/host.c

@@ -14,6 +14,7 @@
 #include <sof/drivers/ipc.h>
 #include <sof/lib/alloc.h>
 #include <sof/lib/dma.h>
+#include <sof/lib/mailbox.h>
 #include <sof/lib/memory.h>
 #include <sof/lib/notifier.h>
 #include <sof/list.h>
@@ -83,6 +84,7 @@ struct host_data {
 
 	/* stream info */
 	struct sof_ipc_stream_posn posn; /* TODO: update this */
+	struct ipc_msg *msg;	/**< host notification */
 };
 
 static inline struct dma_sg_elem *next_buffer(struct hc_buf *hc)
@@ -155,7 +157,9 @@ static void host_update_position(struct comp_dev *dev, uint32_t bytes)
 			 * (updates position first, by calling ops.position())
 			 */
 			pipeline_get_timestamp(dev->pipeline, dev, &hd->posn);
-			ipc_stream_send_position(dev, &hd->posn);
+			mailbox_stream_write(dev->pipeline->posn_offset,
+					     &hd->posn, sizeof(hd->posn));
+			ipc_msg_send(hd->msg, &hd->posn, false);
 		}
 	}
 }
@@ -364,6 +368,15 @@ static struct comp_dev *host_new(const struct comp_driver *drv,
 
 	ipc_build_stream_posn(&hd->posn, SOF_IPC_STREAM_POSITION, comp->id);
 
+	hd->msg = ipc_msg_init(hd->posn.rhdr.hdr.cmd, sizeof(hd->posn));
+	if (!hd->msg) {
+		comp_err(dev, "host_new() error: ipc_msg_init failed");
+		dma_put(hd->dma);
+		rfree(hd);
+		rfree(dev);
+		return NULL;
+	}
+
 	hd->chan = NULL;
 	hd->copy_type = COMP_COPY_NORMAL;
 	dev->state = COMP_STATE_READY;
@@ -379,6 +392,7 @@ static void host_free(struct comp_dev *dev)
 
 	dma_put(hd->dma);
 
+	ipc_msg_free(hd->msg);
 	dma_sg_free(&hd->config.elem_array);
 	rfree(hd);
 	rfree(dev);

src/audio/pipeline.c

@@ -13,13 +13,15 @@
 #include <sof/drivers/ipc.h>
 #include <sof/drivers/timer.h>
 #include <sof/lib/alloc.h>
+#include <sof/lib/mailbox.h>
 #include <sof/list.h>
 #include <sof/math/numbers.h>
 #include <sof/schedule/ll_schedule.h>
 #include <sof/schedule/schedule.h>
 #include <sof/schedule/task.h>
 #include <sof/spinlock.h>
 #include <sof/string.h>
+#include <ipc/header.h>
 #include <ipc/stream.h>
 #include <ipc/topology.h>
 #include <errno.h>
@@ -41,6 +43,7 @@ static enum task_state pipeline_task(void *arg);
 struct pipeline *pipeline_new(struct sof_ipc_pipe_new *pipe_desc,
 			      struct comp_dev *cd)
 {
+	struct sof_ipc_stream_posn posn;
 	struct pipeline *p;
 	int ret;
 
@@ -63,6 +66,17 @@ struct pipeline *pipeline_new(struct sof_ipc_pipe_new *pipe_desc,
 		       pipe_desc, sizeof(*pipe_desc));
 	assert(!ret);
 
+	/* just for retrieving valid ipc_msg header */
+	ipc_build_stream_posn(&posn, SOF_IPC_STREAM_TRIG_XRUN,
+			      p->ipc_pipe.comp_id);
+
+	p->msg = ipc_msg_init(posn.rhdr.hdr.cmd, sizeof(posn));
+	if (!p->msg) {
+		pipe_cl_err("pipeline_new() error: ipc_msg_init failed");
+		rfree(p);
+		return NULL;
+	}
+
 	return p;
 }
 
@@ -241,6 +255,8 @@ int pipeline_free(struct pipeline *p)
 		rfree(p->pipe_task);
 	}
 
+	ipc_msg_free(p->msg);
+
 	/* now free the pipeline */
 	rfree(p);
 
@@ -829,7 +845,9 @@ static int pipeline_comp_xrun(struct comp_dev *current,
 		platform_host_timestamp(current, ppl_data->posn);
 
 		/* send XRUN to host */
-		ipc_stream_send_xrun(current, ppl_data->posn);
+		mailbox_stream_write(ppl_data->p->posn_offset, ppl_data->posn,
+				     sizeof(*ppl_data->posn));
+		ipc_msg_send(ppl_data->p->msg, ppl_data->posn, true);
 	}
 
 	return pipeline_for_each_comp(current, &pipeline_comp_xrun, data, NULL,
@@ -865,6 +883,7 @@ void pipeline_xrun(struct pipeline *p, struct comp_dev *dev,
 	posn.xrun_size = bytes;
 	posn.xrun_comp_id = dev_comp_id(dev);
 	data.posn = &posn;
+	data.p = p;
 
 	pipeline_comp_xrun(dev, NULL, &data, dev->direction);
 }

src/drivers/imx/ipc.c

@@ -112,11 +112,8 @@ void ipc_platform_complete_cmd(void *data)
 int ipc_platform_send_msg(struct ipc_msg *msg)
 {
 	struct ipc *ipc = ipc_get();
-	uint32_t flags;
 	int ret = 0;
 
-	spin_lock_irq(&ipc->lock, flags);
-
 	/* can't send notification when one is in progress */
 	if (ipc->is_notification_pending ||
 	    imx_mu_read(IMX_MU_xCR) & IMX_MU_xCR_GIRn(1)) {
@@ -134,15 +131,11 @@ int ipc_platform_send_msg(struct ipc_msg *msg)
 	/* now interrupt host to tell it we have sent a message */
 	imx_mu_xcr_rmw(IMX_MU_xCR_GIRn(1), 0);
 
-	list_item_append(&msg->list, &ipc->empty_list);
-
 	platform_shared_commit(msg, sizeof(*msg));
 
 out:
 	platform_shared_commit(ipc, sizeof(*ipc));
 
-	spin_unlock_irq(&ipc->lock, flags);
-
 	return ret;
 }
 

src/drivers/intel/baytrail/ipc.c

@@ -100,11 +100,8 @@ void ipc_platform_complete_cmd(void *data)
 int ipc_platform_send_msg(struct ipc_msg *msg)
 {
 	struct ipc *ipc = ipc_get();
-	uint32_t flags;
 	int ret = 0;
 
-	spin_lock_irq(&ipc->lock, flags);
-
 	/* can't send notification when one is in progress */
 	if (ipc->is_notification_pending ||
 	    shim_read(SHIM_IPCDH) & (SHIM_IPCDH_BUSY | SHIM_IPCDH_DONE)) {
@@ -123,15 +120,11 @@ int ipc_platform_send_msg(struct ipc_msg *msg)
 	shim_write(SHIM_IPCDL, msg->header);
 	shim_write(SHIM_IPCDH, SHIM_IPCDH_BUSY);
 
-	list_item_append(&msg->list, &ipc->empty_list);
-
 	platform_shared_commit(msg, sizeof(*msg));
 
 out:
 	platform_shared_commit(ipc, sizeof(*ipc));
 
-	spin_unlock_irq(&ipc->lock, flags);
-
 	return ret;
 }
 

src/drivers/intel/cavs/ipc.c

@@ -246,11 +246,8 @@ void ipc_platform_complete_cmd(void *data)
 int ipc_platform_send_msg(struct ipc_msg *msg)
 {
 	struct ipc *ipc = ipc_get();
-	uint32_t flags;
 	int ret = 0;
 
-	spin_lock_irq(&ipc->lock, flags);
-
 	if (ipc->is_notification_pending ||
 #if CAVS_VERSION == CAVS_VERSION_1_5
 	    ipc_read(IPC_DIPCI) & IPC_DIPCI_BUSY) {
@@ -278,15 +275,11 @@ int ipc_platform_send_msg(struct ipc_msg *msg)
 	ipc_write(IPC_DIPCIDR, 0x80000000 | msg->header);
 #endif
 
-	list_item_append(&msg->list, &ipc->empty_list);
-
 	platform_shared_commit(msg, sizeof(*msg));
 
 out:
 	platform_shared_commit(ipc, sizeof(*ipc));
 
-	spin_unlock_irq(&ipc->lock, flags);
-
 	return ret;
 }
 

src/drivers/intel/cavs/sue-ipc.c

@@ -54,9 +54,6 @@ void ipc_platform_complete_cmd(void *data)
 int ipc_platform_send_msg(struct ipc_msg *msg)
 {
 	struct ipc *ipc = ipc_get();
-	uint32_t flags;
-
-	spin_lock_irq(&ipc->lock, flags);
 
 	/* now send the message */
 	mailbox_dspbox_write(0, msg->tx_data, msg->tx_size);
@@ -65,12 +62,8 @@ int ipc_platform_send_msg(struct ipc_msg *msg)
 
 	/* now interrupt host to tell it we have message sent */
 
-	list_item_append(&msg->list, &ipc->empty_list);
-
 	platform_shared_commit(ipc, sizeof(*ipc));
 
-	spin_unlock_irq(&ipc->lock, flags);
-
 	return 0;
 }
 

src/drivers/intel/haswell/ipc.c

@@ -102,11 +102,8 @@ void ipc_platform_complete_cmd(void *data)
 int ipc_platform_send_msg(struct ipc_msg *msg)
 {
 	struct ipc *ipc = ipc_get();
-	uint32_t flags;
 	int ret = 0;
 
-	spin_lock_irq(&ipc->lock, flags);
-
 	/* can't send nofication when one is in progress */
 	if (ipc->is_notification_pending ||
 	    shim_read(SHIM_IPCD) & (SHIM_IPCD_BUSY | SHIM_IPCD_DONE)) {
@@ -124,15 +121,11 @@ int ipc_platform_send_msg(struct ipc_msg *msg)
 	/* now interrupt host to tell it we have message sent */
 	shim_write(SHIM_IPCD, SHIM_IPCD_BUSY);
 
-	list_item_append(&msg->list, &ipc->empty_list);
-
 	platform_shared_commit(msg, sizeof(*msg));
 
 out:
 	platform_shared_commit(ipc, sizeof(*ipc));
 
-	spin_unlock_irq(&ipc->lock, flags);
-
 	return ret;
 }
 

src/include/sof/audio/pipeline.h

@@ -8,6 +8,7 @@
 #ifndef __SOF_AUDIO_PIPELINE_H__
 #define __SOF_AUDIO_PIPELINE_H__
 
+#include <sof/drivers/ipc.h>
 #include <sof/lib/cpu.h>
 #include <sof/trace/trace.h>
 #include <ipc/topology.h>
@@ -92,6 +93,7 @@ struct pipeline {
 
 	/* position update */
 	uint32_t posn_offset;		/* position update array offset*/
+	struct ipc_msg *msg;
 };
 
 /* static pipeline */

src/include/sof/drivers/ipc.h

@@ -50,8 +50,6 @@ struct ipc_msg;
 #define trace_ipc_error(format, ...) \
 	trace_error(TRACE_CLASS_IPC, format, ##__VA_ARGS__)
 
-#define MSG_QUEUE_SIZE		12
-
 #define COMP_TYPE_COMPONENT	1
 #define COMP_TYPE_BUFFER	2
 #define COMP_TYPE_PIPELINE	3
@@ -97,7 +95,6 @@ struct ipc {
 	int pm_prepare_D3;	/* do we need to prepare for D3 */
 
 	struct list_item msg_list;	/* queue of messages to be sent */
-	struct list_item empty_list;	/* queue of empty messages */
 	bool is_notification_pending;	/* notification is being sent to host */
 
 	struct list_item comp_list;	/* list of component devices */
@@ -226,21 +223,6 @@ void ipc_free(struct ipc *ipc);
 
 void ipc_schedule_process(struct ipc *ipc);
 
-int ipc_stream_send_position(struct comp_dev *cdev,
-		struct sof_ipc_stream_posn *posn);
-void ipc_build_comp_notification(const struct comp_dev *cdev,
-				 struct sof_ipc_comp_event *event);
-int ipc_send_comp_notification(const struct comp_dev *cdev,
-			       struct sof_ipc_comp_event *event);
-int ipc_stream_send_xrun(struct comp_dev *cdev,
-	struct sof_ipc_stream_posn *posn);
-
-void ipc_prepare_host_message(struct ipc_msg *msg, uint32_t header,
-			      void *tx_data, size_t tx_bytes);
-
-int ipc_queue_host_message(struct ipc *ipc, uint32_t header, void *tx_data,
-			   size_t tx_bytes, bool replace);
-
 int ipc_platform_send_msg(struct ipc_msg *msg);
 
 void ipc_send_queued_msg(void);