Commit 2edd7c99 authored by Milo Kim's avatar Milo Kim Committed by Greg Kroah-Hartman

irqchip/atmel-aic: Fix wrong bit operation for IRQ priority

commit 49f34134 upstream.

Atmel AIC has common structure for SMR (Source Mode Register).

  bit[6:5] Interrupt source type
  bit[2:0] Priority level
  Other bits are unused.

To update new priority value, bit[2:0] should be cleared first and then
new priority level can be written. However, aic_common_set_priority()
helper clears source type bits instead of priority bits.
This patch fixes wrong mask bit operation.

Fixes: b1479ebb "irqchip: atmel-aic: Add atmel AIC/AIC5 drivers"
Signed-off-by: default avatarMilo Kim <milo.kim@ti.com>
Acked-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Ludovic Desroches <ludovic.desroches@atmel.com>
Cc: Nicholas Ferre <nicolas.ferre@atmel.com>
Link: http://lkml.kernel.org/r/1452669592-3401-2-git-send-email-milo.kim@ti.comSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4778f99a
...@@ -86,7 +86,7 @@ int aic_common_set_priority(int priority, unsigned *val) ...@@ -86,7 +86,7 @@ int aic_common_set_priority(int priority, unsigned *val)
priority > AT91_AIC_IRQ_MAX_PRIORITY) priority > AT91_AIC_IRQ_MAX_PRIORITY)
return -EINVAL; return -EINVAL;
*val &= AT91_AIC_PRIOR; *val &= ~AT91_AIC_PRIOR;
*val |= priority; *val |= priority;
return 0; return 0;
......
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