From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38120) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wwt70-0002qN-Dj for qemu-devel@nongnu.org; Tue, 17 Jun 2014 09:07:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wwt6r-0003FG-8o for qemu-devel@nongnu.org; Tue, 17 Jun 2014 09:07:42 -0400 Received: from mail-we0-x22c.google.com ([2a00:1450:400c:c03::22c]:62271) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wwt6r-0003F1-1r for qemu-devel@nongnu.org; Tue, 17 Jun 2014 09:07:33 -0400 Received: by mail-we0-f172.google.com with SMTP id u57so7326788wes.17 for ; Tue, 17 Jun 2014 06:07:31 -0700 (PDT) From: Oran Avraham Date: Tue, 17 Jun 2014 16:07:27 +0300 Message-Id: <1403010447-4627-1-git-send-email-oranav@gmail.com> Subject: [Qemu-devel] [PATCH] armv7m_nvic: fix AIRCR implementation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org The returned reset value was wrong (off by one zero nibble), and qemu didn't log unimplemented writes to the PRIGROUP field. Signed-off-by: Oran Avraham --- hw/intc/armv7m_nvic.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c index 75d9c6e..1a7af45 100644 --- a/hw/intc/armv7m_nvic.c +++ b/hw/intc/armv7m_nvic.c @@ -211,7 +211,7 @@ static uint32_t nvic_readl(nvic_state *s, uint32_t offset) cpu = ARM_CPU(current_cpu); return cpu->env.v7m.vecbase; case 0xd0c: /* Application Interrupt/Reset Control. */ - return 0xfa05000; + return 0xfa050000; case 0xd10: /* System Control. */ /* TODO: Implement SLEEPONEXIT. */ return 0; @@ -346,6 +346,9 @@ static void nvic_writel(nvic_state *s, uint32_t offset, uint32_t value) if (value & 5) { qemu_log_mask(LOG_UNIMP, "AIRCR system reset unimplemented\n"); } + if (value & 0x700) { + qemu_log_mask(LOG_UNIMP, "PRIGROUP unimplemented\n"); + } } break; case 0xd10: /* System Control. */ -- 1.9.1