Commit 9892cae3 authored by Meador Inge's avatar Meador Inge Committed by Peter Maydell
Browse files

hw/armv7m_nvic: Correctly register GIC region when setting up NVIC 



When setting up the NVIC memory regions the memory range
0x100..0xcff is aliased to an IO memory region that belongs
to the ARM GIC.  This aliased region should be added to the
NVIC memory container, but the actual GIC IO memory region
was being added instead.  This mixup was causing the wrong
IO memory access functions to be called when accessing parts
of the NVIC memory.

Signed-off-by: default avatarMeador Inge <meadori@codesourcery.com>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 14c126ba

hw/armv7m_nvic.c

+2 −1
Original line number Diff line number Diff line
@@ -489,7 +489,8 @@ static int armv7m_nvic_init(SysBusDevice *dev) 
     */

    memory_region_init_alias(&s->gic_iomem_alias, "nvic-gic", &s->gic.iomem,

                             0x100, 0xc00);

    memory_region_add_subregion_overlap(&s->container, 0x100, &s->gic.iomem, 1);

    memory_region_add_subregion_overlap(&s->container, 0x100,

                                        &s->gic_iomem_alias, 1);

    /* Map the whole thing into system memory at the location required

     * by the v7M architecture.

     */