From: Teo Hall <teo.hall@nxp.com>
Date: Mon, 12 Sep 2016 19:12:25 +0000 (-0500)
Subject: MLK-14938-23 mailbox: enable mbox_send non-blocking use
X-Git-Tag: rel_imx_4.9.88_2.0.0_ga~539
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=c2296701fa91dc8d4144c84c19ffe40dba3df88c;p=u-boot.git

MLK-14938-23 mailbox: enable mbox_send non-blocking use

Add a timeout to allow non-blocking use in the
same way as mbox_recv

Signed-off-by: Teo Hall <teo.hall@nxp.com>
---

diff --git a/drivers/mailbox/mailbox-uclass.c b/drivers/mailbox/mailbox-uclass.c
index 38448de965..bb75105ee9 100644
--- a/drivers/mailbox/mailbox-uclass.c
+++ b/drivers/mailbox/mailbox-uclass.c
@@ -104,13 +104,29 @@ int mbox_free(struct mbox_chan *chan)
 	return ops->free(chan);
 }
 
-int mbox_send(struct mbox_chan *chan, const void *data)
+int mbox_send(struct mbox_chan *chan, const void *data, ulong timeout_us)
 {
 	struct mbox_ops *ops = mbox_dev_ops(chan->dev);
+	ulong start_time;
+	int ret;
 
 	debug("%s(chan=%p, data=%p)\n", __func__, chan, data);
 
-	return ops->send(chan, data);
+	start_time = timer_get_us();
+	/*
+	 * Account for partial us ticks, but if timeout_us is 0, ensure we
+	 * still don't wait at all.
+	 */
+	if (timeout_us)
+		timeout_us++;
+
+	for (;;) {
+		ret = ops->send(chan, data);
+		if (ret != -EBUSY)
+			return ret;
+		if ((timer_get_us() - start_time) >= timeout_us)
+			return -ETIMEDOUT;
+	}
 }
 
 int mbox_recv(struct mbox_chan *chan, void *data, ulong timeout_us)
diff --git a/include/mailbox.h b/include/mailbox.h
index a92a1a590d..8d89f3f99e 100644
--- a/include/mailbox.h
+++ b/include/mailbox.h
@@ -124,7 +124,7 @@ int mbox_free(struct mbox_chan *chan);
  *		will ignore this parameter.
  * @return 0 if OK, or a negative error code.
  */
-int mbox_send(struct mbox_chan *chan, const void *data);
+int mbox_send(struct mbox_chan *chan, const void *data, ulong timeout_us);
 
 /**
  * mbox_recv - Receive any available message from a mailbox channel