From patchwork Wed Jan 7 21:22:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 426417 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 9934D14009B for ; Thu, 8 Jan 2015 08:25:19 +1100 (AEDT) Received: from localhost ([::1]:42911 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y8y6P-00049X-J4 for incoming@patchwork.ozlabs.org; Wed, 07 Jan 2015 16:25:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41101) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y8y3O-00073J-A8 for qemu-devel@nongnu.org; Wed, 07 Jan 2015 16:22:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y8y3M-0006YQ-UM for qemu-devel@nongnu.org; Wed, 07 Jan 2015 16:22:10 -0500 Received: from mail-pa0-x22d.google.com ([2607:f8b0:400e:c03::22d]:62572) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y8y3M-0006YG-O1 for qemu-devel@nongnu.org; Wed, 07 Jan 2015 16:22:08 -0500 Received: by mail-pa0-f45.google.com with SMTP id lf10so7334382pab.4 for ; Wed, 07 Jan 2015 13:22:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VKgpQD70z/i0Yyh2mgFF98gY7jzt63nsn9x65umKCKA=; b=kEEi5C4FjpTLNJlHfU6ww+hRCwcfOlhfyF2sxMWiMEIqHblY62LFiOwOTZsjzD9Znj QGJmW7vvBGclvQdFtWkiM+MQ+pWnQqn06igfSv+35cK2uIPEdBul/pdJBSCft4sIK9rT c973wIFcukj+asE2kJuekaLmJnVzbHl/FHLLdkM9uRlbGq2n8Ys97PkK7exsdLvFx2Ey /syP4KpO/iSr1evoCO8zkpTxtbmUh/nMIUtAzFWg3735VhxnGn0xg53Yrnj43mqAZ/DU wS8MYZhYDB0briTo16H2iSmbyRUMTx51D0OmQ2U9f7cFnbFxoHCg7nBgGIb5rBzkKjkm g4DQ== X-Received: by 10.70.22.208 with SMTP id g16mr8717841pdf.141.1420665727935; Wed, 07 Jan 2015 13:22:07 -0800 (PST) Received: from localhost (27-33-250-51.static.tpgi.com.au. [27.33.250.51]) by mx.google.com with ESMTPSA id sx4sm2620650pbc.36.2015.01.07.13.22.06 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Jan 2015 13:22:07 -0800 (PST) From: Alistair Francis To: qemu-devel@nongnu.org Date: Thu, 8 Jan 2015 07:22:03 +1000 Message-Id: X-Mailer: git-send-email 2.1.0 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::22d Cc: peter.maydell@linaro.org, peter.crosthwaite@xilinx.com, konstanty@ieee.org, martin.galvan@tallertechnologies.com Subject: [Qemu-devel] [PATCH v9 5/7] target_arm: Parameterise the irq lines for armv7m_init X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This patch allows the board to specifiy the number of NVIC interrupt lines when using armv7m_init. Signed-off-by: Alistair Francis Reviewed-by: Peter Crosthwaite --- hw/arm/armv7m.c | 7 ++++--- hw/arm/stellaris.c | 5 ++++- include/hw/arm/arm.h | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c index 50281f7..7169027 100644 --- a/hw/arm/armv7m.c +++ b/hw/arm/armv7m.c @@ -166,14 +166,14 @@ static void armv7m_reset(void *opaque) mem_size is in bytes. Returns the NVIC array. */ -qemu_irq *armv7m_init(MemoryRegion *system_memory, int mem_size, +qemu_irq *armv7m_init(MemoryRegion *system_memory, int mem_size, int num_irq, const char *kernel_filename, const char *cpu_model) { ARMCPU *cpu; CPUARMState *env; DeviceState *nvic; /* FIXME: make this local state. */ - static qemu_irq pic[64]; + qemu_irq *pic = g_new(qemu_irq, num_irq); int image_size; uint64_t entry; uint64_t lowaddr; @@ -194,11 +194,12 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory, int mem_size, armv7m_bitband_init(); nvic = qdev_create(NULL, "armv7m_nvic"); + qdev_prop_set_uint32(nvic, "num-irq", num_irq); env->nvic = nvic; qdev_init_nofail(nvic); sysbus_connect_irq(SYS_BUS_DEVICE(nvic), 0, qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_IRQ)); - for (i = 0; i < 64; i++) { + for (i = 0; i < num_irq; i++) { pic[i] = qdev_get_gpio_in(nvic, i); } diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index d0c61c5..6fad10f 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -29,6 +29,8 @@ #define BP_OLED_SSI 0x02 #define BP_GAMEPAD 0x04 +#define NUM_IRQ_LINES 64 + typedef const struct { const char *name; uint32_t did0; @@ -1239,7 +1241,8 @@ static void stellaris_init(const char *kernel_filename, const char *cpu_model, vmstate_register_ram_global(sram); memory_region_add_subregion(system_memory, 0x20000000, sram); - pic = armv7m_init(system_memory, flash_size, kernel_filename, cpu_model); + pic = armv7m_init(system_memory, flash_size, NUM_IRQ_LINES, + kernel_filename, cpu_model); if (board->dc1 & (1 << 16)) { dev = sysbus_create_varargs(TYPE_STELLARIS_ADC, 0x40038000, diff --git a/include/hw/arm/arm.h b/include/hw/arm/arm.h index f8b329b..5c940eb 100644 --- a/include/hw/arm/arm.h +++ b/include/hw/arm/arm.h @@ -15,7 +15,7 @@ #include "hw/irq.h" /* armv7m.c */ -qemu_irq *armv7m_init(MemoryRegion *system_memory, int mem_size, +qemu_irq *armv7m_init(MemoryRegion *system_memory, int mem_size, int num_irq, const char *kernel_filename, const char *cpu_model); /* arm_boot.c */