summaryrefslogtreecommitdiff
path: root/hw/cpu
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2013-07-05 14:54:41 +0100
committerPeter Maydell <peter.maydell@linaro.org>2013-07-15 16:17:02 +0100
commit528622421eb1be95eaadfe91e8e11729d1e46431 (patch)
tree8ad30fc1aa7db88f32d89769dd445841bae2e4a3 /hw/cpu
parent9121d02cb33c96b444a3973579f5edc119597e81 (diff)
downloadqemu-528622421eb1be95eaadfe91e8e11729d1e46431.tar.gz
hw/cpu/a15mpcore: Correct default value for num-irq
The a15mpcore device claims that its default value for num-irq is the number of interrupts used by the A15MP in the vexpress-a15 board. However that chip has 128 external interrupts, not 64. Since there is only one A15 based model in QEMU currently, we can fix this by simply changing the default value. This error was causing recent (3.10) Linux kernels to print warnings/backtraces when the number of interrupts reported by the GIC was smaller than an interrupt number they wanted to use. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Message-id: 1373032481-15280-1-git-send-email-peter.maydell@linaro.org
Diffstat (limited to 'hw/cpu')
-rw-r--r--hw/cpu/a15mpcore.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/cpu/a15mpcore.c b/hw/cpu/a15mpcore.c
index 967b0809f3..c736257f24 100644
--- a/hw/cpu/a15mpcore.c
+++ b/hw/cpu/a15mpcore.c
@@ -82,12 +82,12 @@ static int a15mp_priv_init(SysBusDevice *dev)
static Property a15mp_priv_properties[] = {
DEFINE_PROP_UINT32("num-cpu", A15MPPrivState, num_cpu, 1),
/* The Cortex-A15MP may have anything from 0 to 224 external interrupt
- * IRQ lines (with another 32 internal). We default to 64+32, which
+ * IRQ lines (with another 32 internal). We default to 128+32, which
* is the number provided by the Cortex-A15MP test chip in the
* Versatile Express A15 development board.
* Other boards may differ and should set this property appropriately.
*/
- DEFINE_PROP_UINT32("num-irq", A15MPPrivState, num_irq, 96),
+ DEFINE_PROP_UINT32("num-irq", A15MPPrivState, num_irq, 160),
DEFINE_PROP_END_OF_LIST(),
};