diff options
| author | Peter Maydell | 2017-12-13 18:59:26 +0100 |
|---|---|---|
| committer | Peter Maydell | 2017-12-13 18:59:26 +0100 |
| commit | 27f26bfed923e4c68a1acb61fdafcd0bc63abf71 (patch) | |
| tree | 05be76a5b4e690150944982c8f64af29b0cd426a /include | |
| parent | nvic: Make nvic_sysreg_ns_ops work with any MemoryRegion (diff) | |
| download | qemu-27f26bfed923e4c68a1acb61fdafcd0bc63abf71.tar.gz qemu-27f26bfed923e4c68a1acb61fdafcd0bc63abf71.tar.xz qemu-27f26bfed923e4c68a1acb61fdafcd0bc63abf71.zip | |
nvic: Make systick banked
For the v8M security extension, there should be two systick
devices, which use separate banked systick exceptions. The
register interface is banked in the same way as for other
banked registers, including the existence of an NS alias
region for secure code to access the nonsecure timer.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 1512154296-5652-3-git-send-email-peter.maydell@linaro.org
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/intc/armv7m_nvic.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/hw/intc/armv7m_nvic.h b/include/hw/intc/armv7m_nvic.h index ac7997ca8c..8bc29112e3 100644 --- a/include/hw/intc/armv7m_nvic.h +++ b/include/hw/intc/armv7m_nvic.h @@ -78,13 +78,15 @@ typedef struct NVICState { MemoryRegion sysregmem; MemoryRegion sysreg_ns_mem; + MemoryRegion systickmem; + MemoryRegion systick_ns_mem; MemoryRegion container; uint32_t num_irq; qemu_irq excpout; qemu_irq sysresetreq; - SysTickState systick; + SysTickState systick[M_REG_NUM_BANKS]; } NVICState; #endif |