[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1299104058-28565-1-git-send-email-x0095078@ti.com>
Date: Wed, 2 Mar 2011 16:14:18 -0600
From: Armando Uribe <x0095078@...com>
To: <hiroshi.doyu@...ia.com>
Cc: <ohad@...ery.com>, Tony Lindgren <tony@...mide.com>,
Russell King <linux@....linux.org.uk>,
<linux-omap@...r.kernel.org>,
<linux-arm-kernel@...ts.infradead.org>,
<linux-kernel@...r.kernel.org>, Hari Kanigeri <h-kanigeri2@...com>,
Armando Uribe <x0095078@...com>,
Fernando Guzman Lugo <fernando.lugo@...com>
Subject: [PATCHv2] omap:mailbox: resolve hang issue
From: Hari Kanigeri <h-kanigeri2@...com>
omap4 interrupt disable bits is different. On rx kfifo full, the mbox rx
interrupts wasn't getting disabled, and this is causing the rcm stress tests
to hang.
Signed-off-by: Hari Kanigeri <h-kanigeri2@...com>
Signed-off-by: Armando Uribe <x0095078@...com>
Signed-off-by: Fernando Guzman Lugo <fernando.lugo@...com>
---
arch/arm/mach-omap2/mailbox.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
index 394413d..011ca50 100644
--- a/arch/arm/mach-omap2/mailbox.c
+++ b/arch/arm/mach-omap2/mailbox.c
@@ -193,10 +193,12 @@ static void omap2_mbox_disable_irq(struct omap_mbox *mbox,
omap_mbox_type_t irq)
{
struct omap_mbox2_priv *p = mbox->priv;
- u32 l, bit = (irq == IRQ_TX) ? p->notfull_bit : p->newmsg_bit;
- l = mbox_read_reg(p->irqdisable);
- l &= ~bit;
- mbox_write_reg(l, p->irqdisable);
+ u32 bit = (irq == IRQ_TX) ? p->notfull_bit : p->newmsg_bit;
+
+ if (!cpu_is_omap44xx())
+ bit = mbox_read_reg(p->irqdisable) & ~bit;
+
+ mbox_write_reg(bit, p->irqdisable);
}
static void omap2_mbox_ack_irq(struct omap_mbox *mbox,
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists