omap:mailbox-resolve multiple receiver problem

The ISR is handling only the mailbox instance that was registered last.
So if both mailbox instances are running at the same time, the first mailbox
that registered wouldn't get the mailbox message. The same issue is present
in Transmit Interrupt case too. Only the last registered mailbox is handled.

The fix is to iterate through the list of mailbox that were registered.

Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>
Signed-off-by: Ramesh Gupta <grgupta@ti.com>
Signed-off-by: Subramaniam C.A <subramaniam.ca@ti.com>

1 files changed, 44 insertions, 22 deletions

diff --git a/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c
index 578465de17a..faadfb6cb5a 100644
--- a/arch/arm/plat-omap/mailbox.c
+++ b/arch/arm/plat-omap/mailbox.c
@@ -167,37 +167,59 @@ static void mbox_rx_work(struct work_struct *work)
  */
 static void __mbox_tx_interrupt(struct omap_mbox *mbox)
 {
-        omap_mbox_disable_irq(mbox, IRQ_TX);
-        ack_mbox_irq(mbox, IRQ_TX);
-        tasklet_schedule(&mbox->txq->tasklet);
+        struct omap_mbox *mbox_curr;
+        int i =0;
+
+        while (mboxes[i]) {
+                mbox_curr = mboxes[i];
+                if (!mbox_fifo_full(mbox_curr)) {
+                        omap_mbox_disable_irq(mbox_curr, IRQ_TX);
+                        ack_mbox_irq(mbox_curr, IRQ_TX);
+                        tasklet_schedule(&mbox_curr->txq->tasklet);
+                }
+                i++;
+        }
 }
 
 static void __mbox_rx_interrupt(struct omap_mbox *mbox)
 {
-        struct omap_mbox_queue *mq = mbox->rxq;
+        struct omap_mbox_queue *mq;
         mbox_msg_t msg;
         int len;
-
-        while (!mbox_fifo_empty(mbox)) {
-                if (unlikely(kfifo_avail(&mq->fifo) < sizeof(msg))) {
-                        omap_mbox_disable_irq(mbox, IRQ_RX);
-                        mq->full = true;
-                        goto nomem;
+        int i = 0;
+        struct omap_mbox *mbox_curr;
+        bool msg_rx;
+
+        while (mboxes[i]) {
+                mbox_curr = mboxes[i];
+                mq = mbox_curr->rxq;
+                msg_rx = false;
+                while (!mbox_fifo_empty(mbox_curr)) {
+                        msg_rx = true;
+                        if (unlikely(kfifo_avail(&mq->fifo) < sizeof(msg))) {
+                                omap_mbox_disable_irq(mbox_curr, IRQ_RX);
+                                rq_full = true;
+                                goto nomem;
+                        }
+
+                        msg = mbox_fifo_read(mbox_curr);
+
+                        len = kfifo_in(&mq->fifo, (unsigned char *)&msg,
+                                                                sizeof(msg));
+                        if (unlikely(len != sizeof(msg)))
+                                pr_err("%s: kfifo_in anomaly detected\n",
+                                                                __func__);
+                        if (mbox->ops->type == OMAP_MBOX_TYPE1)
+                                break;
                 }
+                /* no more messages in the fifo. clear IRQ source. */
+                if (msg_rx)
+                        ack_mbox_irq(mbox, IRQ_RX);
+nomem:
+                schedule_work(&mbox->rxq->work);
 
-                msg = mbox_fifo_read(mbox);
-
-                len = kfifo_in(&mq->fifo, (unsigned char *)&msg, sizeof(msg));
-                WARN_ON(len != sizeof(msg));
-
-                if (mbox->ops->type == OMAP_MBOX_TYPE1)
-                        break;
+                i++;
         }
-
-        /* no more messages in the fifo. clear IRQ source. */
-        ack_mbox_irq(mbox, IRQ_RX);
-nomem:
-        schedule_work(&mbox->rxq->work);
 }
 
 static irqreturn_t mbox_interrupt(int irq, void *p)