From: Adam Lackorzynski <adam@os.inf.tu-dresden.de>
Date: Fri, 29 Aug 2014 14:00:28 +0000 (+0100)
Subject: arm_gic: Fix read of GICD_ICFGR
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=71a62046ae7accb4fdd4b2413a77342fc5e0c554;p=qemu.git

arm_gic: Fix read of GICD_ICFGR

The GICD_ICFGR register covers 4 interrupts per byte.

Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Adam Lackorzynski <adam@os.inf.tu-dresden.de>
Message-id: 1408372255-12358-2-git-send-email-adam@os.inf.tu-dresden.de
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c
index 1532ef9482..d2b1aaf485 100644
--- a/hw/intc/arm_gic.c
+++ b/hw/intc/arm_gic.c
@@ -372,7 +372,7 @@ static uint32_t gic_dist_readb(void *opaque, hwaddr offset)
         }
     } else if (offset < 0xf00) {
         /* Interrupt Configuration.  */
-        irq = (offset - 0xc00) * 2 + GIC_BASE_IRQ;
+        irq = (offset - 0xc00) * 4 + GIC_BASE_IRQ;
         if (irq >= s->num_irq)
             goto bad_reg;
         res = 0;