Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752644Ab0GVW57 (ORCPT ); Thu, 22 Jul 2010 18:57:59 -0400 Received: from wolverine02.qualcomm.com ([199.106.114.251]:24644 "EHLO wolverine02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751231Ab0GVW55 (ORCPT ); Thu, 22 Jul 2010 18:57:57 -0400 X-IronPort-AV: E=McAfee;i="5400,1158,6051"; a="48216148" X-IronPort-AV: E=Sophos;i="4.55,243,1278313200"; d="scan'208";a="45852262" From: Jeff Ohlstein To: linux@arm.linux.org.uk Cc: linux-arm-msm@vger.kernel.org, Abhijeet Dharmapurikar , Jeff Ohlstein , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] GIC: Dont disable INT in ack callback Date: Thu, 22 Jul 2010 15:57:30 -0700 Message-Id: <1279839450-6477-1-git-send-email-johlstei@codeaurora.org> X-Mailer: git-send-email 1.7.1.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2375 Lines: 68 From: Abhijeet Dharmapurikar Unless gic_ack_irq is called from __do_IRQ, interrupt should not be disabled in the ack function. Disabling the interrupt causes handle_edge_irq to never enable it again. Signed-off-by: Abhijeet Dharmapurikar Signed-off-by: Jeff Ohlstein --- arch/arm/common/gic.c | 31 ++++++++++++++++++------------- 1 files changed, 18 insertions(+), 13 deletions(-) diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c index 337741f..1ac2f31 100644 --- a/arch/arm/common/gic.c +++ b/arch/arm/common/gic.c @@ -67,25 +67,30 @@ static inline unsigned int gic_irq(unsigned int irq) /* * Routines to acknowledge, disable and enable interrupts - * - * Linux assumes that when we're done with an interrupt we need to - * unmask it, in the same way we need to unmask an interrupt when - * we first enable it. - * - * The GIC has a separate notion of "end of interrupt" to re-enable - * an interrupt after handling, in order to support hardware - * prioritisation. - * - * We can make the GIC behave in the way that Linux expects by making - * our "acknowledge" routine disable the interrupt, then mark it as - * complete. */ static void gic_ack_irq(unsigned int irq) { - u32 mask = 1 << (irq % 32); spin_lock(&irq_controller_lock); + +#ifndef CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ + u32 mask = 1 << (irq % 32); + + /* + * Linux assumes that when we're done with an interrupt we need to + * unmask it, in the same way we need to unmask an interrupt when + * we first enable it. + * + * The GIC has a separate notion of "end of interrupt" to re-enable + * an interrupt after handling, in order to support hardware + * prioritisation. + * + * We can make the GIC behave in the way that Linux expects by making + * our "acknowledge" routine disable the interrupt, then mark it as + * complete. + */ writel(mask, gic_dist_base(irq) + GIC_DIST_ENABLE_CLEAR + (gic_irq(irq) / 32) * 4); +#endif writel(gic_irq(irq), gic_cpu_base(irq) + GIC_CPU_EOI); spin_unlock(&irq_controller_lock); } -- 1.7.1 -- 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/