From patchwork Mon Jun 30 23:09:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 32818 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f198.google.com (mail-qc0-f198.google.com [209.85.216.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5024B203C0 for ; Mon, 30 Jun 2014 23:58:49 +0000 (UTC) Received: by mail-qc0-f198.google.com with SMTP id m20sf19580599qcx.9 for ; Mon, 30 Jun 2014 16:58:49 -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=PEK4PrQmDuGrgtuCVF5Zn1bgg9aVOL5t9s88yeftWmg=; b=TfZtfoyO85VPkYgyufmy+luLpbkqtFs+hnn/voACEL9oWkGHb2/wq/6hWPO4UhN3C7 uxHAW2MdXUgngcbkOdH1WrpmLCItHctXRcyqW/FgcPRJZbEynS5EeUI3V/exlUGlK6zg QblhHPsRCjHhmDMX9vf/a2jHGvLq+6O23ttynRaX86XEPYyfTE1SoLRDjMz37cviJ/GN dbgyx7e1vXsBEOLA72rBrh7WFw9WxbQoYK9MESawhodV8brpJ5ATmUm4apayyh+KoT2r mI6DB+pK3jKz1E36vKWT/3PIsfxB5YAcig41pxYepG4lix1R+tGcLiXGVxJ/NUxwHNq4 kAfQ== X-Gm-Message-State: ALoCoQkNB6ZCSIVo90xQXm8MP0h0uXN59hbOTBHHRs8ithCE5ZNG/MQa4EGEnse0OrBt8Nu1WR2J X-Received: by 10.236.31.40 with SMTP id l28mr1921479yha.34.1404172729108; Mon, 30 Jun 2014 16:58:49 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.87.207 with SMTP id r73ls522627qgd.44.gmail; Mon, 30 Jun 2014 16:58:48 -0700 (PDT) X-Received: by 10.58.29.164 with SMTP id l4mr40483411veh.8.1404172728708; Mon, 30 Jun 2014 16:58:48 -0700 (PDT) Received: from mail-ve0-f169.google.com (mail-ve0-f169.google.com [209.85.128.169]) by mx.google.com with ESMTPS id b8si10748098vcf.7.2014.06.30.16.58.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 30 Jun 2014 16:58:48 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.169 as permitted sender) client-ip=209.85.128.169; Received: by mail-ve0-f169.google.com with SMTP id pa12so8899787veb.14 for ; Mon, 30 Jun 2014 16:58:48 -0700 (PDT) X-Received: by 10.58.153.4 with SMTP id vc4mr11610061veb.19.1404172728312; Mon, 30 Jun 2014 16:58:48 -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.37.5 with SMTP id tc5csp176771vcb; Mon, 30 Jun 2014 16:58:48 -0700 (PDT) X-Received: by 10.140.101.245 with SMTP id u108mr3991204qge.48.1404172727932; Mon, 30 Jun 2014 16:58:47 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id y4si27086510qay.122.2014.06.30.16.58.47 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 30 Jun 2014 16:58: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]:37130 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1ks7-0007Gu-Ix for patch@linaro.org; Mon, 30 Jun 2014 19:20:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53409) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1kj0-0005z5-HV for qemu-devel@nongnu.org; Mon, 30 Jun 2014 19:11:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X1kiv-0003Q8-Er for qemu-devel@nongnu.org; Mon, 30 Jun 2014 19:11:02 -0400 Received: from mail-ob0-f169.google.com ([209.85.214.169]:38450) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1kiv-0003Pr-2i for qemu-devel@nongnu.org; Mon, 30 Jun 2014 19:10:57 -0400 Received: by mail-ob0-f169.google.com with SMTP id wp18so9723832obc.28 for ; Mon, 30 Jun 2014 16:10:56 -0700 (PDT) X-Received: by 10.60.103.206 with SMTP id fy14mr45347677oeb.21.1404169856733; Mon, 30 Jun 2014 16:10:56 -0700 (PDT) Received: from gbellows-linaro.bellowshome.net (99-179-1-128.lightspeed.austtx.sbcglobal.net. [99.179.1.128]) by mx.google.com with ESMTPSA id cu7sm76370192oec.12.2014.06.30.16.10.54 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 30 Jun 2014 16:10:55 -0700 (PDT) From: greg.bellows@linaro.org To: qemu-devel@nongnu.org Date: Mon, 30 Jun 2014 18:09:16 -0500 Message-Id: <1404169773-20264-17-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1404169773-20264-1-git-send-email-greg.bellows@linaro.org> References: <1404169773-20264-1-git-send-email-greg.bellows@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.214.169 Cc: peter.maydell@linaro.org, peter.crosthwaite@xilinx.com, Sergey Fedorov , Fabian Aggeler , Greg Bellows , serge.fdrv@gmail.com, edgar.iglesias@gmail.com, christoffer.dall@linaro.org Subject: [Qemu-devel] [PATCH v4 16/33] target-arm: add SDER definition 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: greg.bellows@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.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 From: Sergey Fedorov Signed-off-by: Sergey Fedorov Signed-off-by: Fabian Aggeler Signed-off-by: Greg Bellows --- target-arm/cpu.h | 1 + target-arm/helper.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/target-arm/cpu.h b/target-arm/cpu.h index 4625088..7aecb0f 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -182,6 +182,7 @@ typedef struct CPUARMState { uint64_t c1_coproc; /* Coprocessor access register. */ uint32_t c1_xscaleauxcr; /* XScale auxiliary control register. */ uint32_t c1_scr; /* secure config register. */ + uint32_t c1_sder; /* Secure debug enable register. */ uint32_t c1_nsacr; /* Non-secure access control register. */ uint64_t ttbr0_el1; /* MMU translation table base 0. */ uint64_t ttbr1_el1; /* MMU translation table base 1. */ diff --git a/target-arm/helper.c b/target-arm/helper.c index 6342dbf..7a2c861 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -2290,6 +2290,9 @@ static const ARMCPRegInfo v7_el3_cp_reginfo[] = { { .name = "SCR", .cp = 15, .crn = 1, .crm = 1, .opc1 = 0, .opc2 = 0, .access = PL3_RW, .fieldoffset = offsetof(CPUARMState, cp15.scr_el3), .resetvalue = 0, }, + { .name = "SDER", .cp = 15, .crn = 1, .crm = 1, .opc1 = 0, .opc2 = 1, + .access = PL3_RW, .resetvalue = 0, + .fieldoffset = offsetof(CPUARMState, cp15.c1_sder) }, { .name = "NSACR", .cp = 15, .crn = 1, .crm = 1, .opc1 = 0, .opc2 = 2, .access = PL3_RW | PL1_R, .resetvalue = 0, .writefn = nsacr_write, .readfn = nsacr_read,