Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758095Ab1CCCvo (ORCPT ); Wed, 2 Mar 2011 21:51:44 -0500 Received: from na3sys009aog115.obsmtp.com ([74.125.149.238]:42089 "EHLO na3sys009aog115.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756924Ab1CCCvn convert rfc822-to-8bit (ORCPT ); Wed, 2 Mar 2011 21:51:43 -0500 MIME-Version: 1.0 In-Reply-To: <20110303014416.GL20560@atomide.com> References: <1299104058-28565-1-git-send-email-x0095078@ti.com> <20110303014416.GL20560@atomide.com> Date: Wed, 2 Mar 2011 20:51:41 -0600 Message-ID: Subject: Re: [PATCHv2] omap:mailbox: resolve hang issue From: "Guzman Lugo, Fernando" To: Tony Lindgren Cc: Armando Uribe , hiroshi.doyu@nokia.com, ohad@wizery.com, Russell King , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Hari Kanigeri Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1889 Lines: 56 On Wed, Mar 2, 2011 at 7:44 PM, Tony Lindgren wrote: > * Armando Uribe [110302 13:54]: >> From: Hari Kanigeri >> >> 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 >> Signed-off-by: Armando Uribe >> Signed-off-by: Fernando Guzman Lugo > > 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 >> > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/