From patchwork Fri Jun 13 12:15:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 31877 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f199.google.com (mail-ve0-f199.google.com [209.85.128.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 868F92054B for ; Fri, 13 Jun 2014 12:17:32 +0000 (UTC) Received: by mail-ve0-f199.google.com with SMTP id oy12sf1806268veb.10 for ; Fri, 13 Jun 2014 05:17:32 -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 :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=xQjW99ZVQTU2usIN9BNArM8EGoUDWEA435SNmFvXFVA=; b=EVcj8OXBPr1jDnSVhYIFpboqKnAKJMRIaUqqBsAfb1ETosPM+k9TujHDdXLtlYS4xo KukEy7oJDYQ71YbTk2oWWQeqHcaUXZT5zeca5+07jjlfT10XszGh9FrZ03Gkkuh0znVA bU+RXcYjn/xLHvB1Ry+lPih11wM+nloTfTEPq/hK2WTKZ7frz9V/RWq/3leSes5BUV2v btZVpiUHqHFAi4gkYaSrdK9vREISKAieRBb+zJ87PY0VHL1lHQhS3Hiqmhk6mfsdIIik f+eNI93SLsamrNR1rIt5RyGVUh7ZJqh6UIG4OYlJCNuD35+vNUcN+L3gz3Baa3WvWq6R 2NBA== X-Gm-Message-State: ALoCoQmRQ9RtxGNIMAJKr8R2bnRElJmmlrpYaso3U4IzFuTE3LACudkUDMzcd34h+EOStfhxeeOX X-Received: by 10.58.135.130 with SMTP id ps2mr475315veb.8.1402661852362; Fri, 13 Jun 2014 05:17:32 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.42.111 with SMTP id b102ls3500642qga.31.gmail; Fri, 13 Jun 2014 05:17:32 -0700 (PDT) X-Received: by 10.52.14.9 with SMTP id l9mr600386vdc.41.1402661852225; Fri, 13 Jun 2014 05:17:32 -0700 (PDT) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id q13si1348425vci.29.2014.06.13.05.17.32 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Jun 2014 05:17:32 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.178 as permitted sender) client-ip=209.85.220.178; Received: by mail-vc0-f178.google.com with SMTP id ij19so2173636vcb.23 for ; Fri, 13 Jun 2014 05:17:32 -0700 (PDT) X-Received: by 10.220.162.196 with SMTP id w4mr72721vcx.58.1402661852130; Fri, 13 Jun 2014 05:17:32 -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 vs6csp482552vcb; Fri, 13 Jun 2014 05:17:31 -0700 (PDT) X-Received: by 10.140.96.68 with SMTP id j62mr2786474qge.5.1402661851716; Fri, 13 Jun 2014 05:17:31 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id j5si4369487qao.40.2014.06.13.05.17.31 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 13 Jun 2014 05:17:31 -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 1WvQNx-00042w-Pa; Fri, 13 Jun 2014 12:15:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WvQNx-00042r-2y for xen-devel@lists.xen.org; Fri, 13 Jun 2014 12:15:09 +0000 Received: from [85.158.143.35:59953] by server-2.bemta-4.messagelabs.com id 9A/27-06539-C4BEA935; Fri, 13 Jun 2014 12:15:08 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1402661706!3150481!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5372 invoked from network); 13 Jun 2014 12:15:07 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-2.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 13 Jun 2014 12:15:07 -0000 X-IronPort-AV: E=Sophos;i="5.01,471,1400025600"; d="scan'208";a="143116298" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 13 Jun 2014 12:15:07 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.80) with Microsoft SMTP Server id 14.3.181.6; Fri, 13 Jun 2014 08:15:05 -0400 Received: from drall.uk.xensource.com ([10.80.16.71] helo=drall.uk.xensource.com.) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1WvQNs-0007FT-Hv; Fri, 13 Jun 2014 13:15:04 +0100 From: Ian Campbell To: Date: Fri, 13 Jun 2014 13:15:04 +0100 Message-ID: <1402661704-5556-1-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.10.4 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] xen: arm: Implement OSDLR_EL1 trap as RAZ/WO. 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.178 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: I'm not sure why this wasn't added at the same time as the other debug registers. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/traps.c | 4 +++- xen/include/asm-arm/sysregs.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index e68e930..06931dc 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1596,9 +1596,11 @@ static void do_sysreg(struct cpu_user_regs *regs, /* - Breakpoints */ HSR_SYSREG_DBG_CASES(DBGBVR): HSR_SYSREG_DBG_CASES(DBGBCR): - /* - Watchpoints */ + /* - Watchpoints */ HSR_SYSREG_DBG_CASES(DBGWVR): HSR_SYSREG_DBG_CASES(DBGWCR): + /* - Double Lock Register */ + case HSR_SYSREG_OSDLR_EL1: if ( hsr.sysreg.read ) *x = 0; /* else: write ignored */ diff --git a/xen/include/asm-arm/sysregs.h b/xen/include/asm-arm/sysregs.h index 4a4de34..b00871c 100644 --- a/xen/include/asm-arm/sysregs.h +++ b/xen/include/asm-arm/sysregs.h @@ -42,6 +42,7 @@ #define HSR_SYSREG_MDSCR_EL1 HSR_SYSREG(2,0,c0,c2,2) #define HSR_SYSREG_OSLAR_EL1 HSR_SYSREG(2,0,c1,c0,4) +#define HSR_SYSREG_OSDLR_EL1 HSR_SYSREG(2,0,c1,c3,4) #define HSR_SYSREG_DBGBVRn_EL1(n) HSR_SYSREG(2,0,c0,c##n,4) #define HSR_SYSREG_DBGBCRn_EL1(n) HSR_SYSREG(2,0,c0,c##n,5)