[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v5 5/7] target_arm: Parameterise the irq lines f
From: |
Peter Crosthwaite |
Subject: |
Re: [Qemu-devel] [PATCH v5 5/7] target_arm: Parameterise the irq lines for armv7m_init |
Date: |
Mon, 20 Oct 2014 17:41:37 +1000 |
On Thu, Oct 16, 2014 at 10:54 PM, Alistair Francis <address@hidden> wrote:
> This patch allows the board to specifiy the number of NVIC interrupt
> lines when using armv7m_init.
>
> Signed-off-by: Alistair Francis <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
> ---
> 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 */
> --
> 1.9.1
>
>
- Re: [Qemu-devel] [PATCH v5 1/7] stm32f205_timer: Add the stm32f205 Timer, (continued)
[Qemu-devel] [PATCH v5 2/7] stm32f205_USART: Add the stm32f205 USART Controller, Alistair Francis, 2014/10/16
[Qemu-devel] [PATCH v5 3/7] stm32f205_SYSCFG: Add the stm32f205 SYSCFG, Alistair Francis, 2014/10/16
[Qemu-devel] [PATCH v5 4/7] target_arm: Remove memory region init from armv7m_init, Alistair Francis, 2014/10/16
[Qemu-devel] [PATCH v5 5/7] target_arm: Parameterise the irq lines for armv7m_init, Alistair Francis, 2014/10/16
- Re: [Qemu-devel] [PATCH v5 5/7] target_arm: Parameterise the irq lines for armv7m_init,
Peter Crosthwaite <=
[Qemu-devel] [PATCH v5 6/7] stm32f205: Add the stm32f205 SoC, Alistair Francis, 2014/10/16
[Qemu-devel] [PATCH v5 7/7] netduino2: Add the Netduino 2 Machine, Alistair Francis, 2014/10/16