ARM: OMAP1: ams-delta: fix deferred_fiq handler (baf64250) · Commits · 戴 / test

The deferred_fiq handler used to limit hardware operations to IRQ unmask only, relying on gpio-omap assigned handler performing the ACKs. Since commit ("gpio: omap: Fix lost edge interrupts") this is no longer the case as handle_edge_irq() has been replaced with handle_simmple_irq() which doesn't touch the hardware. Add single ACK operation per each active IRQ pin to the handler. While being at it, move unmask operation out of irq_counter loop so it is also called only once for each active IRQ pin. Fixes: ("gpio: omap: Fix lost edge interrupts") Signed-off-by:

Janusz Krzysztofik <jmkrzyszt@gmail.com> Signed-off-by:

Tony Lindgren <tony@atomide.com>

arch/arm/mach-omap1/ams-delta-fiq.c

+15 −13

Original line number	Diff line number	Diff line
		@@ -58,22 +58,24 @@ static irqreturn_t deferred_fiq(int irq, void *dev_id)
		irq_num = gpio_to_irq(gpio);
		fiq_count = fiq_buffer[FIQ_CNT_INT_00 + gpio];

		while (irq_counter[gpio] < fiq_count) {
		if (gpio != AMS_DELTA_GPIO_PIN_KEYBRD_CLK) {
		if (irq_counter[gpio] < fiq_count &&
		gpio != AMS_DELTA_GPIO_PIN_KEYBRD_CLK) {
		struct irq_data *d = irq_get_irq_data(irq_num);

		/*
		* It looks like handle_edge_irq() that
		* OMAP GPIO edge interrupts default to,
		* expects interrupt already unmasked.
		* handle_simple_irq() that OMAP GPIO edge
		* interrupts default to since commit 80ac93c27441
		* requires interrupt already acked and unmasked.
		*/
		if (irq_chip && irq_chip->irq_unmask)
		if (irq_chip) {
		if (irq_chip->irq_ack)
		irq_chip->irq_ack(d);
		if (irq_chip->irq_unmask)
		irq_chip->irq_unmask(d);
		}
		generic_handle_irq(irq_num);

		irq_counter[gpio]++;
		}
		for (; irq_counter[gpio] < fiq_count; irq_counter[gpio]++)
		generic_handle_irq(irq_num);
		}
		return IRQ_HANDLED;
		}

Admin message