diff options
| author | Peter Maydell | 2021-02-19 15:45:55 +0100 |
|---|---|---|
| committer | Peter Maydell | 2021-03-08 18:20:02 +0100 |
| commit | 3378873802afe8af0355c4fac3e11e6510fc1f27 (patch) | |
| tree | 563fa01a7eb193e21f97c54937c2325f004b1ae5 /hw/arm/armsse.c | |
| parent | hw/arm/armsse: Use an array for apb_ppc fields in the state structure (diff) | |
| download | qemu-3378873802afe8af0355c4fac3e11e6510fc1f27.tar.gz qemu-3378873802afe8af0355c4fac3e11e6510fc1f27.tar.xz qemu-3378873802afe8af0355c4fac3e11e6510fc1f27.zip | |
hw/arm/armsse: Add a define for number of IRQs used by the SSE itself
The SSE uses 32 interrupts for its own devices, and then passes through
its expansion IRQ inputs to the CPU's interrupts 33 and upward.
Add a define for the number of IRQs the SSE uses for itself, instead
of hardcoding 32.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20210219144617.4782-23-peter.maydell@linaro.org
Diffstat (limited to 'hw/arm/armsse.c')
| -rw-r--r-- | hw/arm/armsse.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c index 2b25fca1ca..5ae6ce344e 100644 --- a/hw/arm/armsse.c +++ b/hw/arm/armsse.c @@ -531,7 +531,7 @@ static void armsse_realize(DeviceState *dev, Error **errp) int j; char *gpioname; - qdev_prop_set_uint32(cpudev, "num-irq", s->exp_numirq + 32); + qdev_prop_set_uint32(cpudev, "num-irq", s->exp_numirq + NUM_SSE_IRQS); /* * In real hardware the initial Secure VTOR is set from the INITSVTOR* * registers in the IoT Kit System Control Register block. In QEMU @@ -602,7 +602,7 @@ static void armsse_realize(DeviceState *dev, Error **errp) /* Connect EXP_IRQ/EXP_CPUn_IRQ GPIOs to the NVIC's lines 32 and up */ s->exp_irqs[i] = g_new(qemu_irq, s->exp_numirq); for (j = 0; j < s->exp_numirq; j++) { - s->exp_irqs[i][j] = qdev_get_gpio_in(cpudev, j + 32); + s->exp_irqs[i][j] = qdev_get_gpio_in(cpudev, j + NUM_SSE_IRQS); } if (i == 0) { gpioname = g_strdup("EXP_IRQ"); |