[PATCH] omap:mailbox: resolve hang issue

[Armando Uribe]

From: Hari Kanigeri <h-kan...@ti.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-kan...@ti.com>
Signed-off-by: Armando Uribe <x009...@ti.com>
---
arch/arm/mach-omap2/mailbox.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
index 3d05ac8..2bfe8c6 100644
--- a/arch/arm/mach-omap2/mailbox.c
+++ b/arch/arm/mach-omap2/mailbox.c
@@ -207,7 +207,10 @@ static void omap2_mbox_disable_irq(struct omap_mbox *mbox,
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;
+ if (cpu_is_omap44xx())
+ l |= bit;
+ else
+ l &= ~bit;
mbox_write_reg(l, p->irqdisable);
}

--
1.7.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

[Armando Uribe]

From: Hari Kanigeri <h-kan...@ti.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-kan...@ti.com>
Signed-off-by: Armando Uribe <x009...@ti.com>

Signed-off-by: Fernando Guzman Lugo <fernan...@ti.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,

[Tony Lindgren]

* Armando Uribe <x009...@ti.com> [110302 13:54]:

> From: Hari Kanigeri <h-kan...@ti.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-kan...@ti.com>
> Signed-off-by: Armando Uribe <x009...@ti.com>
> Signed-off-by: Fernando Guzman Lugo <fernan...@ti.com>

Should we merge this as a fix for the 2.6.38 still?

Tony

[Guzman Lugo, Fernando]

On Wed, Mar 2, 2011 at 7:44 PM, Tony Lindgren <to...@atomide.com> wrote:
> * Armando Uribe <x009...@ti.com> [110302 13:54]:
>> From: Hari Kanigeri <h-kan...@ti.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-kan...@ti.com>
>> Signed-off-by: Armando Uribe <x009...@ti.com>
>> Signed-off-by: Fernando Guzman Lugo <fernan...@ti.com>
>
> Should we merge this as a fix for the 2.6.38 still?

yeah, if it can still be merged in 2.6.38 because it is a fix it would be great.

Regards,
Fernando.