From patchwork Tue Sep 9 16:23:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 37143 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f71.google.com (mail-qa0-f71.google.com [209.85.216.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D73DF20566 for ; Tue, 9 Sep 2014 16:27:52 +0000 (UTC) Received: by mail-qa0-f71.google.com with SMTP id dc16sf3136848qab.2 for ; Tue, 09 Sep 2014 09:27:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=FhN9D1Y8QiJoSYGXVvwn79VKrvsGBPnlna15kS4rUxs=; b=cxbHdsaKgWmfFOmqI/p5YHVng8QFB7orqOYO3S2GNMshf70H+/dZ/uUeDjg0D8jH/d vOWzJL5QrWDKVZuKdEwOJiCLzWUXADuel1NcBbOrTvgYEjtWHV1S8CsfZkxKAfHJTFzv E9N/zWyDkhdK0fplnqCKTWR6nPcuUiSd8nPNGbYXMWWviQ9jjwggiD9EV2r7r8Z+Yk9d abLf1E2zwc7Ec5c1o9KMBpNt9BV3wR8FuK43HXZF5+88uZV8ujXJ4VGIDrpdZwLk2HeY jpvG8ZfvQKTyc5cjfr6xdMhqxK/G6YDomADqJEpRjQeb3ndJPVY4PYWBAFWp7WsVv3bM 2H+w== X-Gm-Message-State: ALoCoQnO80Pb7b3TEWkPN8rv0bg4pg75X78dzUFGPC33N1atv6Wcb8jL6sSagF1vQ4xpFhRkyMOV X-Received: by 10.236.19.52 with SMTP id m40mr21909410yhm.35.1410280072713; Tue, 09 Sep 2014 09:27:52 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.86.9 with SMTP id o9ls2244653qgd.47.gmail; Tue, 09 Sep 2014 09:27:52 -0700 (PDT) X-Received: by 10.220.168.74 with SMTP id t10mr12477996vcy.35.1410280072609; Tue, 09 Sep 2014 09:27:52 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id yx12si5936954vdb.70.2014.09.09.09.27.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Sep 2014 09:27:52 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.169 as permitted sender) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id ik5so748148vcb.0 for ; Tue, 09 Sep 2014 09:27:52 -0700 (PDT) X-Received: by 10.52.163.52 with SMTP id yf20mr5360717vdb.40.1410280072541; Tue, 09 Sep 2014 09:27:52 -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.45.67 with SMTP id uj3csp310549vcb; Tue, 9 Sep 2014 09:27:52 -0700 (PDT) X-Received: by 10.220.46.5 with SMTP id h5mr2033127vcf.55.1410280071628; Tue, 09 Sep 2014 09:27:51 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id k7si5991798vdf.18.2014.09.09.09.27.51 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 09 Sep 2014 09:27:51 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XROEy-0003qv-0y; Tue, 09 Sep 2014 16:26:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XROEw-0003qg-L9 for xen-devel@lists.xen.org; Tue, 09 Sep 2014 16:25:58 +0000 Received: from [85.158.139.211:38595] by server-7.bemta-5.messagelabs.com id BB/C5-30869-51A2F045; Tue, 09 Sep 2014 16:25:57 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1410279955!13474798!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27363 invoked from network); 9 Sep 2014 16:25:57 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-7.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 9 Sep 2014 16:25:57 -0000 X-IronPort-AV: E=Sophos;i="5.04,492,1406592000"; d="scan'208";a="169814279" Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.3.181.6; Tue, 9 Sep 2014 12:23:10 -0400 Received: from drall.uk.xensource.com ([10.80.16.71]) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1XROCC-0001uI-WD; Tue, 09 Sep 2014 17:23:09 +0100 Received: by drall.uk.xensource.com (sSMTP sendmail emulation); Tue, 09 Sep 2014 17:23:08 +0100 From: Ian Campbell To: Date: Tue, 9 Sep 2014 17:23:00 +0100 Message-ID: <1410279788-27167-1-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1410279730.8217.238.camel@kazak.uk.xensource.com> References: <1410279730.8217.238.camel@kazak.uk.xensource.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: julien.grall@linaro.org, tim@xen.org, Ian Campbell , stefano.stabellini@eu.citrix.com Subject: [Xen-devel] [PATCH 1/9] xen: arm: Correct PMXEV cp register definitions X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.169 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 List-Archive: p15,0,c9,c13,1 is PMXEVTYPER not PMXEVCNTR. p15,0,c9,c13,2 is PMXEVCNTR not PMXEVCNR. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/traps.c | 2 +- xen/include/asm-arm/cpregs.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 019991f..c838b70 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1514,8 +1514,8 @@ static void do_cp15_32(struct cpu_user_regs *regs, case HSR_CPREG32(PMCEID0): case HSR_CPREG32(PMCEID1): case HSR_CPREG32(PMCCNTR): + case HSR_CPREG32(PMXEVTYPER): case HSR_CPREG32(PMXEVCNTR): - case HSR_CPREG32(PMXEVCNR): case HSR_CPREG32(PMUSERENR): case HSR_CPREG32(PMINTENSET): case HSR_CPREG32(PMINTENCLR): diff --git a/xen/include/asm-arm/cpregs.h b/xen/include/asm-arm/cpregs.h index f1100c8..afe9148 100644 --- a/xen/include/asm-arm/cpregs.h +++ b/xen/include/asm-arm/cpregs.h @@ -222,8 +222,8 @@ #define PMCEID0 p15,0,c9,c12,6 /* Perf. Mon. Common Event Identification register 0 */ #define PMCEID1 p15,0,c9,c12,7 /* Perf. Mon. Common Event Identification register 1 */ #define PMCCNTR p15,0,c9,c13,0 /* Perf. Mon. Cycle Count Register */ -#define PMXEVCNTR p15,0,c9,c13,1 /* Perf. Mon. Event Type Select Register */ -#define PMXEVCNR p15,0,c9,c13,2 /* Perf. Mon. Event Count Register */ +#define PMXEVTYPER p15,0,c9,c13,1 /* Perf. Mon. Event Type Select Register */ +#define PMXEVCNTR p15,0,c9,c13,2 /* Perf. Mon. Event Count Register */ #define PMUSERENR p15,0,c9,c14,0 /* Perf. Mon. User Enable Register */ #define PMINTENSET p15,0,c9,c14,1 /* Perf. Mon. Interrupt Enable Set Register */ #define PMINTENCLR p15,0,c9,c14,2 /* Perf. Mon. Interrupt Enable Clear Register */