From patchwork Mon Nov 29 20:24:13 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: "Kanigeri, Hari" <h-kanigeri2@ti.com>
X-Patchwork-Id: 365292
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 oATKMLe4012938
	for <patchwork-omap@patchwork.kernel.org>;
	Mon, 29 Nov 2010 20:22:21 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753250Ab0K2UWU (ORCPT
	<rfc822;patchwork-omap@patchwork.kernel.org>);
	Mon, 29 Nov 2010 15:22:20 -0500
Received: from comal.ext.ti.com ([198.47.26.152]:40547 "EHLO
	comal.ext.ti.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751684Ab0K2UWT (ORCPT <rfc822;linux-omap@vger.kernel.org>);
	Mon, 29 Nov 2010 15:22:19 -0500
Received: from dlep33.itg.ti.com ([157.170.170.112])
	by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id oATKMDdt026424
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Mon, 29 Nov 2010 14:22:13 -0600
Received: from legion.dal.design.ti.com (localhost [127.0.0.1])
	by dlep33.itg.ti.com (8.13.7/8.13.7) with ESMTP id oATKMBQ5008323;
	Mon, 29 Nov 2010 14:22:12 -0600 (CST)
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
	oATKMBf24654; Mon, 29 Nov 2010 14:22:11 -0600 (CST)
From: Hari Kanigeri <h-kanigeri2@ti.com>
To: Hiroshi Doyu <Hiroshi.DOYU@nokia.com>,
	linux omap <linux-omap@vger.kernel.org>
Cc: Tony Lindgren <tony@atomide.com>,
	Linux ARM <linux-arm-kernel@lists.infradead.org>,
	Benoit Cousson <b-cousson@ti.com>, Felipe Balbi <balbi@ti.com>,
	Charulatha Varadarajan <charu@ti.com>,
	Omar Ramirez <omar.ramirez@ti.com>,
	Fernando Guzman <fernando.lugo@ti.com>,
	Hari Kanigeri <h-kanigeri2@ti.com>
Subject: [PATCH v5 3/4] OMAP: mailbox: send message in process context
Date: Mon, 29 Nov 2010 14:24:13 -0600
Message-Id: <1291062254-9057-4-git-send-email-h-kanigeri2@ti.com>
X-Mailer: git-send-email 1.7.0
In-Reply-To: <1291062254-9057-1-git-send-email-h-kanigeri2@ti.com>
References: <1291062254-9057-1-git-send-email-h-kanigeri2@ti.com>
Sender: linux-omap-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-omap.vger.kernel.org>
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]);
	Mon, 29 Nov 2010 20:22:22 +0000 (UTC)


diff --git a/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c
index d9aa87c..cc58b44 100644
--- a/arch/arm/plat-omap/mailbox.c
+++ b/arch/arm/plat-omap/mailbox.c
@@ -92,20 +92,25 @@ int omap_mbox_msg_send(struct omap_mbox *mbox, mbox_msg_t msg)
 	struct omap_mbox_queue *mq = mbox->txq;
 	int ret = 0, len;
 
-	spin_lock(&mq->lock);
+	spin_lock_bh(&mq->lock);
 
 	if (kfifo_avail(&mq->fifo) < sizeof(msg)) {
 		ret = -ENOMEM;
 		goto out;
 	}
 
+	if (kfifo_is_empty(&mq->fifo) && !__mbox_poll_for_space(mbox)) {
+		mbox_fifo_write(mbox, msg);
+		goto out;
+	}
+
 	len = kfifo_in(&mq->fifo, (unsigned char *)&msg, sizeof(msg));
 	WARN_ON(len != sizeof(msg));
 
 	tasklet_schedule(&mbox->txq->tasklet);
 
 out:
-	spin_unlock(&mq->lock);
+	spin_unlock_bh(&mq->lock);
 	return ret;
 }
 EXPORT_SYMBOL(omap_mbox_msg_send);