From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38893) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XIjxt-0007HP-FZ for qemu-devel@nongnu.org; Sat, 16 Aug 2014 15:48:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XIjxh-00078g-3x for qemu-devel@nongnu.org; Sat, 16 Aug 2014 15:48:37 -0400 Received: from os.inf.tu-dresden.de ([2002:8d4c:3001:48::99]:37732) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XIjxg-000787-Ry for qemu-devel@nongnu.org; Sat, 16 Aug 2014 15:48:25 -0400 From: Adam Lackorzynski Date: Sat, 16 Aug 2014 21:48:20 +0200 Message-Id: <1408218501-22326-3-git-send-email-adam@os.inf.tu-dresden.de> In-Reply-To: <1408218501-22326-1-git-send-email-adam@os.inf.tu-dresden.de> References: <1408218501-22326-1-git-send-email-adam@os.inf.tu-dresden.de> Subject: [Qemu-devel] [PATCH 2/3] arm_gic: GICD_ICFGR: Write model only for pre v1 GICs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: christoffer.dall@linaro.org Setting the model is only available in pre-v1 GIC models. --- hw/intc/arm_gic.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c index d2b1aaf..e546647 100644 --- a/hw/intc/arm_gic.c +++ b/hw/intc/arm_gic.c @@ -561,10 +561,12 @@ static void gic_dist_writeb(void *opaque, hwaddr offset, if (irq < GIC_INTERNAL) value |= 0xaa; for (i = 0; i < 4; i++) { - if (value & (1 << (i * 2))) { - GIC_SET_MODEL(irq + i); - } else { - GIC_CLEAR_MODEL(irq + i); + if (s->revision == REV_11MPCORE || s->revision == REV_NVIC) { + if (value & (1 << (i * 2))) { + GIC_SET_MODEL(irq + i); + } else { + GIC_CLEAR_MODEL(irq + i); + } } if (value & (2 << (i * 2))) { GIC_SET_EDGE_TRIGGER(irq + i); -- 2.1.0.rc1