diff options
| author | Fabian Aggeler | 2015-05-12 12:57:17 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-05-12 12:57:17 +0200 |
| commit | 679aa175e84f5f80b32b307fce5a6b92729e0e61 (patch) | |
| tree | 55aefc4eb7ed961e5dcfedc990521b2d5a08e756 /hw/intc/armv7m_nvic.c | |
| parent | hw/intc/arm_gic_kvm.c: Save and restore GICD_IGROUPRn state (diff) | |
| download | qemu-679aa175e84f5f80b32b307fce5a6b92729e0e61.tar.gz qemu-679aa175e84f5f80b32b307fce5a6b92729e0e61.tar.xz qemu-679aa175e84f5f80b32b307fce5a6b92729e0e61.zip | |
hw/intc/arm_gic: Make ICDDCR/GICD_CTLR banked
ICDDCR/GICD_CTLR is banked if the GIC has the security extensions,
and the S (or only) copy has separate enable bits for Group0 and
Group1 enable if the GIC implements interrupt groups.
EnableGroup0 (Bit [1]) in GICv1 is architecturally IMPDEF. Since this
bit (Enable Non-secure) is present in the integrated GIC of the Cortex-A9
MPCore, we support this bit in our GICv1 implementation too.
Signed-off-by: Fabian Aggeler <aggelerf@ethz.ch>
Signed-off-by: Greg Bellows <greg.bellows@linaro.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1430502643-25909-7-git-send-email-peter.maydell@linaro.org
Message-id: 1429113742-8371-8-git-send-email-greg.bellows@linaro.org
[PMM: rewritten to store the state in a single s->ctlr uint32,
with the NS register handled as an alias of bit 1 in that value;
added vmstate version bump]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/intc/armv7m_nvic.c')
| -rw-r--r-- | hw/intc/armv7m_nvic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c index ca19157c1e..16f0dca2d4 100644 --- a/hw/intc/armv7m_nvic.c +++ b/hw/intc/armv7m_nvic.c @@ -477,7 +477,7 @@ static void armv7m_nvic_reset(DeviceState *dev) s->gic.cpu_enabled[0] = true; s->gic.priority_mask[0] = 0x100; /* The NVIC as a whole is always enabled. */ - s->gic.enabled = true; + s->gic.ctlr = 1; systick_reset(s); } |