From patchwork Thu Oct 14 01:33:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kanigeri, Hari" X-Patchwork-Id: 251751 X-Patchwork-Delegate: hiroshi.doyu@nokia.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9E1XqeS008484 for ; Thu, 14 Oct 2010 01:35:35 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754045Ab0JNBdw (ORCPT ); Wed, 13 Oct 2010 21:33:52 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:39476 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754035Ab0JNBdv (ORCPT ); Wed, 13 Oct 2010 21:33:51 -0400 Received: from dlep34.itg.ti.com ([157.170.170.115]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id o9E1XnIP002264 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 13 Oct 2010 20:33:49 -0500 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep34.itg.ti.com (8.13.7/8.13.7) with ESMTP id o9E1Xkrw002984; Wed, 13 Oct 2010 20:33:46 -0500 (CDT) Received: from localhost (matrix.am.dhcp.ti.com [128.247.75.166]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id o9E1Xkf11415; Wed, 13 Oct 2010 20:33:46 -0500 (CDT) From: Hari Kanigeri To: Hiroshi Doyu , linux omap Cc: Tony Lindgren , Ohad Ben-Cohen , Hari Kanigeri , Ramesh Gupta , "Subramaniam C.A" Subject: [PATCH 5/7] omap:mailbox-resolve multiple receiver problem Date: Wed, 13 Oct 2010 20:33:21 -0500 Message-Id: <1287020003-19667-6-git-send-email-h-kanigeri2@ti.com> X-Mailer: git-send-email 1.7.0 In-Reply-To: <1287020003-19667-1-git-send-email-h-kanigeri2@ti.com> References: <1287020003-19667-1-git-send-email-h-kanigeri2@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Thu, 14 Oct 2010 01:35:35 +0000 (UTC) diff --git a/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c index a4170c7..1727548 100644 --- a/arch/arm/plat-omap/mailbox.c +++ b/arch/arm/plat-omap/mailbox.c @@ -174,6 +174,7 @@ static void __mbox_rx_interrupt(struct omap_mbox *mbox) struct omap_mbox_queue *mq = mbox->rxq; mbox_msg_t msg; int len; + bool msg_rx = false; while (!mbox_fifo_empty(mbox)) { if (unlikely(kfifo_avail(&mq->fifo) < sizeof(msg))) { @@ -181,7 +182,7 @@ static void __mbox_rx_interrupt(struct omap_mbox *mbox) mq->full = true; goto nomem; } - + msg_rx = true; msg = mbox_fifo_read(mbox); len = kfifo_in(&mq->fifo, (unsigned char *)&msg, sizeof(msg)); @@ -192,21 +193,25 @@ static void __mbox_rx_interrupt(struct omap_mbox *mbox) } /* no more messages in the fifo. clear IRQ source. */ - ack_mbox_irq(mbox, IRQ_RX); + if (msg_rx) + ack_mbox_irq(mbox, IRQ_RX); nomem: - queue_work(mboxd, &mbox->rxq->work); + if (msg_rx) + queue_work(mboxd, &mbox->rxq->work); } static irqreturn_t mbox_interrupt(int irq, void *p) { struct omap_mbox *mbox = p; - if (is_mbox_irq(mbox, IRQ_TX)) - __mbox_tx_interrupt(mbox); - - if (is_mbox_irq(mbox, IRQ_RX)) - __mbox_rx_interrupt(mbox); + for (i = 0; mboxes[i]; i++) { + struct omap_mbox *mbox = mboxes[i]; + if (is_mbox_irq(mbox, IRQ_TX)) + __mbox_tx_interrupt(mbox); + if (is_mbox_irq(mbox, IRQ_RX)) + __mbox_rx_interrupt(mbox); + } return IRQ_HANDLED; }