| Message ID | 1399795571-17231-3-git-send-email-haojian.zhuang@linaro.org |
|---|---|
| State | Accepted |
| Commit | b8802f76fe473d91886220498aeda157c492f2d1 |
| Headers | show |
On Sun, May 11, 2014 at 04:05:58PM +0800, Haojian Zhuang wrote: > Bit[9:0] is interrupt ID field in GICC_IAR. Bit[12:10] is CPU ID field, > and others are reserved. > > So we should use GICC_IAR_INT_ID_MASK to get interrupt ID. It's not a good way > to use ~0x1c00 (CPU ID field) to get interrupt ID. > > Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org> > --- > drivers/irqchip/irq-gic.c | 2 +- > include/linux/irqchip/arm-gic.h | 2 ++ > 2 files changed, 3 insertions(+), 1 deletion(-) Applied to irqchip/core. Amended subject line to "irqchip: gic: Use mask field in GICC_IAR" thx, Jason.
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index 4300b66..f711fb6 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -287,7 +287,7 @@ static void __exception_irq_entry gic_handle_irq(struct pt_regs *regs) do { irqstat = readl_relaxed(cpu_base + GIC_CPU_INTACK); - irqnr = irqstat & ~0x1c00; + irqnr = irqstat & GICC_IAR_INT_ID_MASK; if (likely(irqnr > 15 && irqnr < 1021)) { irqnr = irq_find_mapping(gic->domain, irqnr); diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h index 7ed92d0..45e2d8c 100644 --- a/include/linux/irqchip/arm-gic.h +++ b/include/linux/irqchip/arm-gic.h @@ -21,6 +21,8 @@ #define GIC_CPU_ACTIVEPRIO 0xd0 #define GIC_CPU_IDENT 0xfc +#define GICC_IAR_INT_ID_MASK 0x3ff + #define GIC_DIST_CTRL 0x000 #define GIC_DIST_CTR 0x004 #define GIC_DIST_IGROUP 0x080
Bit[9:0] is interrupt ID field in GICC_IAR. Bit[12:10] is CPU ID field, and others are reserved. So we should use GICC_IAR_INT_ID_MASK to get interrupt ID. It's not a good way to use ~0x1c00 (CPU ID field) to get interrupt ID. Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org> --- drivers/irqchip/irq-gic.c | 2 +- include/linux/irqchip/arm-gic.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)