Merge pull request #220 from tlauda/topic/idc_send_blocking

idc: allow to send blocking messages to cores

Author: lgirdwood

src/arch/xtensa/smp/cpu.c

@@ -62,7 +62,7 @@ void arch_cpu_enable_core(int id)
 		idc_enable_interrupts(id, arch_cpu_get_id());
 
 		/* send IDC power up message */
-		arch_idc_send_msg(&power_up);
+		arch_idc_send_msg(&power_up, IDC_NON_BLOCKING);
 
 		active_cores_mask |= (1 << id);
 	}
@@ -78,7 +78,7 @@ void arch_cpu_disable_core(int id)
 	spin_lock_irq(&lock, flags);
 
 	if (active_cores_mask & (1 << id)) {
-		arch_idc_send_msg(&power_down);
+		arch_idc_send_msg(&power_down, IDC_NON_BLOCKING);
 
 		active_cores_mask ^= (1 << id);
 	}

src/arch/xtensa/smp/include/arch/idc.h

@@ -55,6 +55,15 @@
 #define trace_idc_error(__e)	trace_error(TRACE_CLASS_IDC, __e)
 
 
+/** \brief IDC send blocking flag. */
+#define IDC_BLOCKING		0
+
+/** \brief IDC send non-blocking flag. */
+#define IDC_NON_BLOCKING	1
+
+/** \brief IDC send timeout in cycles. */
+#define IDC_TIMEOUT	800000
+
 /** \brief ROM wake version parsed by ROM during core wake up. */
 #define IDC_ROM_WAKE_VERSION	0x2
 
@@ -165,11 +174,16 @@ static void idc_irq_handler(void *arg)
 /**
  * \brief Sends IDC message.
  * \param[in,out] msg Pointer to IDC message.
+ * \param[in] mode Is message blocking or not.
+ * \return Error code.
  */
-static inline void arch_idc_send_msg(struct idc_msg *msg)
+static inline int arch_idc_send_msg(struct idc_msg *msg, uint32_t mode)
 {
 	struct idc *idc = *idc_get();
 	int core = arch_cpu_get_id();
+	int ret = 0;
+	uint32_t timeout = 0;
+	uint32_t idcietc;
 	uint32_t flags;
 
 	tracev_idc("Msg");
@@ -179,7 +193,23 @@ static inline void arch_idc_send_msg(struct idc_msg *msg)
 	idc_write(IPC_IDCIETC(msg->core), core, msg->extension);
 	idc_write(IPC_IDCITC(msg->core), core, msg->header | IPC_IDCITC_BUSY);
 
+	if (mode == IDC_BLOCKING) {
+		do {
+			idelay(PLATFORM_DEFAULT_DELAY);
+			timeout += PLATFORM_DEFAULT_DELAY;
+			idcietc = idc_read(IPC_IDCIETC(msg->core), core);
+		} while (!(idcietc & IPC_IDCIETC_DONE) &&
+			 timeout < IDC_TIMEOUT);
+
+		if (timeout >= IDC_TIMEOUT) {
+			trace_idc_error("eS0");
+			ret = -ETIME;
+		}
+	}
+
 	spin_unlock_irq(&idc->lock, flags);
+
+	return ret;
 }
 
 /**

src/arch/xtensa/up/include/arch/idc.h

@@ -41,8 +41,12 @@ struct idc_msg;
 
 /**
  * \brief Sends IDC message.
+ * \param[in,out] msg Pointer to IDC message.
+ * \param[in] mode Is message blocking or not.
+ * \return Error code.
  */
-static inline void arch_idc_send_msg(struct idc_msg *msg) { }
+static inline int arch_idc_send_msg(struct idc_msg *msg,
+				    uint32_t mode) { return 0; }
 
 /**
  * \brief Checks for pending IDC messages.

src/platform/apollolake/include/platform/idc.h

@@ -33,9 +33,9 @@
 
 #include <arch/idc.h>
 
-static inline void idc_send_msg(struct idc_msg *msg)
+static inline int idc_send_msg(struct idc_msg *msg, uint32_t mode)
 {
-	arch_idc_send_msg(msg);
+	return arch_idc_send_msg(msg, mode);
 }
 
 static inline void idc_process_msg_queue(void)

src/platform/baytrail/include/platform/idc.h

@@ -33,7 +33,8 @@
 
 struct idc_msg;
 
-static inline void idc_send_msg(struct idc_msg *msg) { }
+static inline int idc_send_msg(struct idc_msg *msg,
+			       uint32_t mode) { return 0; }
 
 static inline void idc_process_msg_queue(void) { }
 

src/platform/cannonlake/include/platform/idc.h

@@ -33,9 +33,9 @@
 
 #include <arch/idc.h>
 
-static inline void idc_send_msg(struct idc_msg *msg)
+static inline int idc_send_msg(struct idc_msg *msg, uint32_t mode)
 {
-	arch_idc_send_msg(msg);
+	return arch_idc_send_msg(msg, mode);
 }
 
 static inline void idc_process_msg_queue(void)

src/platform/haswell/include/platform/idc.h

@@ -33,7 +33,8 @@
 
 struct idc_msg;
 
-static inline void idc_send_msg(struct idc_msg *msg) { }
+static inline int idc_send_msg(struct idc_msg *msg,
+			       uint32_t mode) { return 0; }
 
 static inline void idc_process_msg_queue(void) { }