[PATCH 5/5] ARM: msm: update GPIO chained IRQ handler to use EOI in parent chip
From: Will Deacon <hidden>
Date: 2011-02-24 14:12:46
Subsystem:
arm port, the rest · Maintainers:
Russell King, Linus Torvalds
On Wed, 23 Feb 2011, Abhijeet Dharmapurikar wrote:quoted
Will Deacon wrote:quoted
The chained GPIO IRQ handler on MSM8x60 calls ->ack on the parent chip after handling the interrupt. This patch updates the code to use ->irq_eoi now that the GIC has moved to using the fasteoi flow model. Cc: Abhijeet Dharmapurikar <redacted> Signed-off-by: Will Deacon <redacted> --- arch/arm/mach-msm/gpio-v2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)diff --git a/arch/arm/mach-msm/gpio-v2.c b/arch/arm/mach-msm/gpio-v2.c index 0de19ec..04fb411 100644 --- a/arch/arm/mach-msm/gpio-v2.c +++ b/arch/arm/mach-msm/gpio-v2.c@@ -318,7 +318,7 @@ static void msm_summary_irq_handler(unsigned int irq,struct irq_desc *desc) generic_handle_irq(msm_gpio_to_irq(&msm_gpio.gpio_chip, i)); } - desc->chip->ack(irq); + desc->chip->irq_eoi(irq);should be dec->chip->irq_eoi(&desc->irq_data);Nope, it should do: struct irq_chip *chip = get_irq_desc_chip(desc); chip->irq_eoi();
Something like this?
diff --git a/arch/arm/mach-msm/gpio-v2.c b/arch/arm/mach-msm/gpio-v2.c
index 0de19ec..90a968f 100644
--- a/arch/arm/mach-msm/gpio-v2.c
+++ b/arch/arm/mach-msm/gpio-v2.c@@ -310,6 +310,7 @@ static int msm_gpio_irq_set_type(unsigned int irq, unsigned int flow_type) static void msm_summary_irq_handler(unsigned int irq, struct irq_desc *desc) { unsigned long i; + struct irq_chip *chip = get_irq_desc_chip(desc); for (i = find_first_bit(msm_gpio.enabled_irqs, NR_GPIO_IRQS); i < NR_GPIO_IRQS;
@@ -318,7 +319,7 @@ static void msm_summary_irq_handler(unsigned int irq, struct irq_desc *desc) generic_handle_irq(msm_gpio_to_irq(&msm_gpio.gpio_chip, i)); } - desc->chip->ack(irq); + chip->irq_eoi(&desc->irq_data); }
Will