From patchwork Sun Apr 20 23:25:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rabin Vincent X-Patchwork-Id: 340550 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 354441400C6 for ; Mon, 21 Apr 2014 09:25:52 +1000 (EST) Received: from localhost ([::1]:46935 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wc17N-0000DX-N0 for incoming@patchwork.ozlabs.org; Sun, 20 Apr 2014 19:25:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37818) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wc171-00089K-9S for qemu-devel@nongnu.org; Sun, 20 Apr 2014 19:25:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wc16v-0008Fg-5H for qemu-devel@nongnu.org; Sun, 20 Apr 2014 19:25:27 -0400 Received: from mail-lb0-x22b.google.com ([2a00:1450:4010:c04::22b]:58390) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wc16u-0008FX-TD for qemu-devel@nongnu.org; Sun, 20 Apr 2014 19:25:21 -0400 Received: by mail-lb0-f171.google.com with SMTP id w7so2706321lbi.2 for ; Sun, 20 Apr 2014 16:25:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=7DPunA6ijJeyQcIHiuH+5w7Bb4vCl2PJu7+hLkqnwHQ=; b=H0SCXMy2XaZKprlb389+5NL0/yfxbv4AHlSB4YWIwrXREc9fyuRD6laHuFDjAzjQnJ BmCe+l5Lhj8z6kWUNfI93jNzCe0wfhnF+Yd7RaP5Fnym5IKdZDb+Va6PNRMEktVGYB6b 7qP0xDmwl7AR2I99zVx3U2aj2LKLPkqp6EjLhYNtZXNS8hUQAEUO+ZTpKCR5a4YfIm0b dcA8uZSgsTSk9X6UtwzqnYViadsCZoqYrl5zpyPkr8ErmFWl1vAw3V4hZN4qJODTdF2I UMGfivo1hfC8T4hYfzpYO6RcK7Vvd3hywcms3uGFwH+kndo3V9hHOzWn4wu3gkOUjQIb nwgw== X-Received: by 10.152.2.131 with SMTP id 3mr24466223lau.20.1398036319192; Sun, 20 Apr 2014 16:25:19 -0700 (PDT) Received: from localhost.localdomain (217-211-190-200-no39.tbcn.telia.com. [217.211.190.200]) by mx.google.com with ESMTPSA id el7sm35359097lac.10.2014.04.20.16.25.17 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 20 Apr 2014 16:25:18 -0700 (PDT) From: Rabin Vincent To: Peter Maydell Date: Mon, 21 Apr 2014 01:25:08 +0200 Message-Id: <1398036308-32166-1-git-send-email-rabin@rab.in> X-Mailer: git-send-email 1.9.1 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c04::22b Cc: Rabin Vincent , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH] 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org cp15.c0_cpuid is never initialized for ARMv7-M; take the value directly from cpu->midr instead. Signed-off-by: Rabin Vincent Reviewed-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];