Commit cc3b68fe authored by Hans de Goede's avatar Hans de Goede Committed by Thomas Gleixner

irqchip: sun4i: Simplify sun4i_irq_ack

Now that we only ack irq 0 the code can be simplified a lot.

Also switch from read / modify / write to a simple write clear:
1) This is what the android code does (it has a hack for acking irq 0
   in its unmask code doing this)

2) read / modify / write simply does not make sense for an irq status
   register like this, if the other bits are writeable (and the data sheet says
   they are not) they should be write 1 to clear, since otherwise a read /
   modify / write can race with a device raising an interrupt and then clear
   the pending bit unintentionally
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Acked-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-sunxi@googlegroups.com
Link: http://lkml.kernel.org/r/1394895894-8891-3-git-send-email-hdegoede@redhat.comSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 915b78ce
...@@ -41,16 +41,11 @@ static void __exception_irq_entry sun4i_handle_irq(struct pt_regs *regs); ...@@ -41,16 +41,11 @@ static void __exception_irq_entry sun4i_handle_irq(struct pt_regs *regs);
static void sun4i_irq_ack(struct irq_data *irqd) static void sun4i_irq_ack(struct irq_data *irqd)
{ {
unsigned int irq = irqd_to_hwirq(irqd); unsigned int irq = irqd_to_hwirq(irqd);
unsigned int irq_off = irq % 32;
int reg = irq / 32;
u32 val;
if (irq != 0) if (irq != 0)
return; /* Only IRQ 0 / the ENMI needs to be acked */ return; /* Only IRQ 0 / the ENMI needs to be acked */
val = readl(sun4i_irq_base + SUN4I_IRQ_PENDING_REG(reg)); writel(BIT(0), sun4i_irq_base + SUN4I_IRQ_PENDING_REG(0));
writel(val | (1 << irq_off),
sun4i_irq_base + SUN4I_IRQ_PENDING_REG(reg));
} }
static void sun4i_irq_mask(struct irq_data *irqd) static void sun4i_irq_mask(struct irq_data *irqd)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment