From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:56115) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T7VmS-0007QR-Cw for qemu-devel@nongnu.org; Fri, 31 Aug 2012 14:17:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T7VmQ-0001s2-P6 for qemu-devel@nongnu.org; Fri, 31 Aug 2012 14:17:20 -0400 Received: from e38.co.us.ibm.com ([32.97.110.159]:52333) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T7VmQ-0001rx-IS for qemu-devel@nongnu.org; Fri, 31 Aug 2012 14:17:18 -0400 Received: from /spool/local by e38.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 31 Aug 2012 12:17:16 -0600 Received: from d03relay03.boulder.ibm.com (d03relay03.boulder.ibm.com [9.17.195.228]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id 1D9663E40039 for ; Fri, 31 Aug 2012 12:16:21 -0600 (MDT) Received: from d03av06.boulder.ibm.com (d03av06.boulder.ibm.com [9.17.195.245]) by d03relay03.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q7VIGJbM068984 for ; Fri, 31 Aug 2012 12:16:20 -0600 Received: from d03av06.boulder.ibm.com (loopback [127.0.0.1]) by d03av06.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q7VIHio3009944 for ; Fri, 31 Aug 2012 12:17:44 -0600 From: Anthony Liguori In-Reply-To: References: <1346110871-11631-1-git-send-email-meadori@codesourcery.com> Date: Fri, 31 Aug 2012 13:16:12 -0500 Message-ID: <87r4qndj0z.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: Re: [Qemu-devel] [PATCH for-1.2] hw/armv7m_nvic: Correctly register GIC region when setting up NVIC List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Meador Inge , qemu-devel@nongnu.org, paul@codesourcery.com Peter Maydell 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 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 >> --- >> 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 >>