From: Toshihiro Kobayashi <toshihiro.kobayashi@nokia.com>
Date: Thu, 30 Nov 2006 23:28:01 +0000 (-0800)
Subject: ARM: OMAP: fix for mailbox queue status detection
X-Git-Tag: v2.6.19-omap1~24
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b3e8d6f3403f42fd96df4c47ff1f6ce24a78d0de;p=linux-2.6-omap-h63xx.git

ARM: OMAP: fix for mailbox queue status detection

detect 'full' and 'empty' correctly and simply.

Signed-off-by: Toshihiro Kobayashi <toshihiro.kobayashi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/plat-omap/mailbox.h b/arch/arm/plat-omap/mailbox.h
index f8b87a18960..c3f8f2c56b4 100644
--- a/arch/arm/plat-omap/mailbox.h
+++ b/arch/arm/plat-omap/mailbox.h
@@ -21,6 +21,7 @@ struct omap_mbq {
 	rwlock_t lock;
 	mbox_msg_t msg[MBQ_DEPTH];
 	mbox_msg_t *rp, *wp;
+	int cnt;
 };
 
 static inline int mbq_init(struct omap_mbq **addr)
@@ -33,6 +34,7 @@ static inline int mbq_init(struct omap_mbq **addr)
 
 	write_lock_irq(&m->lock);
 	m->rp = m->wp = &m->msg[0];
+	m->cnt = 0;
 	write_unlock_irq(&m->lock);
 
 	*addr = m;
@@ -45,7 +47,7 @@ static inline int mbq_empty(struct omap_mbq *mbq)
 	int ret;
 
 	read_lock_irq(&mbq->lock);
-	ret = (mbq->rp == mbq->wp);
+	ret = (mbq->cnt == 0);
 	read_unlock_irq(&mbq->lock);
 
 	return ret;
@@ -54,16 +56,9 @@ static inline int mbq_empty(struct omap_mbq *mbq)
 static inline int mbq_full(struct omap_mbq *mbq)
 {
 	int ret;
-	mbox_msg_t *p;
 
 	read_lock_irq(&mbq->lock);
-	p = mbq->wp;
-
-	if (++p == &mbq->msg[MBQ_DEPTH])
-		p = &mbq->msg[0];
-
-	ret = (p == mbq->rp);
-
+	ret = (mbq->cnt == MBQ_DEPTH);
 	read_unlock_irq(&mbq->lock);
 
 	return ret;
@@ -79,8 +74,8 @@ static inline int mbq_add(struct omap_mbq *mbq, mbox_msg_t msg)
 	if (++mbq->wp == &mbq->msg[MBQ_DEPTH])
 		mbq->wp = &mbq->msg[0];
 
-	if (mbq->wp == mbq->rp)	/* full */
-		ret = -1;;
+	if (++mbq->cnt == MBQ_DEPTH)	/* full */
+		ret = -1;
 
 	write_unlock_irq(&mbq->lock);
 
@@ -97,6 +92,7 @@ static inline mbox_msg_t mbq_get(struct omap_mbq *mbq)
 
 	if (++mbq->rp == &mbq->msg[MBQ_DEPTH])
 		mbq->rp = &mbq->msg[0];
+	mbq->cnt--;
 
 	write_unlock_irq(&mbq->lock);