Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-29 23:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARM: s5pv310: update IRQ combiner to use chained entry/exit functions

Browse Source 
This patch updates the IRQ combiner chained IRQ handler code to use the
chained IRQ enter/exit functions in order to function correctly on
primary controllers with different methods of flow control.

This is required for the GIC to move to fasteoi interrupt handling.

Cc: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
This commit is contained in:
Will Deacon 2011-02-21 14:37:43 +00:00
parent ee14418259
commit 0f43563f2d
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-exynos4/irq-combiner.c
View File

@ -59,8 +59,7 @@ static void combiner_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
unsigned int cascade_irq, combiner_irq; unsigned int cascade_irq, combiner_irq;
unsigned long status; unsigned long status;
/* primary controller ack'ing */ chained_irq_enter(chip, desc);
chip->irq_ack(&desc->irq_data);
spin_lock(&irq_controller_lock); spin_lock(&irq_controller_lock);
status = __raw_readl(chip_data->base + COMBINER_INT_STATUS); status = __raw_readl(chip_data->base + COMBINER_INT_STATUS);
@ -79,8 +78,7 @@ static void combiner_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
generic_handle_irq(cascade_irq); generic_handle_irq(cascade_irq);
out: out:
/* primary controller unmasking */ chained_irq_exit(chip, desc);
chip->irq_unmask(&desc->irq_data);
} }
static struct irq_chip combiner_chip = { static struct irq_chip combiner_chip = {