Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 846afbd1 authored by Abhijeet Dharmapurikar's avatar Abhijeet Dharmapurikar Committed by Daniel Walker
Browse files

GIC: Dont disable INT in ack callback 



Masking in the ack callback fails to work with handle_percpu_irq and handle_edge_irq.
The interrupt stays disabled after the first invocation since percpu and edge irq do
not unmask an interrupt after handling it. For handle_level_irq masking in the ack
is redundant because ack is always called after mask in the mask_ack function.

Masking in the ack function is required only when __do_IRQ was used instead of flow
handlers, but using __do_IRQ has been deprecated.

Remove the masking of interrupt from the ack callback.

Signed-off-by: default avatarAbhijeet Dharmapurikar <adharmap@codeaurora.org>
Signed-off-by: default avatarJeff Ohlstein <johlstei@codeaurora.org>
Signed-off-by: default avatarDaniel Walker <dwalker@codeaurora.org>
parent b30a3f62

arch/arm/common/gic.c

+0 −14
Original line number Diff line number Diff line
@@ -67,25 +67,11 @@ 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);

	writel(mask, gic_dist_base(irq) + GIC_DIST_ENABLE_CLEAR + (gic_irq(irq) / 32) * 4);

	writel(gic_irq(irq), gic_cpu_base(irq) + GIC_CPU_EOI);

	spin_unlock(&irq_controller_lock);

}