summaryrefslogtreecommitdiffstats
path: root/hw/armv7m_nvic.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2012-12-11 11:30:37 +0000
committerPeter Maydell <peter.maydell@linaro.org>2012-12-11 11:30:37 +0000
commitee3f095680e4f578f4f1371a90acc20375b48966 (patch)
tree84dbe2196110839a10a975a95ffe5c7f6e06b880 /hw/armv7m_nvic.c
parentcad065f18e1ca7694385f42f560da637d4e651b6 (diff)
downloadhqemu-ee3f095680e4f578f4f1371a90acc20375b48966.zip
hqemu-ee3f095680e4f578f4f1371a90acc20375b48966.tar.gz
hw/arm_gic_common: Correct GICC_PMR reset value for newer GICs
The GIC architecture specification for v1 and v2 GICs (as found on the Cortex-A9 and newer) states that the GICC_PMR reset value is zero; this differs from the 0xf0 reset value used on 11MPCore. The NVIC is different again in not having a CPU interface; since we share the GIC code we must force the priority mask field to allow through all interrupts. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Igor Mitsyanko <i.mitsyanko@samsung.com>
Diffstat (limited to 'hw/armv7m_nvic.c')
-rw-r--r--hw/armv7m_nvic.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/armv7m_nvic.c b/hw/armv7m_nvic.c
index f0a2e7b..4963678 100644
--- a/hw/armv7m_nvic.c
+++ b/hw/armv7m_nvic.c
@@ -455,9 +455,11 @@ static void armv7m_nvic_reset(DeviceState *dev)
nc->parent_reset(dev);
/* Common GIC reset resets to disabled; the NVIC doesn't have
* per-CPU interfaces so mark our non-existent CPU interface
- * as enabled by default.
+ * as enabled by default, and with a priority mask which allows
+ * all interrupts through.
*/
s->gic.cpu_enabled[0] = 1;
+ s->gic.priority_mask[0] = 0x100;
/* The NVIC as a whole is always enabled. */
s->gic.enabled = 1;
systick_reset(s);
OpenPOWER on IntegriCloud