[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH for-1.2] hw/armv7m_nvic: Correctly register GIC
From: |
Anthony Liguori |
Subject: |
Re: [Qemu-devel] [PATCH for-1.2] hw/armv7m_nvic: Correctly register GIC region when setting up NVIC |
Date: |
Fri, 31 Aug 2012 13:16:12 -0500 |
User-agent: |
Notmuch/0.13.2+93~ged93d79 (http://notmuchmail.org) Emacs/23.3.1 (x86_64-pc-linux-gnu) |
Peter Maydell <address@hidden> writes:
> Hi Anthony; I realised somewhat belatedly that this bugfix
> should probably go into 1.2 if possible. Can we still
> squeeze it in or is it too late?
>
> Patchwork url: http://patchwork.ozlabs.org/patch/180315/
It's too late for GA. Can go in via stable though.
Regards,
Anthony Liguori
>
> thanks
> -- PMM
>
> On 28 August 2012 00:41, Meador Inge <address@hidden> wrote:
>> 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: Meador Inge <address@hidden>
>> ---
>> hw/armv7m_nvic.c | 3 ++-
>> 1 files changed, 2 insertions(+), 1 deletions(-)
>>
>> diff --git a/hw/armv7m_nvic.c b/hw/armv7m_nvic.c
>> index 6a0832e..5c09116 100644
>> --- a/hw/armv7m_nvic.c
>> +++ b/hw/armv7m_nvic.c
>> @@ -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.
>> */
>> --
>> 1.7.7.6
>>