From patchwork Thu Jun 19 17:36:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 32230 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f197.google.com (mail-ie0-f197.google.com [209.85.223.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7A736203F4 for ; Thu, 19 Jun 2014 17:38:11 +0000 (UTC) Received: by mail-ie0-f197.google.com with SMTP id lx4sf18705862iec.8 for ; Thu, 19 Jun 2014 10:38:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=WKMacZHogSrK5DQBX2VgMFbf8v6R1cuGTo7hdkVs5ek=; b=UvIZSpQprlqzwwwotxWET07BX3X4Tu7LYQa1BxU06PFZkBGlBA0I5dmDaYOV4Yrlws a7vVgKvB48D0OBhiqt7H+OaT39L5V+LB+2YkB7vZSKOQOF6rUJj2HJvencaVku4y9kWt E7CRvCfwOQDU26RjzGHtuOTam1V1mgVlUKXnbf0eAWEaYJHTrHUYuzIh+YN9rfoys9Vl 7cgf5touNx5Enr8mM1j+rhgqhnhQ9pULuZDmudppPP9TttBd3JJk3vE54e9so0vHWryY xtCf2R19bX1d0GfYJjgvwLNbyPENs9h9MMHX41BP+RXETYV9vf7UYXz6OTcLzgo52xDX vpsA== X-Gm-Message-State: ALoCoQlNu27/jz68c3sXFnEyIg9LOXdWx1qgiw7K3GWakw5J37mH44VNlIMxG0VsRQdQ4RZquVvV X-Received: by 10.50.67.38 with SMTP id k6mr4985192igt.8.1403199490746; Thu, 19 Jun 2014 10:38:10 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.48.112 with SMTP id n103ls607208qga.86.gmail; Thu, 19 Jun 2014 10:38:10 -0700 (PDT) X-Received: by 10.221.56.132 with SMTP id wc4mr2008672vcb.38.1403199490654; Thu, 19 Jun 2014 10:38:10 -0700 (PDT) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by mx.google.com with ESMTPS id tv5si2733160vcb.38.2014.06.19.10.38.10 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 19 Jun 2014 10:38:10 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.175 as permitted sender) client-ip=209.85.128.175; Received: by mail-ve0-f175.google.com with SMTP id jx11so2601629veb.6 for ; Thu, 19 Jun 2014 10:38:10 -0700 (PDT) X-Received: by 10.58.56.71 with SMTP id y7mr5271046vep.24.1403199490558; Thu, 19 Jun 2014 10:38:10 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.54.6 with SMTP id vs6csp379024vcb; Thu, 19 Jun 2014 10:38:10 -0700 (PDT) X-Received: by 10.140.48.45 with SMTP id n42mr8903571qga.107.1403199489987; Thu, 19 Jun 2014 10:38:09 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id t5si7287732qgd.30.2014.06.19.10.38.09 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 19 Jun 2014 10:38:09 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:36949 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxgHp-0001ve-Ip for patch@linaro.org; Thu, 19 Jun 2014 13:38:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47670) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxgGo-0000o8-Ea for qemu-devel@nongnu.org; Thu, 19 Jun 2014 13:37:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxgGn-0004qi-9X for qemu-devel@nongnu.org; Thu, 19 Jun 2014 13:37:06 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:48646) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxgGn-0004k9-3N for qemu-devel@nongnu.org; Thu, 19 Jun 2014 13:37:05 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1WxgGg-0002K3-A1 for qemu-devel@nongnu.org; Thu, 19 Jun 2014 18:36:58 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 19 Jun 2014 18:36:57 +0100 Message-Id: <1403199417-8833-15-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1403199417-8833-1-git-send-email-peter.maydell@linaro.org> References: <1403199417-8833-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Subject: [Qemu-devel] [PULL 14/14] armv7m_nvic: fix AIRCR implementation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.175 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Oran Avraham 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 Message-id: 1403010447-4627-1-git-send-email-oranav@gmail.com Signed-off-by: Peter Maydell --- 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. */