From patchwork Sat Oct 25 11:15:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 403037 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 BECBC140080 for ; Sat, 25 Oct 2014 22:19:03 +1100 (AEDT) Received: from localhost ([::1]:52997 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XhzN7-0000Ip-Qe for incoming@patchwork.ozlabs.org; Sat, 25 Oct 2014 07:19:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52787) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XhzKJ-0003lv-HJ for qemu-devel@nongnu.org; Sat, 25 Oct 2014 07:16:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XhzKD-0004UC-Ax for qemu-devel@nongnu.org; Sat, 25 Oct 2014 07:16:07 -0400 Received: from mail-pd0-x22f.google.com ([2607:f8b0:400e:c02::22f]:57338) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XhzKD-0004U1-3a for qemu-devel@nongnu.org; Sat, 25 Oct 2014 07:16:01 -0400 Received: by mail-pd0-f175.google.com with SMTP id y13so2865096pdi.6 for ; Sat, 25 Oct 2014 04:16:00 -0700 (PDT) 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=WcbYH9qV5a8TpD/F8pBkupfNp7SksmyMllk9QZ7BHEU=; b=LRORLh+0b39xd2EYOUvmDuUZkQzDPvKbppbe2tPbys/rPx9r/jasqu5WJDeKkdyo67 rK0Wr546tWIi3TRoI4EvryYxBQ6YOZ3DHVZakM6MSg7tcHpbZ2iQM2xPa/lSHdBbM8IC Bu0PurlGOUNDnlqCTjEhE7IeykG2Jz/9dQp5Kgun2TaLGb0VvOAlP+FsCDq90cNM0J7h dAeB8402kbLJwncode79tpBO41y+//UCm353FS99mVHB6QPnKkDEptdsI+7GUdFMnDeT ipdKIx/kDMe25g6xrOwAtI4rCs9MxjylQehhM8kjbdOe8qIfeRJpm0TLgQ3Er9VSoJGx 4S0g== X-Received: by 10.68.163.65 with SMTP id yg1mr10527274pbb.21.1414235760280; Sat, 25 Oct 2014 04:16:00 -0700 (PDT) Received: from localhost (123-243-147-200.static.tpgi.com.au. [123.243.147.200]) by mx.google.com with ESMTPSA id ub7sm4162275pbc.30.2014.10.25.04.15.58 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 25 Oct 2014 04:15:59 -0700 (PDT) From: Alistair Francis To: qemu-devel@nongnu.org Date: Sat, 25 Oct 2014 21:15:55 +1000 Message-Id: X-Mailer: git-send-email 1.9.1 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:c02::22f Cc: peter.maydell@linaro.org, peter.crosthwaite@xilinx.com, konstanty@ieee.org, martin.galvan@tallertechnologies.com Subject: [Qemu-devel] [PATCH v6 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 a112930..94e55a4 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 */