From patchwork Thu May 1 14:54:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 29498 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f197.google.com (mail-ve0-f197.google.com [209.85.128.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7366A20675 for ; Thu, 1 May 2014 15:10:48 +0000 (UTC) Received: by mail-ve0-f197.google.com with SMTP id sa20sf11197572veb.8 for ; Thu, 01 May 2014 08:10:48 -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:cc: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=A3kW2Mxcq1j6wXu8eFHwQvlPHV3TnCQkicjvvmq/VRk=; b=FloXCc8Agjs3lzS3J9NYTegMKOs8It4jeX0iGR0wn84xL0BqanIveF5jzbHZq53GTz rC3xrFoAWZrPYPu0773RcMbUKzbztdGVecA8ieAiobMVr10qgraAK8dJ/rfVF6xwU4k8 wRUWqW8gXOVKbu8RoUElGjBNvQSQpiM3urzK/epLTtZ/UWxOL6y+pRsR1qo6F0BBnxWm Gm+xHuBvKyVr1aKZFGi9h0yMdYgVZp8qLiK9hH38a49/P2tBVGh4RhwbK8dN2Fu5rsNT pM+W3MVORbG2dT9cvkr0L9lyc3w/NpjIkrcuzML+WpaZjYsDmCCpt7qOp09S1lTfqnqC Mljw== X-Gm-Message-State: ALoCoQl8xRZRwidErP34XEH+PiOVyM7MFoTF4F+fxhfjUyEnj71KWw6kwkdUvPi7FIQBQD/+NvEk X-Received: by 10.58.77.204 with SMTP id u12mr5536336vew.24.1398957048151; Thu, 01 May 2014 08:10:48 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.92.247 with SMTP id b110ls1130351qge.16.gmail; Thu, 01 May 2014 08:10:47 -0700 (PDT) X-Received: by 10.220.175.70 with SMTP id w6mr281796vcz.72.1398957047966; Thu, 01 May 2014 08:10:47 -0700 (PDT) Received: from mail-ve0-f178.google.com (mail-ve0-f178.google.com [209.85.128.178]) by mx.google.com with ESMTPS id rw10si6111512vec.26.2014.05.01.08.10.47 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 01 May 2014 08:10:47 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.128.178; Received: by mail-ve0-f178.google.com with SMTP id jw12so4066865veb.9 for ; Thu, 01 May 2014 08:10:47 -0700 (PDT) X-Received: by 10.52.108.164 with SMTP id hl4mr7598321vdb.25.1398957047891; Thu, 01 May 2014 08:10:47 -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.220.221.72 with SMTP id ib8csp31269vcb; Thu, 1 May 2014 08:10:47 -0700 (PDT) X-Received: by 10.224.167.132 with SMTP id q4mr14567568qay.77.1398957047210; Thu, 01 May 2014 08:10:47 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id v39si12861343qge.129.2014.05.01.08.10.47 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 01 May 2014 08:10:47 -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]:40118 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WfsdK-0002tp-Lm for patch@linaro.org; Thu, 01 May 2014 11:10:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46249) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WfscB-0001sC-TJ for qemu-devel@nongnu.org; Thu, 01 May 2014 11:09:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wfsc8-0000Pr-HK for qemu-devel@nongnu.org; Thu, 01 May 2014 11:09:35 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:47975) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wfsc8-0000OS-BI for qemu-devel@nongnu.org; Thu, 01 May 2014 11:09:32 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1WfsOB-0001w7-9t; Thu, 01 May 2014 15:55:07 +0100 From: Peter Maydell To: Anthony Liguori Date: Thu, 1 May 2014 15:54:59 +0100 Message-Id: <1398956107-7411-3-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1398956107-7411-1-git-send-email-peter.maydell@linaro.org> References: <1398956107-7411-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 Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL 02/10] armv7m_nvic: fix CPUID Base Register 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=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) 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: Rabin Vincent cp15.c0_cpuid is never initialized for ARMv7-M; take the value directly from cpu->midr instead. Signed-off-by: Rabin Vincent Message-id: 1398036308-32166-1-git-send-email-rabin@rab.in Signed-off-by: Peter Maydell --- hw/intc/armv7m_nvic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c index 6066fa6..f5b0c3b 100644 --- a/hw/intc/armv7m_nvic.c +++ b/hw/intc/armv7m_nvic.c @@ -173,7 +173,7 @@ static uint32_t nvic_readl(nvic_state *s, uint32_t offset) return 10000; case 0xd00: /* CPUID Base. */ cpu = ARM_CPU(current_cpu); - return cpu->env.cp15.c0_cpuid; + return cpu->midr; case 0xd04: /* Interrupt Control State. */ /* VECTACTIVE */ val = s->gic.running_irq[0];