2011-03-02 21:56:53

by Armando Uribe

Subject: [PATCHv2] omap:mailbox: resolve hang issue

From: Hari Kanigeri <[email protected]>

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 <[email protected]>
Signed-off-by: Armando Uribe <[email protected]>
Signed-off-by: Fernando Guzman Lugo <[email protected]>
---
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

2011-03-03 01:44:31

by Tony Lindgren

Subject: Re: [PATCHv2] omap:mailbox: resolve hang issue

* Armando Uribe <[email protected]> [110302 13:54]:
> From: Hari Kanigeri <[email protected]>
>
> 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 <[email protected]>
> Signed-off-by: Armando Uribe <[email protected]>
> Signed-off-by: Fernando Guzman Lugo <[email protected]>

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

Tony

> ---
> 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
>

2011-03-03 02:51:44

by Fernando Guzman Lugo

Subject: Re: [PATCHv2] omap:mailbox: resolve hang issue

On Wed, Mar 2, 2011 at 7:44 PM, Tony Lindgren <[email protected]> wrote:
> * Armando Uribe <[email protected]> [110302 13:54]:
>> From: Hari Kanigeri <[email protected]>
>>
>> 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 <[email protected]>
>> Signed-off-by: Armando Uribe <[email protected]>
>> Signed-off-by: Fernando Guzman Lugo <[email protected]>
>
> 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.

>
> Tony
>
>> ---
>> ?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
>>
>